From a59321e03e80d860f5b0d9cf5fc67d3b45d8cf3c Mon Sep 17 00:00:00 2001
From: asdoi <asdoi@t-online.de>
Date: Mon, 7 Sep 2020 16:09:32 +0200
Subject: [PATCH] add preference

---
 .../activities/habits/list/views/HabitCardView.kt      | 10 +++++++---
 .../uhabits-android/src/main/res/values/strings.xml    |  2 ++
 .../uhabits-android/src/main/res/xml/preferences.xml   |  6 ++++++
 .../isoron/uhabits/core/preferences/Preferences.java   |  5 +++++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt
index 85a93c0d0..462446d61 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt
@@ -110,6 +110,8 @@ class HabitCardView(
     private var scoreText: TextView
     private var streakText: TextView
 
+    private val showScoreText = true //Use value from Preferences.getScoreAsText()
+
     init {
         scoreRing = RingView(context).apply {
             val thickness = dp(3f)
@@ -172,9 +174,11 @@ class HabitCardView(
             layoutParams = LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)
             if (SDK_INT >= LOLLIPOP) elevation = dp(1f)
 
-            addView(scoreRing)
-            addView(scoreText)
-            addView(streakText)
+            if (showScoreText) {
+                addView(scoreText)
+                addView(streakText)
+            } else
+                addView(scoreRing)
             addView(label)
             addView(checkmarkPanel)
             addView(numberPanel)
diff --git a/android/uhabits-android/src/main/res/values/strings.xml b/android/uhabits-android/src/main/res/values/strings.xml
index f2e0ecd12..fef720b06 100644
--- a/android/uhabits-android/src/main/res/values/strings.xml
+++ b/android/uhabits-android/src/main/res/values/strings.xml
@@ -129,6 +129,8 @@
     <string name="interface_preferences">Interface</string>
     <string name="reverse_days">Reverse order of days</string>
     <string name="reverse_days_description">Show days in reverse order on the main screen.</string>
+    <string name="score_text">Show score as text</string>
+    <string name="score_text_description">Show the score as text instead of a circle. Furthermore the current streak is displayed next to the score.</string>
     <string name="day">Day</string>
     <string name="week">Week</string>
     <string name="month">Month</string>
diff --git a/android/uhabits-android/src/main/res/xml/preferences.xml b/android/uhabits-android/src/main/res/xml/preferences.xml
index d36ae17f3..26b25d5a5 100644
--- a/android/uhabits-android/src/main/res/xml/preferences.xml
+++ b/android/uhabits-android/src/main/res/xml/preferences.xml
@@ -38,6 +38,12 @@
                 android:title="@string/reverse_days"
                 app:iconSpaceReserved="false" />
 
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="pref_show_text_instead_of_circle"
+            android:summary="@string/score_text_description"
+            android:title="@string/score_text"
+            app:iconSpaceReserved="false" />
 
         <CheckBoxPreference
                 android:defaultValue="false"
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 456a997ca..f1e09f821 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
@@ -338,6 +338,11 @@ public class Preferences
         storage.putString("pref_widget_opacity", Integer.toString(value));
     }
 
+    public boolean getScoreAsText()
+    {
+        return storage.getBoolean("pref_show_text_instead_of_circle", false);
+    }
+
 
     /**
      * @return An integer representing the first day of the week. Sunday