diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml deleted file mode 100644 index 6345d6b8c..000000000 --- a/.github/workflows/publish.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Build, Test & Publish - -on: - push: - branches: - - master - -jobs: - build: - runs-on: macOS-latest - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: true - steps: - - - uses: actions/checkout@v1 - - - name: Install GPG - uses: olafurpg/setup-gpg@v2 - - - name: Decrypt secrets - env: - GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }} - run: .secret/decrypt.sh - - - name: Install Java Development Kit 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - - name: Install flock - run: brew install util-linux - - - name: Build APK & Run small tests - env: - RELEASE: 1 - run: ./build.sh build - - - name: Run medium tests - uses: ReactiveCircus/android-emulator-runner@v2.2.0 - env: - RELEASE: 1 - with: - api-level: 29 - script: ./build.sh medium-tests - - - name: Upload build to GitHub - uses: actions/upload-artifact@v1 - with: - name: Build - path: uhabits-android/uhabits-android/build/outputs/ - - - name: Upload APK to Google Play - run: cd uhabits-android && ./gradlew publishReleaseApk diff --git a/CHANGELOG.md b/CHANGELOG.md index 4421609be..d2602177f 100644 --- 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 index d7546ad91..a01ed787c 100644 --- 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 . -[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 new file mode 100644 index 000000000..0e9d0c9e2 Binary files /dev/null and b/screenshots/1.png differ diff --git a/screenshots/1.thumb.png b/screenshots/1.thumb.png new file mode 100644 index 000000000..b2934585c Binary files /dev/null and b/screenshots/1.thumb.png differ diff --git a/screenshots/2.png b/screenshots/2.png new file mode 100644 index 000000000..90eda14cf Binary files /dev/null and b/screenshots/2.png differ diff --git a/screenshots/2.thumb.png b/screenshots/2.thumb.png new file mode 100644 index 000000000..1229e6a91 Binary files /dev/null and b/screenshots/2.thumb.png differ diff --git a/screenshots/3.png b/screenshots/3.png new file mode 100644 index 000000000..1005d0876 Binary files /dev/null and b/screenshots/3.png differ diff --git a/screenshots/3.thumb.png b/screenshots/3.thumb.png new file mode 100644 index 000000000..901ae322b Binary files /dev/null and b/screenshots/3.thumb.png differ diff --git a/screenshots/4.png b/screenshots/4.png new file mode 100644 index 000000000..a51548425 Binary files /dev/null and b/screenshots/4.png differ diff --git a/screenshots/4.thumb.png b/screenshots/4.thumb.png new file mode 100644 index 000000000..26d7878c1 Binary files /dev/null and b/screenshots/4.thumb.png differ diff --git a/screenshots/5.png b/screenshots/5.png new file mode 100644 index 000000000..6a43dcb44 Binary files /dev/null and b/screenshots/5.png differ diff --git a/screenshots/5.thumb.png b/screenshots/5.thumb.png new file mode 100644 index 000000000..815e43f90 Binary files /dev/null and b/screenshots/5.thumb.png differ diff --git a/screenshots/6.png b/screenshots/6.png new file mode 100644 index 000000000..d2b644ea5 Binary files /dev/null and b/screenshots/6.png differ diff --git a/screenshots/6.thumb.png b/screenshots/6.thumb.png new file mode 100644 index 000000000..80c2a921d Binary files /dev/null and b/screenshots/6.thumb.png differ diff --git a/screenshots/uhabits1.png b/screenshots/uhabits1.png deleted file mode 100644 index dc651abc0..000000000 Binary files a/screenshots/uhabits1.png and /dev/null differ diff --git a/screenshots/uhabits1_th.png b/screenshots/uhabits1_th.png deleted file mode 100644 index 9e93d8ca8..000000000 Binary files a/screenshots/uhabits1_th.png and /dev/null differ diff --git a/screenshots/uhabits2.png b/screenshots/uhabits2.png deleted file mode 100644 index edabc5d20..000000000 Binary files a/screenshots/uhabits2.png and /dev/null differ diff --git a/screenshots/uhabits2_th.png b/screenshots/uhabits2_th.png deleted file mode 100644 index 474d99fb0..000000000 Binary files a/screenshots/uhabits2_th.png and /dev/null differ diff --git a/screenshots/uhabits3.png b/screenshots/uhabits3.png deleted file mode 100644 index 4c821d874..000000000 Binary files a/screenshots/uhabits3.png and /dev/null differ diff --git a/screenshots/uhabits3_th.png b/screenshots/uhabits3_th.png deleted file mode 100644 index bc84a7d34..000000000 Binary files a/screenshots/uhabits3_th.png and /dev/null differ diff --git a/screenshots/uhabits4.png b/screenshots/uhabits4.png deleted file mode 100644 index 5a9432921..000000000 Binary files a/screenshots/uhabits4.png and /dev/null differ diff --git a/screenshots/uhabits4_th.png b/screenshots/uhabits4_th.png deleted file mode 100644 index 14c583c33..000000000 Binary files a/screenshots/uhabits4_th.png and /dev/null differ diff --git a/screenshots/uhabits5.png b/screenshots/uhabits5.png deleted file mode 100644 index 326ae0d55..000000000 Binary files a/screenshots/uhabits5.png and /dev/null differ diff --git a/screenshots/uhabits5_th.png b/screenshots/uhabits5_th.png deleted file mode 100644 index b1f27f4da..000000000 Binary files a/screenshots/uhabits5_th.png and /dev/null differ diff --git a/screenshots/uhabits6.png b/screenshots/uhabits6.png deleted file mode 100644 index 36579038a..000000000 Binary files a/screenshots/uhabits6.png and /dev/null differ diff --git a/screenshots/uhabits6_th.png b/screenshots/uhabits6_th.png deleted file mode 100644 index 42bacbbf3..000000000 Binary files a/screenshots/uhabits6_th.png and /dev/null differ diff --git a/translators.gradle.kts b/translators.gradle.kts index 2afcaf33b..d14254e0d 100644 --- 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 index 316d05e83..4d05305d6 100644 --- 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 index 18b59f219..db37cb273 100644 --- 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 index dc651abc0..0e9d0c9e2 100644 Binary files a/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/1.png and b/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/1.png differ 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 index edabc5d20..90eda14cf 100644 Binary files a/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/2.png and b/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/2.png differ 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 index 4c821d874..1005d0876 100644 Binary files a/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/3.png and b/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/3.png differ 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 index 5a9432921..57ea919e0 100644 Binary files a/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/4.png and b/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/4.png differ 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 index 326ae0d55..a51548425 100644 Binary files a/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/5.png and b/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/5.png differ 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 index 36579038a..d2b644ea5 100644 Binary files a/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/6.png and b/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/6.png differ 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 index bbebfe656..6aaae23bc 100644 --- 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