Update to API level 19 KitKat

DataAccess code refactor
Include JodaTime to have correct Date implementation
WIP Task due dates
This commit is contained in:
bg45
2017-03-15 17:34:27 -04:00
parent 9df847a01a
commit 9e90715e65
17 changed files with 189 additions and 79 deletions

View File

@@ -4,13 +4,14 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:padding="@dimen/text_margin"
android:orientation="vertical"
tools:context=".activities.MainActivity">
<TextView
android:id="@+id/new_task_list_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/new_task_list"
@@ -18,41 +19,53 @@
<Spinner
android:id="@+id/new_task_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginStart="5dp"
android:layout_toEndOf="@id/new_task_list_label">
</Spinner>
<TextView
android:id="@+id/new_task_name_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/new_task_name"
android:textAppearance="?android:attr/textAppearanceLarge" />
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_below="@id/new_task_list_label"/>
<EditText
android:id="@+id/new_task_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/new_task_name_hint"
android:maxLines="1"
android:inputType="text" />
android:inputType="text"
android:layout_below="@id/new_task_name_label"/>
<TextView
android:id="@+id/new_task_description_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/new_task_description"
android:textAppearance="?android:attr/textAppearanceLarge" />
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_below="@id/new_task_name" />
<EditText
android:id="@+id/new_task_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/new_task_description_hint"
android:gravity="top|start"
android:lines="3"/>
android:lines="3"
android:layout_below="@id/new_task_description_label" />
<TextView
android:id="@+id/new_task_priority_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/new_task_priority"
android:textAppearance="?android:attr/textAppearanceLarge" />
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_below="@id/new_task_description" />
<RadioGroup
android:id="@+id/new_task_priority"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_below="@id/new_task_priority_label" >
<RadioButton
android:id="@+id/new_task_priority_low"
android:text="@string/new_task_priority_low"
@@ -73,5 +86,21 @@
android:layout_height="wrap_content" >
</RadioButton>
</RadioGroup>
</LinearLayout>
<TextView
android:id="@+id/new_task_due_date_label"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:text="@string/new_task_due_date"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_toEndOf="@id/new_task_priority"
android:layout_below="@id/new_task_description" />
<DatePicker
android:id="@+id/new_task_due_date"
android:calendarViewShown="true"
android:spinnersShown="false"
android:layout_width="800dp"
android:layout_height="800dp"
android:layout_toEndOf="@id/new_task_priority"
android:layout_below="@id/new_task_due_date_label" />
</RelativeLayout>
</ScrollView>

View File

@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="settings_task_layouts">
<item>Simple</item>
<item>Détaillée</item>
</string-array>
<string-array name="settings_today_actions">
<item>Terminé</item>
<item>Supprimé</item>
<item>Terminer</item>
<item>Supprimer</item>
</string-array>
</resources>

View File

@@ -29,12 +29,8 @@
<string name="settings_confirm_donext">Confirmation sur suivant</string>
<string name="settings_confirm_markdone">Confirmation sur terminé</string>
<string name="settings_confirm_message">Changer l\'état de la tâche en</string>
<string name="settings_max_lists_label">Nombre de listes maximum:</string>
<string name="settings_task_layout">Apparence des tâches:</string>
<string-array name="settings_task_layouts">
<item>Simple</item>
<item>Détaillée</item>
</string-array>
<string name="settings_max_lists_label">Nombre de listes maximum</string>
<string name="settings_task_layout">Apparence des tâches</string>
<string name="snackabar_action_deleted">supprimée</string>
<string name="snackabar_action_done">terminée</string>
<string name="snackabar_action_next">suivante</string>
@@ -69,4 +65,5 @@
<string name="task_list_today">Aujourd\'hui</string>
<string name="task_list_today_list_error">Le nom \"Aujourd\'hui\" est réservé. Vous pouvez activer la liste Aujourd\'hui dans les paramètres.</string>
<string name="settings_today_action_title">Action à entreprendre à la fin de la journée:</string>
<string name="new_task_due_date">Date de fin</string>
</resources>

View File

@@ -68,9 +68,9 @@
<string name="settings_confirm_donext">Confirm on next?</string>
<string name="settings_confirm_markdone">Confirm on done?</string>
<string name="settings_confirm_delete">Confirm on delete?</string>
<string name="settings_task_layout">Task layout:</string>
<string name="settings_task_layout">Task layout</string>
<string name="settings_max_lists_label">Maximum number of lists:</string>
<string name="settings_max_lists_label">Maximum number of lists</string>
<string name="title_activity_task_list">TaskListActivity</string>
<!-- Strings related to About -->
@@ -83,4 +83,5 @@
<string name="task_list_today">Today</string>
<string name="task_list_today_list_error">Name \"Today\" is reserved. You may activate the Today list from the Settings.</string>
<string name="settings_today_action_title">Action at the end of the day</string>
<string name="new_task_due_date">Due date</string>
</resources>

View File

@@ -50,7 +50,7 @@
android:entries="@array/settings_today_actions"
android:entryValues="@array/settings_today_action_values"
android:summary="%s"
android:defaultValue="0" />
android:defaultValue="2" />
</PreferenceScreen>
</PreferenceCategory>
</PreferenceScreen>