sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-20 12:49:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

task form improvements

Browse source
This commit is contained in:
Phillip Thelen 2015-12-03 21:41:03 +01:00
parent 8a7fb6e844
commit f783443d14
3 changed files with 36 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
Habitica/res/layout/activity_task_form.xml
View file

@ -16,7 +16,6 @@
android:id="@+id/task_task_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/abc_action_bar_content_inset_material"
android:layout_marginTop="@dimen/abc_action_bar_content_inset_material"
android:orientation="vertical">
@ -31,7 +30,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:hint="@string/text"
android:textColor="@color/text_light" />
android:textColor="@android:color/black" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
@ -45,7 +44,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:hint="@string/notes"
android:textColor="@color/text_light" />
android:textColor="@android:color/black" />
</android.support.design.widget.TextInputLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@ -70,29 +69,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/task_startdate_layout"
android:layout_width="match_parent"
android:layout_height="140dp"
android:layout_gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/start_date"
android:textAppearance="?android:attr/textAppearanceMedium" />
<DatePicker
android:id="@+id/task_startdate_picker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:calendarViewShown="false"
android:datePickerMode="spinner" />
</LinearLayout>
</LinearLayout>
<LinearLayout
@ -100,7 +77,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/abc_action_bar_content_inset_material"
android:layout_marginTop="30dp"
android:orientation="vertical">
<TextView
@ -112,7 +89,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="72dp"
android:layout_height="50dp"
android:orientation="horizontal">
<TextView
@ -137,7 +114,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="72dp"
android:layout_height="50dp"
android:orientation="horizontal">
<TextView
@ -167,7 +144,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/abc_action_bar_content_inset_material"
android:layout_marginTop="30dp"
android:orientation="vertical">
<TextView
@ -210,7 +187,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/abc_action_bar_content_inset_material"
android:layout_marginTop="30dp"
android:orientation="vertical">
<TextView
@ -235,6 +212,30 @@
</LinearLayout>
<LinearLayout
android:id="@+id/task_startdate_layout"
android:layout_width="match_parent"
android:layout_height="140dp"
android:layout_gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/start_date"
android:textAppearance="?android:attr/textAppearanceMedium" />
<DatePicker
android:id="@+id/task_startdate_picker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:calendarViewShown="false"
android:datePickerMode="spinner" />
</LinearLayout>
<LinearLayout
android:id="@+id/task_delete_wrapper"
android:layout_width="match_parent"
@ -251,5 +252,6 @@
android:id="@+id/btn.delete.task"/>
</LinearLayout>
</LinearLayout>
</ScrollView>

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

@ -93,6 +93,7 @@
<string name="ERR_pb_accountCreation">An error happened. Please try to connect</string>
<string name="ERR_pb_connection">Error: your credentials couldn\'t be saved!</string>
<string name="logout">Logout</string>
<string name="account_details">Account Details</string>
<string name="LoginActivityName">Welcome</string>
<string name="helpString">To use this application, you need to have an account on http://habitrpg.com. You can register using the register button in this application.\n\n
If you already have an account, use the connect buttons, or the QRCode scanner. If you created your account using Facebook on the website, you will need to use the QRcode scanner or connect using your API and User token that you can find on http://habitrpg.com.</string>

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

@ -5,13 +5,13 @@
android:title="@string/pref_account_header">
<EditTextPreference
android:key="accountDetails"
android:title="AccountDetails"
android:title="@string/account_details"
android:summary="Check your account details" />
<Preference android:title="LOGOUT"
<Preference android:title="@string/logout"
android:key="logout"
android:summary="Logout your account"/>
android:summary="Log out of your account"/>
</PreferenceCategory>
<PreferenceCategory
android:title="@string/pref_reminder_header">