From f85e09288c8b1c117fcbe60a71a2d84c66511977 Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Thu, 7 Apr 2016 18:03:46 -0400 Subject: [PATCH 001/102] Add link to open beta on Google Play --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 46a9cc93b..9ecff720f 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,8 @@ contribute, even if you are not a software developer. * **Report bugs, suggest features.** The easiest way to contribute is to simply use the app and let us know if you find any problems or have any suggestions to improve it. You can either use the link inside the app, or open an issue - at GitHub. + at GitHub. If you would like to receive the newest versions of the app + earlier than everyone else, [join our open beta on Google Play][beta]. * **Spread the word.** If you like the app, share it with your family, friends and colleagues. You can also rate and review the app on Google Play Store, to help @@ -116,3 +117,4 @@ contribute, even if you are not a software developer. [fdroid]: http://f-droid.org/app/org.isoron.uhabits [dev-guide]: https://github.com/iSoron/uhabits/wiki/Developer-guidelines [build]: https://github.com/iSoron/uhabits/wiki/Developer-guidelines#building +[beta]: https://play.google.com/apps/testing/org.isoron.uhabits From ac885e15030f4453eb702093a15232e99dc8769d Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Fri, 8 Apr 2016 15:50:51 -0400 Subject: [PATCH 002/102] Refactor ListHabitsFragment layouts and styles --- .../uhabits/helpers/ListHabitsHelper.java | 18 +++--- .../org/isoron/uhabits/helpers/UIHelper.java | 6 ++ app/src/main/res/layout/about.xml | 58 +++++++++--------- .../main/res/layout/list_habits_fragment.xml | 26 +++++--- .../res/layout/list_habits_header_check.xml | 12 +++- app/src/main/res/layout/list_habits_item.xml | 10 +-- .../res/layout/list_habits_item_check.xml | 2 +- app/src/main/res/layout/show_habit.xml | 24 ++++---- app/src/main/res/values-v21/styles.xml | 5 +- .../res/values-v21/styles_list_habits.xml | 15 ++--- app/src/main/res/values/dimens.xml | 6 +- app/src/main/res/values/styles.xml | 22 ++++--- .../main/res/values/styles_list_habits.xml | 61 ++++++------------- 13 files changed, 131 insertions(+), 134 deletions(-) diff --git a/app/src/main/java/org/isoron/uhabits/helpers/ListHabitsHelper.java b/app/src/main/java/org/isoron/uhabits/helpers/ListHabitsHelper.java index 0cd6567fd..e66ae4e5a 100644 --- a/app/src/main/java/org/isoron/uhabits/helpers/ListHabitsHelper.java +++ b/app/src/main/java/org/isoron/uhabits/helpers/ListHabitsHelper.java @@ -22,11 +22,9 @@ package org.isoron.uhabits.helpers; import android.content.Context; import android.graphics.Color; import android.graphics.Typeface; -import android.util.DisplayMetrics; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; import android.widget.LinearLayout; import android.widget.TextView; @@ -61,16 +59,18 @@ public class ListHabitsHelper public int getButtonCount() { - DisplayMetrics dm = context.getResources().getDisplayMetrics(); - int width = (int) (dm.widthPixels / dm.density); - return Math.max(0, (int) ((width - 160) / 42.0)); + float screenWidth = UIHelper.getScreenWidth(context); + float labelWidth = context.getResources().getDimension(R.dimen.habitNameWidth); + float buttonWidth = context.getResources().getDimension(R.dimen.checkmarkWidth); + return Math.max(0, (int) ((screenWidth - labelWidth) / buttonWidth)); } public int getHabitNameWidth() { - DisplayMetrics dm = context.getResources().getDisplayMetrics(); - int width = (int) (dm.widthPixels / dm.density); - return (int) ((width - 30 - getButtonCount() * 42) * dm.density); + float screenWidth = UIHelper.getScreenWidth(context); + float buttonWidth = context.getResources().getDimension(R.dimen.checkmarkWidth); + float padding = UIHelper.dpToPixels(context, 15); + return (int) (screenWidth - padding - getButtonCount() * buttonWidth); } public void updateCheckmarkButtons(Habit habit, LinearLayout llButtons) @@ -206,7 +206,7 @@ public class ListHabitsHelper for (int i = 0; i < getButtonCount(); i++) { View tvDay = inflater.inflate(R.layout.list_habits_header_check, null); - Button btCheck = (Button) tvDay.findViewById(R.id.tvCheck); + TextView btCheck = (TextView) tvDay.findViewById(R.id.tvCheck); btCheck.setText(DateHelper.formatHeaderDate(day)); header.addView(tvDay); diff --git a/app/src/main/java/org/isoron/uhabits/helpers/UIHelper.java b/app/src/main/java/org/isoron/uhabits/helpers/UIHelper.java index 46ae1572d..8a708f1a3 100644 --- a/app/src/main/java/org/isoron/uhabits/helpers/UIHelper.java +++ b/app/src/main/java/org/isoron/uhabits/helpers/UIHelper.java @@ -164,4 +164,10 @@ public abstract class UIHelper return false; } + + public static float getScreenWidth(Context context) + { + return context.getResources().getDisplayMetrics().widthPixels; + } + } diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml index 86a0f9f26..de0ba9a23 100644 --- a/app/src/main/res/layout/about.xml +++ b/app/src/main/res/layout/about.xml @@ -25,10 +25,10 @@ android:fillViewport="true"> + style="@style/CardList"> diff --git a/app/src/main/res/layout/list_habits_fragment.xml b/app/src/main/res/layout/list_habits_fragment.xml index 8ec48be74..39c68a713 100644 --- a/app/src/main/res/layout/list_habits_fragment.xml +++ b/app/src/main/res/layout/list_habits_fragment.xml @@ -26,12 +26,16 @@ + android:layout_width="match_parent" + android:background="@color/windowBackground" + android:paddingTop="@dimen/checkmarkHeight" + android:layout_height="match_parent" + android:divider="@color/windowBackground" + android:dividerHeight="1dp"/> - + + style="@style/ListHabits.Star"/> + style="@style/ListHabits.CheckmarkPanel"/> + style="@style/Card"> . --> -