From bc66ae4f7aaf3f8a3bb9b29a1bfe76b8cc35eb70 Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Sat, 27 May 2017 23:28:16 -0400 Subject: [PATCH 1/6] Bump version to 1.7.2 --- app/src/main/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2a9260417..7d2b19b95 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,8 +21,8 @@ + android:versionCode="29" + android:versionName="1.7.2"> From c49d576871d03fa558d46770ba5dfee857cea056 Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Sat, 27 May 2017 23:29:35 -0400 Subject: [PATCH 2/6] Fix crash at startup --- .../uhabits/activities/common/views/BundleSavedState.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java b/app/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java index fe33993d1..b5011b03c 100644 --- a/app/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java +++ b/app/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java @@ -29,7 +29,7 @@ public class BundleSavedState extends android.support.v4.view.AbsSavedState @Override public BundleSavedState createFromParcel(Parcel source) { - return new BundleSavedState(source); + return new BundleSavedState(source, getClass().getClassLoader()); } @Override @@ -47,9 +47,9 @@ public class BundleSavedState extends android.support.v4.view.AbsSavedState this.bundle = bundle; } - public BundleSavedState(Parcel source) + public BundleSavedState(Parcel source, ClassLoader loader) { - super(source); + super(source, loader); this.bundle = source.readBundle(getClass().getClassLoader()); } From bbb9ed8f99a3a3809c51033f8c43950f4dec606a Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Sat, 27 May 2017 23:30:45 -0400 Subject: [PATCH 3/6] Update translations --- app/src/main/res/values-hr/strings.xml | 2 +- app/src/main/res/values-iw/strings.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index aed537cbb..9cafc723c 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -158,7 +158,7 @@ Zvuk podsjetnika Nijedan Filtar - Skrivanje je uspjelo + Sakrij završeno Sakrij arhivirano Učini obavijesti trajnima Spriječava da se obavijesti zanemare. diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 786dca1c5..cc4486ab7 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -75,7 +75,7 @@ 4 שעות 8 שעות 24 שעות - החלפה להפעלה עם לחיצה קצרה + סימון הרגלים בלחיצה קצרה סמנו יעדים בהקשה קצרה במקום לחיצה ממושכת. נוח יותר, אך יכול להוביל ללחיצות לא מכוונות. מרווח נדנוד לתזכורות דרג/י אותנו ב- Google Play @@ -107,7 +107,7 @@ מפתחים גרסה %s תדירות - סימן + סימון הרגל חוזק רצף שיא רצף נוכחי From ef7483f9dc6edb1be7f0a573b1e228059d7fdcaa Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Sat, 27 May 2017 23:37:24 -0400 Subject: [PATCH 4/6] Make SQLiteHabitList.toList synchronized --- .../java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java b/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java index da8a6aee5..507121d61 100644 --- a/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java +++ b/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java @@ -261,7 +261,7 @@ public class SQLiteHabitList extends HabitList } } - protected List toList() + protected synchronized List toList() { String query = buildSelectQuery(); List recordList = sqlite.query(query, null); From 2a1bf5fc2e8929d11b79aa649b6ecb28e38aab70 Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Sat, 27 May 2017 23:38:58 -0400 Subject: [PATCH 5/6] Update CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2707976c3..dc0407636 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +### 1.7.2 (May 27, 2017) + +* Fix crash at startup + ### 1.7.1 (May 21, 2017) * Fix crash (BadParcelableException) From 28b6ae70143cda55780bb65c7c5e377b0ccd754f Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Sun, 28 May 2017 00:31:48 -0400 Subject: [PATCH 6/6] Apply dark theme on dialogs Fixes #291 --- .../uhabits/activities/habits/edit/BaseDialog.java | 10 +++++++++- app/src/main/res/values/styles.xml | 5 +++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialog.java b/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialog.java index 5d2db5a55..d83914442 100644 --- a/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialog.java +++ b/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialog.java @@ -39,6 +39,8 @@ import java.util.*; import butterknife.*; +import static org.isoron.uhabits.activities.ThemeSwitcher.*; + public abstract class BaseDialog extends AppCompatDialogFragment { @Nullable @@ -65,7 +67,13 @@ public abstract class BaseDialog extends AppCompatDialogFragment @Override public int getTheme() { - return R.style.DialogWithTitle; + AppComponent component = + ((HabitsApplication) getContext().getApplicationContext()).getComponent(); + + if(component.getPreferences().getTheme() == THEME_LIGHT) + return R.style.DialogWithTitle; + else + return R.style.DarkDialogWithTitle; } @Override diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 86435f56f..829fef4f3 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -260,4 +260,9 @@ + +