sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-14 18:21:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Feature: Add first day of the week option for all calendars

Browse source 
This is the first commit for the above feature. It adds the necessary
values & strings.
This commit is contained in:
Daniel Kaparunakis 2016-09-08 09:37:57 -05:00
parent 6c86a83023
commit 94ed87ba6e
6 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/res/values/strings.xml
View file

@ -18,6 +18,8 @@
<string name="PS_contact_title">Contact me</string>
<string name="unknown_error">An error happened…</string>
<string name="pref_account_header">Account</string>
<string name="pref_first_day_of_the_week_title">First Day of the Week</string>
<string name="pref_first_day_of_the_week_summary">First day of the week in all calendars</string>
<string name="pref_reminder_header">Daily Reminder</string>
<string name="pref_reminder_checkbox">Activate Reminder</string>
<string name="pref_reminder_picker">Set Reminder Time</string>

10
Habitica/res/values/values.xml
View file

@ -29,6 +29,16 @@
<item>@string/sunday</item>
</string-array>
<string-array name="weekdayValues">
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>6</item>
<item>7</item>
<item>1</item>
</string-array>
<string-array name="avatar_sizes">
<item>@string/avatar_size_slim</item>
<item>@string/avatar_size_broad</item>

7
Habitica/res/xml/preferences_fragment.xml
View file

@ -62,6 +62,13 @@
android:key="choose_class"
android:order="2"/>
<ListPreference android:title="@string/pref_first_day_of_the_week_title"
android:key="dayOfTheWeek"
android:entries="@array/weekdays"
android:entryValues="@array/weekdayValues"
android:summary="@string/pref_first_day_of_the_week_summary"
android:order="4"/>
<Preference android:title="@string/logout"
android:key="logout"
android:summary="@string/logout_description"

16
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
View file

@ -1,5 +1,13 @@
package com.habitrpg.android.habitica.ui.activities;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentPagerAdapter;
import android.support.v4.view.ViewPager;
import android.view.View;
import android.widget.Button;
import com.amplitude.api.Amplitude;
import com.habitrpg.android.habitica.APIHelper;
import com.habitrpg.android.habitica.HostConfig;
@ -20,14 +28,6 @@ import org.greenrobot.eventbus.Subscribe;
import org.json.JSONException;
import org.json.JSONObject;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentPagerAdapter;
import android.support.v4.view.ViewPager;
import android.view.View;
import android.widget.Button;
import java.util.List;
import javax.inject.Inject;

2
build.gradle
View file

@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.android.tools.build:gradle:2.1.3'
classpath 'com.android.databinding:dataBinder:1.0-rc4'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'com.google.gms:google-services:3.0.0'

6
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,7 +1,7 @@
#Wed Apr 27 08:20:39 CST 2016
#Wed Sep 07 23:45:14 CDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip
org.gradle.jvmargs=-Xmx3072M
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip