From ee48c6adfa074effd13501946b9b726564efbc76 Mon Sep 17 00:00:00 2001 From: Negue Date: Sat, 11 Jul 2015 20:49:09 +0200 Subject: [PATCH] initialize fabric / send events from viewAdapter / change AddTaskDialog to use taskId / change menu background color --- Habitica/AndroidManifest.xml | 3 +- Habitica/res/layout/add_task_dialog.xml | 12 +- Habitica/res/layout/fragment_recyclerview.xml | 22 +-- Habitica/res/menu/menu_main_activity_new.xml | 1 - Habitica/res/values/styles.xml | 22 +-- .../habitrpg/android/habitica/APIHelper.java | 10 +- .../android/habitica/AddTaskDialog.java | 29 +-- .../android/habitica/MainActivity.java | 182 ++++++++++++------ .../callbacks/HabitRPGUserCallback.java | 2 +- .../adapter/HabitItemRecyclerViewAdapter.java | 30 ++- 10 files changed, 198 insertions(+), 115 deletions(-) diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index dd3a2b530..16f4b4aee 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -36,7 +36,8 @@ + android:label="@string/PS_param_title" + android:theme="@style/AppThemeWithActionBar"> diff --git a/Habitica/res/layout/add_task_dialog.xml b/Habitica/res/layout/add_task_dialog.xml index ab4ff062f..f292a32cb 100644 --- a/Habitica/res/layout/add_task_dialog.xml +++ b/Habitica/res/layout/add_task_dialog.xml @@ -22,6 +22,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/task_text" + android:textColor="@android:color/black" android:textAppearance="?android:attr/textAppearanceLarge" /> @@ -64,19 +65,22 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/task_note" + android:textColor="@android:color/black" android:textAppearance="?android:attr/textAppearanceLarge" /> - + android:minLines="2" - + app:met_floatingLabel="normal" /> @@ -109,6 +113,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/task_value" + android:textColor="@android:color/black" android:textAppearance="?android:attr/textAppearanceLarge" /> - - - - - + app:layout_anchor="@id/coordinatorLayout" + app:layout_anchorGravity="bottom|right|end" + android:layout_gravity="bottom|right" /> + diff --git a/Habitica/res/menu/menu_main_activity_new.xml b/Habitica/res/menu/menu_main_activity_new.xml index 5340a0803..d255f8cbf 100644 --- a/Habitica/res/menu/menu_main_activity_new.xml +++ b/Habitica/res/menu/menu_main_activity_new.xml @@ -12,7 +12,6 @@ diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml index d3fc83133..3da25a2aa 100644 --- a/Habitica/res/values/styles.xml +++ b/Habitica/res/values/styles.xml @@ -18,7 +18,7 @@ @color/brand @color/brand - @color/md_amber_200 + @color/md_teal_300 @color/material_drawer_background @@ -31,6 +31,9 @@ @color/material_drawer_selected @color/brand @color/material_drawer_header_selection_text + + + @style/PopupTheme - - - - +