diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java index c5a99cdfd..f241d5a32 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java @@ -156,9 +156,9 @@ public class CheckmarkWidgetView extends HabitWidgetView ring.setVisibility(VISIBLE); widthMeasureSpec = - MeasureSpec.makeMeasureSpec((int) w, MeasureSpec.EXACTLY); + MeasureSpec.makeMeasureSpec((int) w, MeasureSpec.EXACTLY); heightMeasureSpec = - MeasureSpec.makeMeasureSpec((int) h, MeasureSpec.EXACTLY); + MeasureSpec.makeMeasureSpec((int) h, MeasureSpec.EXACTLY); float textSize = 0.15f * h; float maxTextSize = getDimension(getContext(), R.dimen.smallerTextSize); diff --git a/android/uhabits-android/src/main/res/values/strings.xml b/android/uhabits-android/src/main/res/values/strings.xml index 39cfc8241..d2273b13b 100644 --- a/android/uhabits-android/src/main/res/values/strings.xml +++ b/android/uhabits-android/src/main/res/values/strings.xml @@ -174,8 +174,6 @@ Dark theme Use pure black in dark theme Replaces gray backgrounds with pure black in dark theme. Reduces battery usage in phones with AMOLED display. - Widget numbers instead of checkmarks - Replaces the checkmark in the 1x1 habit widget with the number of times you\'ve currently chained the habit. Interface Reverse order of days Show days in reverse order on the main screen. diff --git a/android/uhabits-android/src/main/res/xml/preferences.xml b/android/uhabits-android/src/main/res/xml/preferences.xml index 5c0e7f5bb..032dda1d7 100644 --- a/android/uhabits-android/src/main/res/xml/preferences.xml +++ b/android/uhabits-android/src/main/res/xml/preferences.xml @@ -59,14 +59,6 @@ android:key="pref_first_weekday" android:title="@string/first_day_of_the_week" app:iconSpaceReserved="false" /> - diff --git a/android/uhabits-android/src/main/res/xml/widget_currentstreak_info.xml b/android/uhabits-android/src/main/res/xml/widget_currentstreak_info.xml index 4541e5857..a91cd03f3 100644 --- a/android/uhabits-android/src/main/res/xml/widget_currentstreak_info.xml +++ b/android/uhabits-android/src/main/res/xml/widget_currentstreak_info.xml @@ -27,4 +27,4 @@ android:updatePeriodMillis="3600000" android:configure="org.isoron.uhabits.widgets.HabitPickerDialog" android:widgetCategory="home_screen"> - \ No newline at end of file + diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Streak.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Streak.java index b75bd147c..01bef7aaa 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Streak.java +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Streak.java @@ -30,8 +30,6 @@ public final class Streak private final Timestamp end; - //TODO define the "End" of a streak to follow the rules of the given streak? - //ex if 2 times in a week, define end at end of that week. or by other rules ofc public Streak(Timestamp start, Timestamp end) { this.start = start; diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java index 44a949172..2cec8f862 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java @@ -333,11 +333,6 @@ public class Preferences return Integer.parseInt(storage.getString("pref_widget_opacity", "102")); } - public boolean getWidgetNumberMode() - { - return storage.getBoolean("pref_widget_numbers", false); - } - /** * @return An integer representing the first day of the week. Sunday * corresponds to 1, Monday to 2, and so on, until Saturday, which is