Merge branch 'master' into dev

Evansb2250 · May 9, 2021 · 9d7840b · 9d7840b
2 parents 32db4e3 + 89e3dd7
commit 9d7840b
Show file tree

Hide file tree

Showing 37 changed files with 44 additions and 73 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [2.0.1] - 2021-04-30
+## [2.0.1] - 2021-05-09
 
 ### Added
 - Make midnight delay optional and disabled by default (@hiqua)

diff --git a/README.md b/README.md
@@ -111,18 +111,18 @@ contribute, even if you are not a software developer.
   You should have received a copy of the GNU General Public License along
   with this program. If not, see <http://www.gnu.org/licenses/>.
 
-[screen1]: screenshots/uhabits1.png
-[screen2]: screenshots/uhabits2.png
-[screen3]: screenshots/uhabits3.png
-[screen4]: screenshots/uhabits4.png
-[screen5]: screenshots/uhabits5.png
-[screen6]: screenshots/uhabits6.png
-[screen1th]: screenshots/uhabits1_th.png
-[screen2th]: screenshots/uhabits2_th.png
-[screen3th]: screenshots/uhabits3_th.png
-[screen4th]: screenshots/uhabits4_th.png
-[screen5th]: screenshots/uhabits5_th.png
-[screen6th]: screenshots/uhabits6_th.png
+[screen1]: screenshots/1.png
+[screen2]: screenshots/2.png
+[screen3]: screenshots/3.png
+[screen4]: screenshots/4.png
+[screen5]: screenshots/5.png
+[screen6]: screenshots/6.png
+[screen1th]: screenshots/1.thumb.png
+[screen2th]: screenshots/2.thumb.png
+[screen3th]: screenshots/3.thumb.png
+[screen4th]: screenshots/4.thumb.png
+[screen5th]: screenshots/5.thumb.png
+[screen6th]: screenshots/6.thumb.png
 [poedit]: http://translate.loophabits.org
 [playstore]: https://play.google.com/store/apps/details?id=org.isoron.uhabits
 [releases]: https://github.com/iSoron/uhabits/releases

diff --git a/screenshots/1.png b/screenshots/1.png
diff --git a/screenshots/1.thumb.png b/screenshots/1.thumb.png
diff --git a/screenshots/2.png b/screenshots/2.png
diff --git a/screenshots/2.thumb.png b/screenshots/2.thumb.png
diff --git a/screenshots/3.png b/screenshots/3.png
diff --git a/screenshots/3.thumb.png b/screenshots/3.thumb.png
diff --git a/screenshots/4.png b/screenshots/4.png
diff --git a/screenshots/4.thumb.png b/screenshots/4.thumb.png
diff --git a/screenshots/5.png b/screenshots/5.png
diff --git a/screenshots/5.thumb.png b/screenshots/5.thumb.png
diff --git a/screenshots/6.png b/screenshots/6.png
diff --git a/screenshots/6.thumb.png b/screenshots/6.thumb.png
diff --git a/screenshots/uhabits1.png b/screenshots/uhabits1.png
diff --git a/screenshots/uhabits1_th.png b/screenshots/uhabits1_th.png
diff --git a/screenshots/uhabits2.png b/screenshots/uhabits2.png
diff --git a/screenshots/uhabits2_th.png b/screenshots/uhabits2_th.png
diff --git a/screenshots/uhabits3.png b/screenshots/uhabits3.png
diff --git a/screenshots/uhabits3_th.png b/screenshots/uhabits3_th.png
diff --git a/screenshots/uhabits4.png b/screenshots/uhabits4.png
diff --git a/screenshots/uhabits4_th.png b/screenshots/uhabits4_th.png
diff --git a/screenshots/uhabits5.png b/screenshots/uhabits5.png
diff --git a/screenshots/uhabits5_th.png b/screenshots/uhabits5_th.png
diff --git a/screenshots/uhabits6.png b/screenshots/uhabits6.png
diff --git a/screenshots/uhabits6_th.png b/screenshots/uhabits6_th.png
diff --git a/translators.gradle.kts b/translators.gradle.kts
@@ -26,7 +26,6 @@ task("updateTranslators") {
                 val name = entry["Name"]!!
                 if (!translators.containsKey(lang)) {
                     translators[lang] = mutableListOf()
-                    println(lang)
                 }
                 translators[lang]!!.add(name)
                 translators[lang]!!.sort()
@@ -87,7 +86,6 @@ task("updateTranslators") {
                 }
                 if (!translators.containsKey(lang)) {
                     translators[lang] = mutableListOf()
-                    println(lang)
                 }
                 if (translators[lang]!!.contains(name)) continue
                 translators[lang]!!.add(name)

diff --git a/uhabits-android/build.gradle.kts b/uhabits-android/build.gradle.kts
@@ -45,10 +45,24 @@ android {
         testInstrumentationRunner("androidx.test.runner.AndroidJUnitRunner")
     }
 
+    signingConfigs {
+        if (System.getenv("LOOP_KEY_ALIAS") != null) {
+            create("release") {
+                keyAlias = System.getenv("LOOP_KEY_ALIAS")
+                keyPassword = System.getenv("LOOP_KEY_PASSWORD")
+                storeFile = file(System.getenv("LOOP_KEY_STORE"))
+                storePassword = System.getenv("LOOP_STORE_PASSWORD")
+            }
+        }
+    }
+
     buildTypes {
         getByName("release") {
             minifyEnabled(true)
             proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.txt")
+            if (signingConfigs.findByName("release") != null) {
+                signingConfig = signingConfigs.getByName("release")
+            }
         }
 
         getByName("debug") {

diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.kt
@@ -37,6 +37,7 @@ import org.isoron.uhabits.inject.HabitsApplicationComponent
 import org.isoron.uhabits.utils.InterfaceUtils.getDimension
 import org.isoron.uhabits.utils.PaletteUtils.getAndroidTestColor
 import org.isoron.uhabits.utils.StyledResources
+import kotlin.math.max
 import kotlin.math.min
 
 class CheckmarkWidgetView : HabitWidgetView {
@@ -95,7 +96,7 @@ class CheckmarkWidgetView : HabitWidgetView {
 
     private val text: String
         get() = if (isNumerical) {
-            (entryValue / 1000.0).toShortString()
+            (max(0, entryValue) / 1000.0).toShortString()
         } else when (entryState) {
             YES_MANUAL, YES_AUTO -> resources.getString(R.string.fa_check)
             SKIP -> resources.getString(R.string.fa_skipped)
@@ -130,7 +131,11 @@ class CheckmarkWidgetView : HabitWidgetView {
         val maxTextSize = getDimension(context, R.dimen.smallerTextSize)
         textSize = min(textSize, maxTextSize)
         label.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize)
-        ring.setTextSize(textSize)
+        if (isNumerical) {
+            ring.setTextSize(textSize * 0.75f)
+        } else {
+            ring.setTextSize(textSize)
+        }
         ring.setThickness(0.15f * textSize)
         super.onMeasure(newWidthMeasureSpec, newHeightMeasureSpec)
     }

diff --git a/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/1.png b/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/1.png
diff --git a/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/2.png b/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/2.png
diff --git a/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/3.png b/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/3.png
diff --git a/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/4.png b/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/4.png
diff --git a/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/5.png b/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/5.png
diff --git a/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/6.png b/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/6.png
diff --git a/uhabits-android/src/main/play/release-notes/en-US/default.txt b/uhabits-android/src/main/play/release-notes/en-US/default.txt
@@ -1,3 +1,10 @@
-1.8.12:
-* Fix bug that caused incorrect check marks to show after scrolling
-* Fix issue preventing widgets from updating at midnight
+2.0:
+* Track numeric habits (e.g. how many pages did you read?)
+* Skip days without breaking your streak
+* Show question marks for days with missing data
+* Extend day a few hours past midnight
+* Show multiple habits in a single widget
+* Export daily backups automatically
+* Sort habits by status and in reverse
+* Add notes to habits
+* Improve theme and accessibility