Fixed double invocation of show() and target type dialog

.github/workflows/main.yml

@@ -17,7 +17,7 @@ jobs:
       run: ./build.sh build
 
     - name: Run Android tests
-      run: ./build.sh android-tests-parallel 28 29 30 31 32 33
+      run: ./build.sh android-tests-parallel 23 24 25 26 27 28 30 31
 
     - name: Upload artifacts
       if: always()

.gitignore

@@ -12,8 +12,13 @@
 .idea
 .secret
 build
+build/
+captures
 local.properties
 node_modules
 *xcuserdata*
 *.sketch
+/design
+/releases
+/screenshots
 crowdin.yml

.secret/decrypt.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+cd "$(dirname "$0")"
+if [ -z "$GPG_PASSWORD" ]; then
+	echo Env variable GPG_PASSWORD must be defined
+	exit 1
+fi
+gpg \
+	--quiet \
+	--batch \
+	--yes \
+	--decrypt \
+	--passphrase="$GPG_PASSWORD" \
+	--output secret.tar.gz \
+	secret
+tar -xzf secret.tar.gz
+rm secret.tar.gz

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## [2.1.0] -- 2022-09-10
+## [2.1.0] -- Unreleased
 ### Added
 - Allow user to add notes to specific dates (@vbh, #1103)
 - Allow user to track "at most" numerical habits (@KristianTashkov, #1101)
@@ -9,7 +9,6 @@
 - Improve number picker (@hiqua, @iSoron, #1082, #1370)
 - Add new checkmark and number picker (@iSoron, #1370)
 - Allow user to import numerical habits from HabitBull (@hiqua, #1278)
-- Add support for Android 13 themed icons (@cheeeeer, #1497)
 
 ### Removed
 - Hide snooze button Android 12 notifications (@hiqua, #1226)
@@ -29,7 +28,6 @@
 - Fix small issues in calendar chart (@kalina559, #1314)
 - Resort habit list after edit (@hiqua, #1350)
 - Fix marker scaling in frequency display (@eduebernal, #1425)
-- Fix widgets not working correctly on API 33 (@iSoron, #1488)
 
 ### Refactoring & Testing
 - Replace raster icons by vector assets (@kalina559)

build.gradle.kts

@@ -1,11 +1,11 @@
 plugins {
-    val kotlinVersion = "1.7.10"
-    id("com.android.application") version ("7.3.0-rc01") apply (false)
+    val kotlinVersion = "1.6.10"
+    id("com.android.application") version ("7.0.3") apply (false)
     id("org.jetbrains.kotlin.android") version kotlinVersion apply (false)
     id("org.jetbrains.kotlin.kapt") version kotlinVersion apply (false)
     id("org.jetbrains.kotlin.android.extensions") version kotlinVersion apply (false)
     id("org.jetbrains.kotlin.multiplatform") version kotlinVersion apply (false)
-    id("org.jlleitschuh.gradle.ktlint") version "11.0.0"
+    id("org.jlleitschuh.gradle.ktlint") version "10.2.1"
 }
 
 apply {

build.sh

@@ -85,10 +85,10 @@ android_setup() {
         $AVDMANAGER delete avd --name $AVDNAME
 
         log_info "Creating new Android virtual device (API $API)..."
-        (echo "y" | $SDKMANAGER --install "system-images;android-$API;google_apis;x86_64") || return 1
+        (echo "y" | $SDKMANAGER --install "system-images;android-$API;default;x86_64") || return 1
         $AVDMANAGER create avd \
                 --name $AVDNAME \
-                --package "system-images;android-$API;google_apis;x86_64" \
+                --package "system-images;android-$API;default;x86_64" \
                 --device "Nexus 4" || return 1
 
         flock -u 10

docs/BUILD.md

@@ -33,7 +33,7 @@ The repository will be downloaded to the directory `uhabits`.
 2. When the IDE asks you for the project location, select `uhabits` and click "Ok".
 3. Android Studio will spend some time indexing the project. When this is complete, click the toolbar icon "Sync Project with Gradle File", located near the right corner of the top toolbar.
 4. The operation will likely fail several times due to missing Android SDK components. Each time it fails, click the link "Install missing platforms", "Install build tools", etc, and try again.
-5. To test the application, create a virtual Android device using the menu "Tools" and "AVD Manager". The default options should work fine, but feel free to customize the device.
+5. To test the application, create a virtual Android device using the menu "Tools" and "AVD Manager". The default options should work fine, but free to customize the device.
 6. Click the menu "Run" and "uhabits-android". The application should launch.
 
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

landing/.gitignore

@@ -0,0 +1,2 @@
+out/
+.sass-cache

landing/Makefile

@@ -0,0 +1,27 @@
+haml   := src/*.haml
+sass   := src/*.sass
+
+html   := $(patsubst src/%, out/%, $(patsubst %.haml,%.html,$(wildcard $(haml))))
+css    := $(patsubst src/%, out/%, $(patsubst %.sass,%.css,$(wildcard $(sass))))
+src    := $(wildcard src/**)
+
+compile: $(html) $(css)
+	@rsync -rupE assets/ out/
+
+out/%.css: src/%.sass $(src)
+	@echo '    sass  $<'
+	@mkdir -p `dirname $@`
+	@sass $< $@
+
+out/%.html: src/%.haml $(src)
+	@echo '    haml  $<'
+	@mkdir -p `dirname $@`
+	@haml -E UTF-8 $< $@
+
+push:
+	rsync -avP out/ axavier.org:/www/loophabits.org/
+
+clean:
+	@rm -rfv out
+	@rm -rfv tmp
+

landing/README.md

@@ -0,0 +1,27 @@
+Loop Habit Tracker Landing Page
+===============================
+
+This folder contains the source code that generates the project landing page, currently hosted at https://loophabits.org/
+
+Pull requests with ideas for improving it are very welcome.
+
+Build instructions
+------------------
+
+1. Install `haml`:
+```bash
+sudo apt install ruby-haml
+```
+2. Install `pandoc-ruby`:
+```bash
+gem install pandoc-ruby
+```
+3. Run `Makefile`
+```bash
+make
+```
+4. View the results (using, for example, [npm serve](https://www.npmjs.com/package/serve))
+```bash
+npm serve out/
+```
+

landing/assets/faq.html

@@ -0,0 +1 @@
+<meta http-equiv="Refresh" content="0; url='https://github.com/iSoron/uhabits/discussions/689'" />

landing/src/index.haml

@@ -0,0 +1,106 @@
+!!! 5
+%html
+  %head
+    %meta(charset="UTF-8")
+    %link(href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet" type="text/css")
+    %meta(name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no")
+    %title Loop Habit Tracker
+    %link(rel="stylesheet" type="text/css" href="lib/css/bootstrap.min.css")
+    %link(rel="stylesheet" type="text/css" href="index.css")
+
+  %body
+    .navbar.navbar-expand-md.navbar-light.bg-light
+      %a.navbar-brand(href="/")
+        %b Loop
+        Habit Tracker
+      %button.navbar-toggler(type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation")
+        %span.navbar-toggler-icon
+      #navbar.collapse.navbar-collapse
+        %ul.navbar-nav.mr-auto.mt-2.mt-lg-0
+          %li.nav-item
+            %a.nav-link(href="faq.html") FAQ
+          %li.nav-item
+            %a.nav-link(href="privacy.html") Privacy
+          %li.nav-item
+            %a.nav-link(href="https://source.loophabits.org") Source Code
+          %li.nav-item
+            %a.nav-link(href="https://translate.loophabits.org") Translate
+
+    .jumbotron.jumbotron-fluid
+      .site-wrapper
+        .container
+          .row.vertical-align
+            .col-md
+              %h1.display-4
+                Get your life on track
+              %p.lead
+                With daily reminders, beautiful charts and insightful statistics,
+                Loop Habit Tracker™ helps you create and maintain great habits. Completely free and open-source.
+
+              .store-badges
+                %a(href="https://play.google.com/store/apps/details?id=org.isoron.uhabits")
+                  %img(src="images/google-play.png")
+                %a(href="https://f-droid.org/en/packages/org.isoron.uhabits/")
+                  %img(src="images/f-droid.png")
+            .col-md
+              .s2
+                %img.screenshot(src="screenshots/uhabits1.png")
+              .s1
+                %img.screenshot(src="screenshots/uhabits4.png")
+
+    .section.screenshots
+      %span
+        %a(href="screenshots/uhabits1.png")
+          %img(src="screenshots/uhabits1_th.png")
+        %a(href="screenshots/uhabits2.png")
+          %img(src="screenshots/uhabits2_th.png")
+        %a(href="screenshots/uhabits3.png")
+          %img(src="screenshots/uhabits3_th.png")
+      %span
+        %a(href="screenshots/uhabits4.png")
+          %img(src="screenshots/uhabits4_th.png")
+        %a(href="screenshots/uhabits5.png")
+          %img(src="screenshots/uhabits5_th.png")
+
+    .section
+      .feature-header
+        %h1
+          Features
+      .container
+        .row
+          .col-md
+            %ul
+              %li
+                %h3 Habit score
+                Loop has an advanced formula for calculating the strength of your habits. Every repetition makes your habit stronger and every missed day makes it weaker. A few missed days after a long streak, however, will not completely destroy your progress, unlike many other don't-break-the-chain apps.
+
+              %li
+                %h3 Flexible schedules
+                In addition to daily habits, Loop supports habits with more complex schedules, such as 3 times per week or every other day.
+              %li
+                %h3 Reminders
+                Schedule notifications to remind you of your habits. Each habit can have its own reminder, at a chosen time of the day. Easily check or dismiss your habit directly from the notification.
+              %li
+                %h3 Widgets
+                Be reminded of your habits whenever you unlock your phone. Colorful widgets allow you to track your habits directly from your home screen, without even opening the app.
+          .col-md
+            %ul
+              %li
+                %h3 Take control of your data
+                If you want to further analyze your data, or move it to another service, Loop allows you to export it to spreadsheets (CSV) or to a database file (SQLite). For power users, check marks can be added through task automation apps such as Tasker.
+              %li
+                %h3 No limitations
+                Track as many habits as you wish. Loop imposes no artificial limits on how many habits you can have. All features are available to all users, and there are no in-app purchases.
+              %li
+                %h3 Completely ad-free and open source
+                There are no advertisements, annoying notifications or intrusive permissions in this app, and there will never be. The app is completely open-source (GPLv3).
+              %li
+                %h3 Works offline and respects your privacy
+                Loop doesn't require an Internet connection or online account registration. Your confidential data is never sent to anyone. Neither the developers nor any third-parties have access to it.
+
+    .section.footer
+      Copyright © 2016–2020, Alinson Santos Xavier. All Rights Reserved.
+
+
+    %script(type="text/javascript" src="lib/js/jquery.min.js")
+    %script(type="text/javascript" src="lib/js/bootstrap.bundle.min.js")

landing/src/index.sass

@@ -0,0 +1,104 @@
+html, body
+  max-width: 100%
+  overflow-x: hidden
+
+body
+  font-family: 'Open Sans', sans-serif
+  padding-bottom: 0
+
+a, a:hover
+  text-decoration: none
+
+.navbar
+  box-shadow: rgba(0,0,0,0.4) 0px 0px 20px
+  background-color: white !important
+
+.nav-link
+  margin: 0px 18px
+
+.section
+  background-color: transparent
+  padding: 18px 0px
+
+.container
+  ul
+    list-style-type: none
+  h3
+    font-size: 16px
+    font-weight: bold
+    margin: 18px 0px 0px 0px
+
+.screenshots
+  text-align: center
+  background-color: #222
+  img
+    margin: 0.5%
+    border-radius: 10px
+    border: 3px solid #fff2
+    box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.5)
+    max-width: 17%
+
+.footer
+  color: #888
+  background-color: #222
+  text-align: center
+  font-size: 12px
+
+.jumbotron
+  background: linear-gradient(rgba(0,30,200,0.8),rgba(90,30,150,0.5)), url("images/hero-background-filter.jpg")
+  box-shadow: rgba(0,0,0,0.5) 0px 0px 20px
+  margin: 0
+  h1
+    max-width: 25rem
+    font-weight: bold
+    color: white
+  p
+    max-width: 40rem
+    color: white
+  .screenshot
+    box-shadow: rgba(0, 0, 0, 0.5) 5px 5px 20px
+    padding: 0px 0px 0px 0px
+    border-radius: 10px
+    border: 2px solid rgba(255, 255, 255, 0.2)
+    background-color: transparent
+    max-width: 300px
+  .store-badges
+    margin: 2rem 1rem
+    img
+      opacity: 0.8
+      height: 75px
+    img:hover
+      opacity: 1.0
+  .s1
+    padding-bottom: 50px
+    padding-left: 50px
+  .s2
+    position: absolute
+    top: 50px
+    left: 175px
+
+.feature-header
+  text-align: center
+  font-weight: bold
+  padding: 18px
+
+.align-right
+  text-align: right
+
+.vertical-align
+  display: flex
+  align-items: center
+
+.content
+  max-width: 800px
+  margin: 18px auto
+  padding: 0px 18px
+  //padding-left: 120px
+  h2, h3, h4
+    margin: 27px 0px 9px 0px
+  h2, h3
+    //margin-left: -120px
+  h4
+    //margin-left: -60px
+    font-size: 16px
+    font-weight: bold

landing/src/privacy.haml

@@ -0,0 +1,32 @@
+!!! 5
+%html
+  %head
+    %meta(charset="UTF-8")
+    %link(href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet" type="text/css")
+    %meta(name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no")
+    %title Privacy | Loop Habit Tracker
+    %link(rel="stylesheet" type="text/css" href="lib/css/bootstrap.min.css")
+    %link(rel="stylesheet" type="text/css" href="index.css")
+
+  %body
+    .navbar.navbar-expand-md.navbar-light.bg-light
+      %a.navbar-brand(href="/")
+        %b Loop
+        Habit Tracker
+      %button.navbar-toggler(type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation")
+        %span.navbar-toggler-icon
+      #navbar.collapse.navbar-collapse
+        %ul.navbar-nav.mr-auto.mt-2.mt-lg-0
+          %li.nav-item
+            %a.nav-link(href="faq.html") FAQ
+          %li.nav-item
+            %a.nav-link(href="privacy.html") Privacy
+          %li.nav-item
+            %a.nav-link(href="https://source.loophabits.org") Source Code
+          %li.nav-item
+            %a.nav-link(href="https://translate.loophabits.org") Translate
+
+  %body
+    .content
+      :markdown
+        #{File.open("src/privacy.md").read}

landing/src/privacy.md

@@ -0,0 +1,14 @@
+## Privacy Policy
+
+- All data provided to Loop Habit Tracker is only stored locally in your
+  device.  Loop Habit Tracker does not upload your data anywhere. The
+  developers of Loop Habit Tracker do not have access to your data.
+
+- Your data is not shared with any 3rd parties. Loop Habit Tracker does not
+  include any advertisement libraries or any 3rd party tracking (analytics)
+  code, such as Google Analytics or Facebook SDK.
+
+- If you have activated "backup & reset" in your phone settings (Settings /
+  Backup & Reset / Back up my data), you should be aware that Android itself
+  will periodically save a copy of your phone's data in Google's servers.  The
+  developers of Loop Habit Tracker do not have access to this data.

uhabits-android/build.gradle.kts

@@ -32,12 +32,12 @@ tasks.compileLint {
 
 android {
 
-    compileSdk = 32
+    compileSdk = 31
 
     defaultConfig {
         versionCode = 20100
         versionName = "2.1.0"
-        minSdk = 28
+        minSdk = 23
         targetSdk = 31
         applicationId = "org.isoron.uhabits"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -68,6 +68,12 @@ android {
         }
     }
 
+    lint {
+        isCheckReleaseBuilds = false
+        isAbortOnError = false
+        disable("GoogleAppIndexingWarning")
+    }
+
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
         targetCompatibility(JavaVersion.VERSION_1_8)
@@ -80,25 +86,25 @@ android {
 }
 
 dependencies {
-    val daggerVersion = "2.43.2"
-    val kotlinVersion = "1.7.10"
-    val kxCoroutinesVersion = "1.6.4"
+    val daggerVersion = "2.41"
+    val kotlinVersion = "1.6.21"
+    val kxCoroutinesVersion = "1.6.1"
     val ktorVersion = "1.6.8"
     val espressoVersion = "3.4.0"
 
     androidTestImplementation("androidx.test.espresso:espresso-contrib:$espressoVersion")
     androidTestImplementation("androidx.test.espresso:espresso-core:$espressoVersion")
     androidTestImplementation("com.google.dagger:dagger:$daggerVersion")
-    androidTestImplementation("com.linkedin.dexmaker:dexmaker-mockito:2.28.3")
+    androidTestImplementation("com.linkedin.dexmaker:dexmaker-mockito:2.28.1")
     androidTestImplementation("io.ktor:ktor-client-mock:$ktorVersion")
     androidTestImplementation("io.ktor:ktor-jackson:$ktorVersion")
-    androidTestImplementation("androidx.annotation:annotation:1.4.0")
+    androidTestImplementation("androidx.annotation:annotation:1.3.0")
     androidTestImplementation("androidx.test.ext:junit:1.1.3")
     androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0")
     androidTestImplementation("androidx.test:rules:1.4.0")
     androidTestImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
     compileOnly("javax.annotation:jsr250-api:1.0")
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
     implementation("com.github.AppIntro:AppIntro:6.2.0")
     implementation("com.google.code.findbugs:jsr305:3.0.2")
     implementation("com.google.dagger:dagger:$daggerVersion")
@@ -110,10 +116,10 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$kxCoroutinesVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kxCoroutinesVersion")
-    implementation("androidx.appcompat:appcompat:1.5.0")
+    implementation("androidx.appcompat:appcompat:1.4.1")
     implementation("androidx.legacy:legacy-preference-v14:1.0.0")
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
-    implementation("com.google.android.material:material:1.6.1")
+    implementation("com.google.android.material:material:1.5.0")
     implementation("com.opencsv:opencsv:5.6")
     implementation(project(":uhabits-core"))
     kapt("com.google.dagger:dagger-compiler:$daggerVersion")

uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.kt

@@ -20,7 +20,6 @@ package org.isoron.uhabits.acceptance.steps
 
 import android.os.Build
 import android.os.Build.VERSION.SDK_INT
-import android.os.Build.VERSION_CODES
 import androidx.annotation.StringRes
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.espresso.Espresso
@@ -74,7 +73,7 @@ object CommonSteps : BaseUserInterfaceTest() {
     }
 
     fun offsetHeaders() {
-        device.swipe(500, 160, 350, 160, 20)
+        device.swipe(750, 160, 600, 160, 20)
     }
 
     fun scrollToText(text: String?) {

uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.kt

@@ -53,7 +53,6 @@ object ListHabitsSteps {
                 clickViewWithId(R.id.action_filter)
                 CommonSteps.clickText(R.string.hide_completed)
             }
-            else -> throw RuntimeException()
         }
         device.waitForIdle()
     }

uhabits-android/src/main/AndroidManifest.xml

@@ -79,14 +79,6 @@
                 android:value=".activities.habits.list.ListHabitsActivity" />
         </activity>
 
-        <activity
-            android:name=".activities.sync.SyncActivity"
-            android:label="@string/device_sync">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activities.sync.SyncActivity" />
-        </activity>
-
         <activity
             android:name=".activities.intro.IntroActivity"
             android:label=""

uhabits-android/src/main/java/com/android/datetimepicker/Utils.java

@@ -22,6 +22,7 @@ import android.animation.Keyframe;
 import android.animation.ObjectAnimator;
 import android.animation.PropertyValuesHolder;
 import android.annotation.SuppressLint;
+import android.os.Build;
 import android.text.format.Time;
 import android.view.View;
 
@@ -42,13 +43,17 @@ public class Utils {
 
     static final String SHARED_PREFS_NAME = "com.android.calendar_preferences";
 
+    public static boolean isJellybeanOrLater() {
+      return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN;
+    }
+
     /**
      * Try to speak the specified text, for accessibility. Only available on JB or later.
      * @param text Text to announce.
      */
     @SuppressLint("NewApi")
     public static void tryAccessibilityAnnounce(View view, CharSequence text) {
-        if (view != null && text != null) {
+        if (isJellybeanOrLater() && view != null && text != null) {
             view.announceForAccessibility(text);
         }
     }

uhabits-android/src/main/java/com/android/datetimepicker/date/DayPickerView.java

@@ -383,6 +383,10 @@ public abstract class DayPickerView extends ListView implements OnScrollListener
             if (child instanceof MonthView) {
                 final CalendarDay focus = ((MonthView) child).getAccessibilityFocus();
                 if (focus != null) {
+                    if (Build.VERSION.SDK_INT == Build.VERSION_CODES.JELLY_BEAN_MR1) {
+                        // Clear focus to avoid ListView bug in Jelly Bean MR1.
+                        ((MonthView) child).clearAccessibilityFocus();
+                    }
                     return focus;
                 }
             }

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkPopup.kt

@@ -26,6 +26,7 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import org.isoron.uhabits.R
+import org.isoron.uhabits.activities.common.dialogs.MultipleDialogsHandler.Companion.dismissCurrent
 import org.isoron.uhabits.core.models.Entry.Companion.NO
 import org.isoron.uhabits.core.models.Entry.Companion.SKIP
 import org.isoron.uhabits.core.models.Entry.Companion.UNKNOWN
@@ -35,7 +36,6 @@ import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.databinding.CheckmarkPopupBinding
 import org.isoron.uhabits.utils.InterfaceUtils.getFontAwesome
 import org.isoron.uhabits.utils.dimBehind
-import org.isoron.uhabits.utils.dismissCurrentAndShow
 import org.isoron.uhabits.utils.dp
 import org.isoron.uhabits.utils.sres
 
@@ -118,7 +118,8 @@ class CheckmarkPopup(
         view.unknownBtn.setOnClickListener { onClick(UNKNOWN) }
         dialog.setCanceledOnTouchOutside(true)
         dialog.dimBehind()
-        dialog.dismissCurrentAndShow()
+        dialog.dismissCurrent()
+        dialog.show()
     }
 
     fun save() {

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.kt

@@ -18,7 +18,10 @@
  */
 package org.isoron.uhabits.activities.common.dialogs
 
+import android.app.Dialog
+import android.os.Bundle
 import com.android.colorpicker.ColorPickerDialog
+import org.isoron.uhabits.activities.common.dialogs.MultipleDialogsHandler.Companion.dismissCurrent
 import org.isoron.uhabits.core.ui.callbacks.OnColorPickedCallback
 import org.isoron.uhabits.utils.toPaletteColor
 
@@ -32,4 +35,10 @@ class ColorPickerDialog : ColorPickerDialog() {
             callback.onColorPicked(pc)
         }
     }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState)
+        dialog.dismissCurrent()
+        return dialog
+    }
 }

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.kt

@@ -22,6 +22,7 @@ import android.content.Context
 import android.content.DialogInterface
 import androidx.appcompat.app.AlertDialog
 import org.isoron.uhabits.R
+import org.isoron.uhabits.activities.common.dialogs.MultipleDialogsHandler.Companion.dismissCurrent
 import org.isoron.uhabits.core.ui.callbacks.OnConfirmedCallback
 import org.isoron.uhabits.inject.ActivityContext
 
@@ -45,5 +46,7 @@ class ConfirmDeleteDialog(
             BUTTON_NEGATIVE,
             res.getString(R.string.no)
         ) { dialog: DialogInterface?, which: Int -> }
+
+        this.dismissCurrent()
     }
 }

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/FrequencyPickerDialog.kt

@@ -31,6 +31,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatDialogFragment
 import kotlinx.android.synthetic.main.frequency_picker_dialog.view.*
 import org.isoron.uhabits.R
+import org.isoron.uhabits.activities.common.dialogs.MultipleDialogsHandler.Companion.dismissCurrent
 
 class FrequencyPickerDialog(
     var freqNumerator: Int,
@@ -111,10 +112,12 @@ class FrequencyPickerDialog(
             if (hasFocus) check(contentView.xTimesPerYDaysRadioButton)
         }
 
-        return AlertDialog.Builder(requireActivity())
+        val dialog = AlertDialog.Builder(requireActivity())
             .setView(contentView)
             .setPositiveButton(R.string.save) { _, _ -> onSaveClicked() }
             .create()
+        dialog.dismissCurrent()
+        return dialog
     }
 
     private fun addBeforeAfterText(
@@ -149,10 +152,8 @@ class FrequencyPickerDialog(
             }
             contentView.xTimesPerYDaysRadioButton.isChecked -> {
                 if (contentView.xTimesPerYDaysXTextView.text.isNotEmpty() && contentView.xTimesPerYDaysYTextView.text.isNotEmpty()) {
-                    numerator =
-                        Integer.parseInt(contentView.xTimesPerYDaysXTextView.text.toString())
-                    denominator =
-                        Integer.parseInt(contentView.xTimesPerYDaysYTextView.text.toString())
+                    numerator = Integer.parseInt(contentView.xTimesPerYDaysXTextView.text.toString())
+                    denominator = Integer.parseInt(contentView.xTimesPerYDaysYTextView.text.toString())
                 }
             }
             else -> {

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/MultipleDialogsHandler.kt

@@ -0,0 +1,15 @@
+package org.isoron.uhabits.activities.common.dialogs
+
+import android.app.Dialog
+import java.lang.ref.WeakReference
+
+class MultipleDialogsHandler {
+    companion object {
+        var currentDialog: WeakReference<Dialog> = WeakReference(null)
+
+        fun Dialog.dismissCurrent() {
+            currentDialog.get()?.dismiss()
+            currentDialog = WeakReference(this)
+        }
+    }
+}

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPopup.kt

@@ -27,11 +27,11 @@ import android.view.MotionEvent.ACTION_DOWN
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import org.isoron.uhabits.activities.common.dialogs.MultipleDialogsHandler.Companion.dismissCurrent
 import org.isoron.uhabits.core.models.Entry
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.databinding.CheckmarkPopupBinding
 import org.isoron.uhabits.utils.dimBehind
-import org.isoron.uhabits.utils.dismissCurrentAndShow
 import org.isoron.uhabits.utils.dp
 import org.isoron.uhabits.utils.requestFocusWithKeyboard
 import java.text.DecimalFormat
@@ -104,7 +104,8 @@ class NumberPopup(
         view.value.requestFocusWithKeyboard()
         dialog.setCanceledOnTouchOutside(true)
         dialog.dimBehind()
-        dialog.dismissCurrentAndShow()
+        dialog.dismissCurrent()
+        dialog.show()
     }
 
     fun save() {

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.kt

@@ -25,6 +25,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatDialogFragment
 import org.isoron.uhabits.R
+import org.isoron.uhabits.activities.common.dialogs.MultipleDialogsHandler.Companion.dismissCurrent
 import org.isoron.uhabits.core.models.WeekdayList
 import org.isoron.uhabits.core.utils.DateUtils
 import java.util.Calendar
@@ -74,7 +75,9 @@ class WeekdayPickerDialog :
                 android.R.string.cancel
             ) { _: DialogInterface?, _: Int -> dismiss() }
 
-        return builder.create()
+        val dialog = builder.create()
+        dialog.dismissCurrent()
+        return dialog
     }
 
     fun setListener(listener: OnWeekdaysPickedListener?) {

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.kt

@@ -63,9 +63,7 @@ class FrequencyChart : ScrollableChart {
     private var primaryColor = 0
     private var isBackgroundTransparent = false
     private lateinit var frequency: HashMap<Timestamp, Array<Int>>
-    private var maxFreq = 0
     private var firstWeekday = Calendar.SUNDAY
-    private var isNumerical: Boolean = false
 
     constructor(context: Context?) : super(context) {
         init()
@@ -82,14 +80,8 @@ class FrequencyChart : ScrollableChart {
         postInvalidate()
     }
 
-    fun setIsNumerical(type: Boolean) {
-        isNumerical = type
-        postInvalidate()
-    }
-
     fun setFrequency(frequency: java.util.HashMap<Timestamp, Array<Int>>) {
         this.frequency = frequency
-        maxFreq = getMaxFreq(frequency)
         postInvalidate()
     }
 
@@ -98,15 +90,6 @@ class FrequencyChart : ScrollableChart {
         postInvalidate()
     }
 
-    private fun getMaxFreq(frequency: HashMap<Timestamp, Array<Int>>): Int {
-        var maxValue = 1
-        for (values in frequency.values) for (value in values) maxValue = max(
-            value,
-            maxValue
-        )
-        return maxValue
-    }
-
     fun setIsBackgroundTransparent(isBackgroundTransparent: Boolean) {
         this.isBackgroundTransparent = isBackgroundTransparent
         initColors()
@@ -230,7 +213,7 @@ class FrequencyChart : ScrollableChart {
         canvas.drawLine(rGrid.left, rGrid.top, rGrid.right, rGrid.top, pGrid!!)
     }
 
-    private fun drawMarker(canvas: Canvas, rect: RectF?, value: Int?, weekdayFrequency: Int) {
+    private fun drawMarker(canvas: Canvas, rect: RectF?, value: Int?, frequency: Int) {
         // value can be negative when the entry is skipped
         val valueCopy = value?.let { max(0, it) }
 
@@ -238,8 +221,8 @@ class FrequencyChart : ScrollableChart {
         // maximal allowed mark radius
         val maxRadius = (rect.height() - 2 * padding) / 2.0f
         // the real mark radius is scaled down by a factor depending on the maximal frequency
-        val scalingFactor = if (isNumerical) maxFreq else weekdayFrequency
-        val scale = 1.0f / scalingFactor * valueCopy!!
+
+        val scale = 1.0f / frequency * valueCopy!!
         val radius = maxRadius * scale
         val colorIndex = min((colors.size - 1), ((colors.size - 1) * scale).roundToInt())
         pGraph!!.color = colors[colorIndex]
@@ -302,6 +285,5 @@ class FrequencyChart : ScrollableChart {
             frequency[Timestamp(date)] = values
             date.add(Calendar.MONTH, -1)
         }
-        maxFreq = getMaxFreq(frequency)
     }
 }

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt

@@ -46,6 +46,7 @@ import org.isoron.uhabits.R
 import org.isoron.uhabits.activities.AndroidThemeSwitcher
 import org.isoron.uhabits.activities.common.dialogs.ColorPickerDialogFactory
 import org.isoron.uhabits.activities.common.dialogs.FrequencyPickerDialog
+import org.isoron.uhabits.activities.common.dialogs.MultipleDialogsHandler.Companion.dismissCurrent
 import org.isoron.uhabits.activities.common.dialogs.WeekdayPickerDialog
 import org.isoron.uhabits.core.commands.CommandRunner
 import org.isoron.uhabits.core.commands.CreateHabitCommand
@@ -59,7 +60,6 @@ import org.isoron.uhabits.core.models.Reminder
 import org.isoron.uhabits.core.models.WeekdayList
 import org.isoron.uhabits.databinding.ActivityEditHabitBinding
 import org.isoron.uhabits.utils.ColorUtils
-import org.isoron.uhabits.utils.dismissCurrentAndShow
 import org.isoron.uhabits.utils.formatTime
 import org.isoron.uhabits.utils.toFormattedString
 
@@ -157,23 +157,23 @@ class EditHabitActivity : AppCompatActivity() {
 
         val colorPickerDialogFactory = ColorPickerDialogFactory(this)
         binding.colorButton.setOnClickListener {
-            val picker = colorPickerDialogFactory.create(color, themeSwitcher.currentTheme)
-            picker.setListener { paletteColor ->
+            val dialog = colorPickerDialogFactory.create(color, themeSwitcher.currentTheme)
+            dialog.setListener { paletteColor ->
                 this.color = paletteColor
                 updateColors()
             }
-            picker.dismissCurrentAndShow(supportFragmentManager, "colorPicker")
+            dialog.show(supportFragmentManager, "colorPicker")
         }
 
         populateFrequency()
         binding.booleanFrequencyPicker.setOnClickListener {
-            val picker = FrequencyPickerDialog(freqNum, freqDen)
-            picker.onFrequencyPicked = { num, den ->
+            val dialog = FrequencyPickerDialog(freqNum, freqDen)
+            dialog.onFrequencyPicked = { num, den ->
                 freqNum = num
                 freqDen = den
                 populateFrequency()
             }
-            picker.dismissCurrentAndShow(supportFragmentManager, "frequencyPicker")
+            dialog.show(supportFragmentManager, "frequencyPicker")
         }
 
         populateTargetType()
@@ -191,7 +191,8 @@ class EditHabitActivity : AppCompatActivity() {
                 dialog.dismiss()
             }
             val dialog = builder.create()
-            dialog.dismissCurrentAndShow()
+            dialog.dismissCurrent()
+            dialog.show()
         }
 
         binding.numericalFrequencyPicker.setOnClickListener {
@@ -237,7 +238,7 @@ class EditHabitActivity : AppCompatActivity() {
                 is24HourMode,
                 androidColor
             )
-            dialog.dismissCurrentAndShow(supportFragmentManager, "timePicker")
+            dialog.show(supportFragmentManager, "timePicker")
         }
 
         binding.reminderDatePicker.setOnClickListener {
@@ -249,7 +250,7 @@ class EditHabitActivity : AppCompatActivity() {
                 populateReminder()
             }
             dialog.setSelectedDays(reminderDays)
-            dialog.dismissCurrentAndShow(supportFragmentManager, "dayPicker")
+            dialog.show(supportFragmentManager, "dayPicker")
         }
 
         binding.buttonSave.setOnClickListener {

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/HabitTypeDialog.kt

@@ -40,13 +40,13 @@ class HabitTypeDialog : AppCompatDialogFragment() {
         val binding = SelectHabitTypeBinding.inflate(inflater, container, false)
 
         binding.buttonYesNo.setOnClickListener {
-            val intent = IntentFactory().startEditActivity(requireActivity(), HabitType.YES_NO.value)
+            val intent = IntentFactory().startEditActivity(activity!!, HabitType.YES_NO.value)
             startActivity(intent)
             dismiss()
         }
 
         binding.buttonMeasurable.setOnClickListener {
-            val intent = IntentFactory().startEditActivity(requireActivity(), HabitType.NUMERICAL.value)
+            val intent = IntentFactory().startEditActivity(activity!!, HabitType.NUMERICAL.value)
             startActivity(intent)
             dismiss()
         }

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt

@@ -21,7 +21,6 @@ package org.isoron.uhabits.activities.habits.list
 
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
@@ -85,6 +84,7 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
         Thread.setDefaultUncaughtExceptionHandler(BaseExceptionHandler(this))
         component.listHabitsBehavior.onStartup()
         setContentView(rootView)
+        parseIntents()
     }
 
     override fun onPause() {
@@ -100,17 +100,11 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
         rootView.postInvalidate()
         midnightTimer.onResume()
         taskRunner.run {
-            try {
-                AutoBackup(this@ListHabitsActivity).run()
-                appComponent.widgetUpdater.updateWidgets()
-            } catch (e: Exception) {
-                Log.e("ListHabitActivity", "TaskRunner failed", e)
-            }
+            AutoBackup(this@ListHabitsActivity).run()
         }
         if (prefs.theme == THEME_DARK && prefs.isPureBlackEnabled != pureBlack) {
             restartWithFade(ListHabitsActivity::class.java)
         }
-        parseIntents()
         super.onResume()
     }
 
@@ -130,7 +124,6 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
     }
 
     private fun parseIntents() {
-        if (intent == null) return
         if (intent.action == ACTION_EDIT) {
             val habitId = intent.extras?.getLong("habit")
             val timestamp = intent.extras?.getLong("timestamp")
@@ -139,12 +132,6 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
                 component.listHabitsBehavior.onEdit(habit, Timestamp(timestamp))
             }
         }
-        intent = null
-    }
-
-    override fun onNewIntent(intent: Intent?) {
-        super.onNewIntent(intent)
-        setIntent(intent)
     }
 
     companion object {

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt

@@ -64,7 +64,6 @@ import org.isoron.uhabits.tasks.ImportDataTask
 import org.isoron.uhabits.tasks.ImportDataTaskFactory
 import org.isoron.uhabits.utils.copyTo
 import org.isoron.uhabits.utils.currentTheme
-import org.isoron.uhabits.utils.dismissCurrentAndShow
 import org.isoron.uhabits.utils.restartWithFade
 import org.isoron.uhabits.utils.showMessage
 import org.isoron.uhabits.utils.showSendEmailScreen
@@ -164,7 +163,7 @@ class ListHabitsScreen
     }
 
     override fun showDeleteConfirmationScreen(callback: OnConfirmedCallback, quantity: Int) {
-        ConfirmDeleteDialog(activity, callback, quantity).dismissCurrentAndShow()
+        ConfirmDeleteDialog(activity, callback, quantity).show()
     }
 
     override fun showEditHabitsScreen(selected: List<Habit>) {
@@ -225,7 +224,7 @@ class ListHabitsScreen
     override fun showColorPicker(defaultColor: PaletteColor, callback: OnColorPickedCallback) {
         val picker = colorPickerFactory.create(defaultColor, themeSwitcher.currentTheme!!)
         picker.setListener(callback)
-        picker.dismissCurrentAndShow(activity.supportFragmentManager, "picker")
+        picker.show(activity.supportFragmentManager, "picker")
     }
 
     override fun showNumberPopup(

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt

@@ -50,7 +50,6 @@ import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitPresenter
 import org.isoron.uhabits.core.ui.views.OnDateClickedListener
 import org.isoron.uhabits.intents.IntentFactory
 import org.isoron.uhabits.utils.currentTheme
-import org.isoron.uhabits.utils.dismissCurrentAndShow
 import org.isoron.uhabits.utils.showMessage
 import org.isoron.uhabits.utils.showSendFileScreen
 import org.isoron.uhabits.widgets.WidgetUpdater
@@ -221,7 +220,6 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
                 ShowHabitMenuPresenter.Message.COULD_NOT_EXPORT -> {
                     showMessage(resources.getString(R.string.could_not_export))
                 }
-                else -> {}
             }
         }
 
@@ -230,7 +228,7 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
         }
 
         override fun showDeleteConfirmationScreen(callback: OnConfirmedCallback) {
-            ConfirmDeleteDialog(this@ShowHabitActivity, callback, 1).dismissCurrentAndShow()
+            ConfirmDeleteDialog(this@ShowHabitActivity, callback, 1).show()
         }
 
         override fun close() {

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardView.kt

@@ -33,7 +33,6 @@ class FrequencyCardView(context: Context, attrs: AttributeSet) : LinearLayout(co
     fun setState(state: FrequencyCardState) {
         val androidColor = state.theme.color(state.color).toInt()
         binding.frequencyChart.setFrequency(state.frequency)
-        binding.frequencyChart.setIsNumerical(state.isNumerical)
         binding.frequencyChart.setFirstWeekday(state.firstWeekday)
         binding.title.setTextColor(androidColor)
         binding.frequencyChart.setColor(androidColor)

uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt

@@ -22,6 +22,8 @@ import android.app.backup.BackupManager
 import android.content.Intent
 import android.content.SharedPreferences
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener
+import android.os.Build
+import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
 import android.provider.Settings
 import android.util.Log
@@ -63,7 +65,7 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         addPreferencesFromResource(R.xml.preferences)
-        val appContext = requireContext().applicationContext
+        val appContext = context!!.applicationContext
         if (appContext is HabitsApplication) {
             prefs = appContext.component.preferences
             widgetUpdater = appContext.component.widgetUpdater
@@ -96,9 +98,10 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
             showRingtonePicker()
             return true
         } else if (key == "reminderCustomize") {
-            createAndroidNotificationChannel(requireContext())
+            if (SDK_INT < Build.VERSION_CODES.O) return true
+            createAndroidNotificationChannel(context!!)
             val intent = Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
-            intent.putExtra(Settings.EXTRA_APP_PACKAGE, requireContext().packageName)
+            intent.putExtra(Settings.EXTRA_APP_PACKAGE, context!!.packageName)
             intent.putExtra(Settings.EXTRA_CHANNEL_ID, NotificationTray.REMINDERS_CHANNEL_ID)
             startActivity(intent)
             return true
@@ -108,7 +111,7 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
 
     override fun onResume() {
         super.onResume()
-        ringtoneManager = RingtoneManager(requireActivity())
+        ringtoneManager = RingtoneManager(activity!!)
         sharedPrefs = preferenceManager.sharedPreferences
         sharedPrefs!!.registerOnSharedPreferenceChangeListener(this)
         if (!prefs.isDeveloper) {
@@ -117,7 +120,11 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
         }
         updateWeekdayPreference()
 
-        findPreference("reminderSound").isVisible = false
+        if (SDK_INT < Build.VERSION_CODES.O)
+            findPreference("reminderCustomize").isVisible = false
+        else {
+            findPreference("reminderSound").isVisible = false
+        }
     }
 
     private fun updateWeekdayPreference() {
@@ -147,8 +154,8 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
         val pref = findPreference(key)
         pref.onPreferenceClickListener =
             Preference.OnPreferenceClickListener {
-                requireActivity().setResult(result)
-                requireActivity().finish()
+                activity!!.setResult(result)
+                activity!!.finish()
                 true
             }
     }

uhabits-android/src/main/java/org/isoron/uhabits/activities/sync/SyncActivity.kt

@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
- *
- * This file is part of Loop Habit Tracker.
- *
- * Loop Habit Tracker is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Loop Habit Tracker is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits.activities.sync
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.widget.EditText
-import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
-import org.isoron.uhabits.HabitsApplication
-import org.isoron.uhabits.R
-import org.isoron.uhabits.activities.AndroidThemeSwitcher
-import org.isoron.uhabits.core.models.PaletteColor
-import org.isoron.uhabits.databinding.SyncActivityBinding
-import org.isoron.uhabits.utils.setupToolbar
-
-class SyncActivity : AppCompatActivity() {
-
-    private lateinit var binding: SyncActivityBinding
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        val component = (application as HabitsApplication).component
-        val themeSwitcher = AndroidThemeSwitcher(this, component.preferences)
-        themeSwitcher.apply()
-
-        binding = SyncActivityBinding.inflate(LayoutInflater.from(this))
-        binding.root.setupToolbar(
-            toolbar = binding.toolbar,
-            title = resources.getString(R.string.device_sync),
-            color = PaletteColor(11),
-            theme = themeSwitcher.currentTheme,
-        )
-        binding.generateButton.setOnClickListener { onGenerateCode() }
-        binding.enterButton.setOnClickListener {
-            val et = EditText(this)
-            AlertDialog.Builder(this)
-                .setTitle(R.string.sync_code)
-                .setView(et)
-                .setPositiveButton(R.string.save) { _, _ ->
-                    onEnterCode(et.text.toString())
-                }
-                .show()
-        }
-        binding.disableButton.setOnClickListener {
-            AlertDialog.Builder(this)
-                .setTitle(R.string.disable_sync)
-                .setMessage(R.string.disable_sync_description)
-                .setPositiveButton(R.string.disable) { _, _ ->
-                    onDisableSync()
-                }
-                .setNegativeButton(R.string.keep_enabled) { dialog, _ ->
-                    dialog.dismiss()
-                }
-                .show()
-        }
-
-        setContentView(binding.root)
-    }
-
-    private fun onGenerateCode() {
-        showCodeScreen()
-    }
-
-    private fun onEnterCode(code: String) {
-        showCodeScreen()
-    }
-
-    private fun onDisableSync() {
-        showIntroScreen()
-    }
-
-    private fun showCodeScreen() {
-        binding.introGroup.visibility = View.GONE
-        binding.codeGroup.visibility = View.VISIBLE
-    }
-
-    private fun showIntroScreen() {
-        binding.introGroup.visibility = View.VISIBLE
-        binding.codeGroup.visibility = View.GONE
-    }
-}

uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt

@@ -21,16 +21,13 @@ package org.isoron.uhabits.intents
 
 import android.app.PendingIntent
 import android.app.PendingIntent.FLAG_IMMUTABLE
-import android.app.PendingIntent.FLAG_MUTABLE
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.app.PendingIntent.getActivity
 import android.app.PendingIntent.getBroadcast
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
 import org.isoron.uhabits.activities.habits.list.ListHabitsActivity
-import org.isoron.uhabits.activities.habits.show.ShowHabitActivity
 import org.isoron.uhabits.core.AppScope
 import org.isoron.uhabits.core.models.Habit
 import org.isoron.uhabits.core.models.Timestamp
@@ -92,20 +89,6 @@ class PendingIntentFactory
             )
             .getPendingIntent(0, FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT)!!
 
-    fun showHabitTemplate(): PendingIntent {
-        return getActivity(
-            context,
-            0,
-            Intent(context, ShowHabitActivity::class.java),
-            getIntentTemplateFlags()
-        )
-    }
-
-    fun showHabitFillIn(habit: Habit) =
-        Intent().apply {
-            data = Uri.parse(habit.uriString)
-        }
-
     fun showReminder(
         habit: Habit,
         reminderTime: Long?,
@@ -159,7 +142,7 @@ class PendingIntentFactory
     fun showNumberPicker(habit: Habit, timestamp: Timestamp): PendingIntent? {
         return getActivity(
             context,
-            (habit.id!! % Integer.MAX_VALUE).toInt() + 1,
+            0,
             Intent(context, ListHabitsActivity::class.java).apply {
                 action = ListHabitsActivity.ACTION_EDIT
                 putExtra("habit", habit.id)
@@ -168,43 +151,4 @@ class PendingIntentFactory
             FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT
         )
     }
-
-    fun showNumberPickerTemplate(): PendingIntent {
-        return getActivity(
-            context,
-            1,
-            Intent(context, ListHabitsActivity::class.java).apply {
-                action = ListHabitsActivity.ACTION_EDIT
-            },
-            getIntentTemplateFlags()
-        )
-    }
-
-    fun showNumberPickerFillIn(habit: Habit, timestamp: Timestamp) = Intent().apply {
-        putExtra("habit", habit.id)
-        putExtra("timestamp", timestamp.unixTime)
-    }
-
-    private fun getIntentTemplateFlags(): Int {
-        var flags = 0
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            flags = flags or FLAG_MUTABLE
-        }
-        return flags
-    }
-
-    fun toggleCheckmarkTemplate(): PendingIntent =
-        getBroadcast(
-            context,
-            2,
-            Intent(context, WidgetReceiver::class.java).apply {
-                action = WidgetReceiver.ACTION_TOGGLE_REPETITION
-            },
-            getIntentTemplateFlags()
-        )
-
-    fun toggleCheckmarkFillIn(habit: Habit, timestamp: Timestamp) = Intent().apply {
-        data = Uri.parse(habit.uriString)
-        putExtra("timestamp", timestamp.unixTime)
-    }
 }

uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt

@@ -168,12 +168,14 @@ class AndroidNotificationTray
         fun createAndroidNotificationChannel(context: Context) {
             val notificationManager = context.getSystemService(Activity.NOTIFICATION_SERVICE)
                 as NotificationManager
-            val channel = NotificationChannel(
-                REMINDERS_CHANNEL_ID,
-                context.resources.getString(R.string.reminder),
-                NotificationManager.IMPORTANCE_DEFAULT
-            )
-            notificationManager.createNotificationChannel(channel)
+            if (SDK_INT >= Build.VERSION_CODES.O) {
+                val channel = NotificationChannel(
+                    REMINDERS_CHANNEL_ID,
+                    context.resources.getString(R.string.reminder),
+                    NotificationManager.IMPORTANCE_DEFAULT
+                )
+                notificationManager.createNotificationChannel(channel)
+            }
         }
     }
 }

uhabits-android/src/main/java/org/isoron/uhabits/utils/DialogUtils.kt

@@ -1,21 +0,0 @@
-package org.isoron.uhabits.utils
-
-import android.app.Dialog
-import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.FragmentManager
-import java.lang.ref.WeakReference
-
-var currentDialog: WeakReference<Dialog> = WeakReference(null)
-
-fun Dialog.dismissCurrentAndShow() {
-    currentDialog.get()?.dismiss()
-    currentDialog = WeakReference(this)
-    show()
-}
-
-fun DialogFragment.dismissCurrentAndShow(fragmentManager: FragmentManager, tag: String) {
-    currentDialog.get()?.dismiss()
-    show(fragmentManager, tag)
-    fragmentManager.executePendingTransactions()
-    currentDialog = WeakReference(this.dialog)
-}

uhabits-android/src/main/java/org/isoron/uhabits/utils/SystemUtils.kt

@@ -21,11 +21,18 @@ package org.isoron.uhabits.utils
 import android.app.Activity
 import android.app.KeyguardManager
 import android.content.Context
+import android.os.Build
+import android.os.Build.VERSION.SDK_INT
+import android.view.WindowManager
 
 object SystemUtils {
 
     fun unlockScreen(activity: Activity) {
-        val km = activity.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
-        km.requestDismissKeyguard(activity, null)
+        if (SDK_INT >= Build.VERSION_CODES.O) {
+            val km = activity.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+            km.requestDismissKeyguard(activity, null)
+        } else {
+            activity.window.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD)
+        }
     }
 }

uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt

@@ -21,7 +21,9 @@ package org.isoron.uhabits.widgets
 
 import android.app.PendingIntent
 import android.content.Context
+import android.os.Build
 import android.view.View
+import androidx.annotation.RequiresApi
 import org.isoron.platform.gui.toInt
 import org.isoron.uhabits.core.models.Entry
 import org.isoron.uhabits.core.models.Habit
@@ -47,6 +49,7 @@ open class CheckmarkWidget(
         }
     }
 
+    @RequiresApi(Build.VERSION_CODES.O)
     override fun refreshData(widgetView: View) {
         (widgetView as CheckmarkWidgetView).apply {
             val today = DateUtils.getTodayWithOffset()

uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.kt

@@ -49,7 +49,6 @@ class FrequencyWidget(
         (widgetView.dataView as FrequencyChart).apply {
             setFirstWeekday(firstWeekday)
             setColor(WidgetTheme().color(habit.color).toInt())
-            setIsNumerical(habit.isNumerical)
             setFrequency(habit.originalEntries.computeWeekdayFrequency(habit.isNumerical))
         }
     }

uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidget.kt

@@ -73,10 +73,6 @@ class StackWidget(
             StackWidgetType.getStackWidgetAdapterViewId(widgetType),
             StackWidgetType.getStackWidgetEmptyViewId(widgetType)
         )
-        remoteViews.setPendingIntentTemplate(
-            StackWidgetType.getStackWidgetAdapterViewId(widgetType),
-            StackWidgetType.getPendingIntentTemplate(pendingIntentFactory, widgetType, habits)
-        )
         return remoteViews
     }
 }

uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.kt

@@ -29,14 +29,11 @@ import android.widget.RemoteViewsService
 import android.widget.RemoteViewsService.RemoteViewsFactory
 import org.isoron.platform.utils.StringUtils.Companion.splitLongs
 import org.isoron.uhabits.HabitsApplication
-import org.isoron.uhabits.R
 import org.isoron.uhabits.core.models.Habit
 import org.isoron.uhabits.core.models.HabitNotFoundException
 import org.isoron.uhabits.core.preferences.Preferences
-import org.isoron.uhabits.core.utils.DateUtils.Companion.getToday
-import org.isoron.uhabits.intents.IntentFactory
-import org.isoron.uhabits.intents.PendingIntentFactory
 import org.isoron.uhabits.utils.InterfaceUtils.dpToPixels
+import java.util.ArrayList
 
 class StackWidgetService : RemoteViewsService() {
     override fun onGetViewFactory(intent: Intent): RemoteViewsFactory {
@@ -57,6 +54,7 @@ internal class StackRemoteViewsFactory(private val context: Context, intent: Int
     )
     private val habitIds: LongArray
     private val widgetType: StackWidgetType
+    private var remoteViews = ArrayList<RemoteViews>()
     override fun onCreate() {}
     override fun onDestroy() {}
     override fun getCount(): Int {
@@ -87,26 +85,8 @@ internal class StackRemoteViewsFactory(private val context: Context, intent: Int
     }
 
     override fun getViewAt(position: Int): RemoteViews? {
-        Log.i("StackRemoteViewsFactory", "getViewAt $position started")
-        if (position < 0 || position >= habitIds.size) return null
-        val app = context.applicationContext as HabitsApplication
-        val prefs = app.component.preferences
-        val habitList = app.component.habitList
-        val options = AppWidgetManager.getInstance(context).getAppWidgetOptions(widgetId)
-        if (Looper.myLooper() == null) Looper.prepare()
-        val habits = habitIds.map { habitList.getById(it) ?: throw HabitNotFoundException() }
-        val h = habits[position]
-        val widget = constructWidget(h, prefs)
-        widget.setDimensions(getDimensionsFromOptions(context, options))
-        val landscapeViews = widget.landscapeRemoteViews
-        val portraitViews = widget.portraitRemoteViews
-        val factory = PendingIntentFactory(context, IntentFactory())
-        val intent = StackWidgetType.getIntentFillIn(factory, widgetType, h, habits, getToday())
-        landscapeViews.setOnClickFillInIntent(R.id.button, intent)
-        portraitViews.setOnClickFillInIntent(R.id.button, intent)
-        val remoteViews = RemoteViews(landscapeViews, portraitViews)
-        Log.i("StackRemoteViewsFactory", "getViewAt $position ended")
-        return remoteViews
+        Log.i("StackRemoteViewsFactory", "getViewAt $position")
+        return if (0 <= position && position < remoteViews.size) remoteViews[position] else null
     }
 
     private fun constructWidget(
@@ -151,6 +131,24 @@ internal class StackRemoteViewsFactory(private val context: Context, intent: Int
     }
 
     override fun onDataSetChanged() {
+        Log.i("StackRemoteViewsFactory", "onDataSetChanged started")
+        val app = context.applicationContext as HabitsApplication
+        val prefs = app.component.preferences
+        val habitList = app.component.habitList
+        val options = AppWidgetManager.getInstance(context).getAppWidgetOptions(widgetId)
+        val newRemoteViews = ArrayList<RemoteViews>()
+        if (Looper.myLooper() == null) Looper.prepare()
+        for (id in habitIds) {
+            val h = habitList.getById(id) ?: throw HabitNotFoundException()
+            val widget = constructWidget(h, prefs)
+            widget.setDimensions(getDimensionsFromOptions(context, options))
+            val landscapeViews = widget.landscapeRemoteViews
+            val portraitViews = widget.portraitRemoteViews
+            newRemoteViews.add(RemoteViews(landscapeViews, portraitViews))
+            Log.i("StackRemoteViewsFactory", "onDataSetChanged constructed widget $id")
+        }
+        remoteViews = newRemoteViews
+        Log.i("StackRemoteViewsFactory", "onDataSetChanged ended")
     }
 
     init {

uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetType.kt

@@ -18,12 +18,7 @@
  */
 package org.isoron.uhabits.widgets
 
-import android.app.PendingIntent
-import android.content.Intent
 import org.isoron.uhabits.R
-import org.isoron.uhabits.core.models.Habit
-import org.isoron.uhabits.core.models.Timestamp
-import org.isoron.uhabits.intents.PendingIntentFactory
 import java.lang.IllegalStateException
 
 enum class StackWidgetType(val value: Int) {
@@ -78,39 +73,5 @@ enum class StackWidgetType(val value: Int) {
                 else -> throw IllegalStateException()
             }
         }
-
-        fun getPendingIntentTemplate(
-            factory: PendingIntentFactory,
-            widgetType: StackWidgetType,
-            habits: List<Habit>
-        ): PendingIntent {
-            val containsNumerical = habits.any { it.isNumerical }
-            return when (widgetType) {
-                CHECKMARK -> if (containsNumerical) {
-                    factory.showNumberPickerTemplate()
-                } else {
-                    factory.toggleCheckmarkTemplate()
-                }
-                FREQUENCY, SCORE, HISTORY, STREAKS, TARGET -> factory.showHabitTemplate()
-            }
-        }
-
-        fun getIntentFillIn(
-            factory: PendingIntentFactory,
-            widgetType: StackWidgetType,
-            habit: Habit,
-            allHabitsInStackWidget: List<Habit>,
-            timestamp: Timestamp
-        ): Intent {
-            val containsNumerical = allHabitsInStackWidget.any { it.isNumerical }
-            return when (widgetType) {
-                CHECKMARK -> if (containsNumerical) {
-                    factory.showNumberPickerFillIn(habit, timestamp)
-                } else {
-                    factory.toggleCheckmarkFillIn(habit, timestamp)
-                }
-                FREQUENCY, SCORE, HISTORY, STREAKS, TARGET -> factory.showHabitFillIn(habit)
-            }
-        }
     }
 }

uhabits-android/src/main/res/drawable-v21/widget_button_background.xml

@@ -0,0 +1,39 @@
+<!--
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
+  ~
+  ~ This file is part of Loop Habit Tracker.
+  ~
+  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by the
+  ~ Free Software Foundation, either version 3 of the License, or (at your
+  ~ option) any later version.
+  ~
+  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  ~ more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along
+  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:top="1dp"
+        android:left="1dp"
+        android:bottom="3dp"
+        android:right="3dp">
+        <ripple
+            android:color="#60ffffff">
+
+            <item android:id="@android:id/mask">
+                <shape android:shape="rectangle">
+                    <corners android:radius="5dp"/>
+                    <solid android:color="?android:colorPrimary"/>
+                </shape>
+                <color android:color="@color/white"/>
+            </item>
+        </ripple>
+    </item>
+
+</layer-list>

uhabits-android/src/main/res/drawable/ic_sync_dark.xml

@@ -1,55 +0,0 @@
-<!--
-  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="243dp"
-    android:height="85dp"
-    android:viewportWidth="243"
-    android:viewportHeight="85">
-    <path
-        android:pathData="M44.354,0H7.827C3.506,0 0,3.569 0,7.969V77.031C0,81.431 3.506,85 7.827,85H44.354C48.676,85 52.182,81.431 52.182,77.031V7.969C52.182,3.569 48.676,0 44.354,0ZM26.091,79.688C23.205,79.688 20.873,77.313 20.873,74.375C20.873,71.437 23.205,69.063 26.091,69.063C28.977,69.063 31.309,71.437 31.309,74.375C31.309,77.313 28.977,79.688 26.091,79.688ZM44.354,61.758C44.354,62.854 43.474,63.75 42.398,63.75H9.784C8.708,63.75 7.827,62.854 7.827,61.758V9.961C7.827,8.865 8.708,7.969 9.784,7.969H42.398C43.474,7.969 44.354,8.865 44.354,9.961V61.758Z"
-        android:fillColor="#ffffff" />
-    <path
-        android:pathData="M234.536,0H198.009C193.688,0 190.182,3.569 190.182,7.969V77.031C190.182,81.431 193.688,85 198.009,85H234.536C238.858,85 242.364,81.431 242.364,77.031V7.969C242.364,3.569 238.858,0 234.536,0ZM216.273,79.688C213.386,79.688 211.055,77.313 211.055,74.375C211.055,71.437 213.386,69.063 216.273,69.063C219.159,69.063 221.491,71.437 221.491,74.375C221.491,77.313 219.159,79.688 216.273,79.688ZM234.536,61.758C234.536,62.854 233.656,63.75 232.58,63.75H199.966C198.89,63.75 198.009,62.854 198.009,61.758V9.961C198.009,8.865 198.89,7.969 199.966,7.969H232.58C233.656,7.969 234.536,8.865 234.536,9.961V61.758Z"
-        android:fillColor="#ffffff" />
-    <path
-        android:pathData="M68.182,42.5a4,4.048 0,1 0,8 0a4,4.048 0,1 0,-8 0z"
-        android:fillColor="#ffffff" />
-    <path
-        android:pathData="M110.182,42.5a4,4.048 0,1 0,8 0a4,4.048 0,1 0,-8 0z"
-        android:fillColor="#ffffff" />
-    <path
-        android:pathData="M96.182,42.5a4,4.048 0,1 0,8 0a4,4.048 0,1 0,-8 0z"
-        android:fillColor="#ffffff" />
-    <path
-        android:pathData="M82.182,42.5a4,4.048 0,1 0,8 0a4,4.048 0,1 0,-8 0z"
-        android:fillColor="#ffffff" />
-    <path
-        android:pathData="M124.182,42.5a4,4.048 0,1 0,8 0a4,4.048 0,1 0,-8 0z"
-        android:fillColor="#ffffff" />
-    <path
-        android:pathData="M166.182,42.5a4,4.048 0,1 0,8 0a4,4.048 0,1 0,-8 0z"
-        android:fillColor="#ffffff" />
-    <path
-        android:pathData="M152.182,42.5a4,4.048 0,1 0,8 0a4,4.048 0,1 0,-8 0z"
-        android:fillColor="#ffffff" />
-    <path
-        android:pathData="M138.182,42.5a4,4.048 0,1 0,8 0a4,4.048 0,1 0,-8 0z"
-        android:fillColor="#ffffff" />
-</vector>

uhabits-android/src/main/res/drawable/ic_sync_light.xml

@@ -1,36 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="243dp"
-    android:height="85dp"
-    android:viewportWidth="243"
-    android:viewportHeight="85">
-    <path
-        android:pathData="M44.354,0H7.827C3.506,0 0,3.569 0,7.969V77.031C0,81.431 3.506,85 7.827,85H44.354C48.676,85 52.182,81.431 52.182,77.031V7.969C52.182,3.569 48.676,0 44.354,0ZM26.091,79.688C23.205,79.688 20.873,77.313 20.873,74.375C20.873,71.437 23.205,69.063 26.091,69.063C28.977,69.063 31.309,71.437 31.309,74.375C31.309,77.313 28.977,79.688 26.091,79.688ZM44.354,61.758C44.354,62.854 43.474,63.75 42.398,63.75H9.784C8.708,63.75 7.827,62.854 7.827,61.758V9.961C7.827,8.865 8.708,7.969 9.784,7.969H42.398C43.474,7.969 44.354,8.865 44.354,9.961V61.758Z"
-        android:fillColor="#000000" />
-    <path
-        android:pathData="M234.536,0H198.009C193.688,0 190.182,3.569 190.182,7.969V77.031C190.182,81.431 193.688,85 198.009,85H234.536C238.858,85 242.364,81.431 242.364,77.031V7.969C242.364,3.569 238.858,0 234.536,0ZM216.273,79.688C213.386,79.688 211.055,77.313 211.055,74.375C211.055,71.437 213.386,69.063 216.273,69.063C219.159,69.063 221.491,71.437 221.491,74.375C221.491,77.313 219.159,79.688 216.273,79.688ZM234.536,61.758C234.536,62.854 233.656,63.75 232.58,63.75H199.966C198.89,63.75 198.009,62.854 198.009,61.758V9.961C198.009,8.865 198.89,7.969 199.966,7.969H232.58C233.656,7.969 234.536,8.865 234.536,9.961V61.758Z"
-        android:fillColor="#000000" />
-    <path
-        android:pathData="M68.182,42.5a4,4.048 0,1 0,8 0a4,4.048 0,1 0,-8 0z"
-        android:fillColor="#000000" />
-    <path
-        android:pathData="M110.182,42.5a4,4.048 0,1 0,8 0a4,4.048 0,1 0,-8 0z"
-        android:fillColor="#000000" />
-    <path
-        android:pathData="M96.182,42.5a4,4.048 0,1 0,8 0a4,4.048 0,1 0,-8 0z"
-        android:fillColor="#000000" />
-    <path
-        android:pathData="M82.182,42.5a4,4.048 0,1 0,8 0a4,4.048 0,1 0,-8 0z"
-        android:fillColor="#000000" />
-    <path
-        android:pathData="M124.182,42.5a4,4.048 0,1 0,8 0a4,4.048 0,1 0,-8 0z"
-        android:fillColor="#000000" />
-    <path
-        android:pathData="M166.182,42.5a4,4.048 0,1 0,8 0a4,4.048 0,1 0,-8 0z"
-        android:fillColor="#000000" />
-    <path
-        android:pathData="M152.182,42.5a4,4.048 0,1 0,8 0a4,4.048 0,1 0,-8 0z"
-        android:fillColor="#000000" />
-    <path
-        android:pathData="M138.182,42.5a4,4.048 0,1 0,8 0a4,4.048 0,1 0,-8 0z"
-        android:fillColor="#000000" />
-</vector>

uhabits-android/src/main/res/drawable/widget_button_background.xml

@@ -17,23 +17,18 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:top="1dp"
-        android:left="1dp"
-        android:bottom="3dp"
-        android:right="3dp">
-        <ripple
-            android:color="#60ffffff">
-
-            <item android:id="@android:id/mask">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true" android:state_pressed="true">
+        <layer-list>
+            <item android:bottom="3dp"
+                  android:left="1dp"
+                  android:right="3dp"
+                  android:top="1dp">
                 <shape android:shape="rectangle">
                     <corners android:radius="5dp"/>
-                    <solid android:color="?android:colorPrimary"/>
+                    <solid android:color="#30ffffff"/>
                 </shape>
-                <color android:color="@color/white"/>
             </item>
-        </ripple>
+        </layer-list>
     </item>
-
-</layer-list>
+</selector>

uhabits-android/src/main/res/layout/sync_activity.xml

@@ -1,162 +0,0 @@
-<!--
-  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="?attr/contrast0"
-    android:gravity="top|center">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        app:popupTheme="?toolbarPopupTheme"
-        style="@style/Toolbar" />
-
-    <ScrollView
-        android:id="@+id/introGroup"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.appcompat.widget.LinearLayoutCompat
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:gravity="top|center">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:srcCompat="?attr/iconSync"
-                android:layout_margin="32dp"
-                android:alpha="0.25" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/device_sync_description_1"
-                android:layout_marginBottom="16dp"
-                android:layout_marginTop="0dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/device_sync_description_2"
-                android:layout_marginBottom="16dp"
-                android:layout_marginTop="0dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/generate_button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/generate_new_code"
-                app:backgroundTint="?attr/aboutScreenColor"
-                android:textColor="?attr/contrast0"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp" />
-
-            <com.google.android.material.button.MaterialButton
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:id="@+id/enter_button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/enter_existing_code"
-                android:textColor="?attr/aboutScreenColor"
-                app:rippleColor="?attr/aboutScreenColor"
-                app:strokeColor="?attr/aboutScreenColor"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp" />
-        </androidx.appcompat.widget.LinearLayoutCompat>
-    </ScrollView>
-
-    <ScrollView
-        android:id="@+id/codeGroup"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        android:visibility="gone">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/sync_is_enabled"
-                android:layout_margin="16dp" />
-
-            <FrameLayout
-                style="@style/FormOuterBox"
-                android:layout_marginLeft="12dp"
-                android:layout_marginRight="12dp">
-
-                <LinearLayout style="@style/FormInnerBox">
-
-                    <TextView
-                        style="@style/FormLabel"
-                        android:text="@string/sync_code" />
-
-                    <TextView
-                        style="@style/FormInput"
-                        android:id="@+id/sync_code_tv"
-                        android:fontFamily="monospace"
-                        android:text="gravity trophy suspect shrimp sheriff avocado label trust tragic dove pitch title network myself task spell protect smooth diary sword brain blossom bulb under" />
-                </LinearLayout>
-            </FrameLayout>
-
-            <FrameLayout
-                style="@style/FormOuterBox"
-                android:layout_marginLeft="12dp"
-                android:layout_marginRight="12dp">
-
-                <LinearLayout style="@style/FormInnerBox">
-
-                    <TextView
-                        style="@style/FormLabel"
-                        android:text="@string/last_sync" />
-
-                    <TextView
-                        style="@style/FormInput"
-                        android:id="@+id/last_sync_tv"
-                        android:text="Jan 10, 2022 4:45:00 PM" />
-                </LinearLayout>
-            </FrameLayout>
-
-            <com.google.android.material.button.MaterialButton
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:id="@+id/disable_button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/disable_sync"
-                android:textColor="?attr/aboutScreenColor"
-                app:rippleColor="?attr/aboutScreenColor"
-                app:strokeColor="?attr/aboutScreenColor"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp" />
-        </LinearLayout>
-    </ScrollView>
-</androidx.appcompat.widget.LinearLayoutCompat>

uhabits-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -21,5 +21,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
 </adaptive-icon>

uhabits-android/src/main/res/values-v21/styles_list_habits.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
+  ~
+  ~ This file is part of Loop Habit Tracker.
+  ~
+  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by the
+  ~ Free Software Foundation, either version 3 of the License, or (at your
+  ~ option) any later version.
+  ~
+  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  ~ more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along
+  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+
+</resources>

uhabits-android/src/main/res/values/attrs.xml

@@ -43,7 +43,6 @@
     <attr name="iconFilter" format="reference"/>
     <attr name="iconArrowUp" format="reference"/>
     <attr name="iconArrowDown" format="reference"/>
-    <attr name="iconSync" format="reference"/>
     <attr name="dialogFormLabelColor" format="reference"/>
 
     <attr name="toolbarPopupTheme" format="reference"/>

uhabits-android/src/main/res/values/strings.xml

@@ -233,18 +233,4 @@
     <string name="activity_not_found">No app was found to support this action</string>
     <string name="pref_midnight_delay_title">Extend day a few hours past midnight</string>
     <string name="pref_midnight_delay_description">Wait until 3:00 AM to show a new day. Useful if you typically go to sleep after midnight. Requires app restart.</string>
-    <string name="device_sync">Device sync</string>
-    <string name="config_sync">Configure device sync</string>
-    <string name="config_sync_summary">Synchronize data across multiple devices. When enabled, an end-to-end encrypted copy of your data will be uploaded to Loop Habit Tracker servers.</string>
-    <string name="device_sync_description_1">Device sync allows you to keep your data synchronized across multiple devices. To get started, generate a new sync code below, install Loop Habit Tracker in another device, then type the generated code there.</string>
-    <string name="device_sync_description_2">When sync is enabled, an end-to-end encrypted copy of your data will be uploaded to Loop Habit Tracker servers. See privacy policy for more details.</string>
-    <string name="generate_new_code">Generate new code</string>
-    <string name="enter_existing_code">Enter existing code</string>
-    <string name="sync_is_enabled">Device sync is enabled. To get started, install Loop in another device, then type the following code there.</string>
-    <string name="sync_code">Sync code</string>
-    <string name="disable_sync">Disable sync</string>
-    <string name="disable_sync_description">Are you sure you want to disable sync on this device? This will not delete any data from any of your devices, but the current device will no longer be kept in sync with the others. If you disable sync from all devices, your data will be deleted from our servers in 30 days.</string>
-    <string name="disable">Disable</string>
-    <string name="keep_enabled">Keep enabled</string>
-    <string name="last_sync">Last sync</string>
 </resources>

uhabits-android/src/main/res/values/styles.xml

@@ -45,7 +45,6 @@
         <item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item>
         <item name="iconArrowUp">@drawable/ic_arrow_up_light</item>
         <item name="iconArrowDown">@drawable/ic_arrow_down_light</item>
-        <item name="iconSync">@drawable/ic_sync_light</item>
         <item name="contrast0">@color/white</item>
         <item name="contrast20">@color/grey_300</item>
         <item name="contrast40">@color/grey_350</item>
@@ -90,7 +89,6 @@
         <item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item>
         <item name="iconArrowUp">@drawable/ic_arrow_up_dark</item>
         <item name="iconArrowDown">@drawable/ic_arrow_down_dark</item>
-        <item name="iconSync">@drawable/ic_sync_dark</item>
         <item name="contrast0">@color/grey_900</item>
         <item name="contrast20">@color/grey_800</item>
         <item name="contrast40">@color/grey_750</item>

uhabits-android/src/main/res/xml/preferences.xml

@@ -107,24 +107,6 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory
-        android:key="syncCategory"
-        android:title="@string/device_sync">
-
-        <Preference
-            android:key="configSync"
-            android:summary="@string/config_sync_summary"
-            android:title="@string/config_sync"
-            app:iconSpaceReserved="false">
-
-            <intent
-                android:action="android.intent.action.VIEW"
-                android:targetClass="org.isoron.uhabits.activities.sync.SyncActivity"
-                android:targetPackage="org.isoron.uhabits" />
-        </Preference>
-
-    </PreferenceCategory>
-
     <PreferenceCategory
             android:key="databaseCategory"
             android:title="@string/database">

uhabits-core/build.gradle.kts

@@ -43,11 +43,11 @@ kotlin {
         val jvmMain by getting {
             dependencies {
                 implementation(kotlin("stdlib-jdk8"))
-                compileOnly("com.google.dagger:dagger:2.43.2")
+                compileOnly("com.google.dagger:dagger:2.41")
                 implementation("com.google.guava:guava:31.1-android")
-                implementation("org.jetbrains.kotlin:kotlin-stdlib:1.7.10")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4")
-                implementation("androidx.annotation:annotation:1.4.0")
+                implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1")
+                implementation("androidx.annotation:annotation:1.3.0")
                 implementation("com.google.code.findbugs:jsr305:3.0.2")
                 implementation("com.opencsv:opencsv:5.6")
                 implementation("commons-codec:commons-codec:1.15")
@@ -59,7 +59,7 @@ kotlin {
             dependencies {
                 implementation(kotlin("test"))
                 implementation(kotlin("test-junit"))
-                implementation("org.xerial:sqlite-jdbc:3.39.2.1")
+                implementation("org.xerial:sqlite-jdbc:3.36.0.3")
                 implementation("org.hamcrest:hamcrest:2.2")
                 implementation("org.apache.commons:commons-io:1.3.2")
                 implementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")

uhabits-core/src/commonMain/kotlin/org/isoron/platform/crypto/Bip39.kt

@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
- *
- * This file is part of Loop Habit Tracker.
- *
- * Loop Habit Tracker is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Loop Habit Tracker is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.platform.crypto
-
-class Bip39(private val wordlist: List<String>, private val crypto: Crypto) {
-    private fun computeChecksum(entropy: List<Boolean>): List<Boolean> {
-        val sha256 = crypto.sha256()
-        var byte = 0
-        entropy.forEachIndexed { i, bit ->
-            byte = byte shl 1
-            if (bit) byte += 1
-            if (i.rem(8) == 7) {
-                sha256.update(byte.toByte())
-                byte = 0
-            }
-        }
-        return sha256.finalize().toBits().subList(0, entropy.size / 32)
-    }
-
-    fun encode(entropy: ByteArray): List<String> {
-        val entropyBits = entropy.toBits()
-        val msg = entropyBits + computeChecksum(entropyBits)
-        var wordIndex = 0
-        val mnemonic = mutableListOf<String>()
-        msg.forEachIndexed { i, bit ->
-            wordIndex = wordIndex shl 1
-            if (bit) wordIndex += 1
-            if (i.rem(11) == 10) {
-                mnemonic.add(wordlist[wordIndex])
-                wordIndex = 0
-            }
-        }
-        return mnemonic
-    }
-
-    fun decode(mnemonic: List<String>): ByteArray {
-        val bits = mutableListOf<Boolean>()
-        mnemonic.forEach { word ->
-            val wordBits = mutableListOf<Boolean>()
-            var wordIndex = wordlist.binarySearch(word)
-            if (wordIndex < 0) throw InvalidWordException(word)
-            for (it in 0..10) {
-                wordBits.add(wordIndex.rem(2) == 1)
-                wordIndex = wordIndex shr 1
-            }
-            bits.addAll(wordBits.reversed())
-        }
-        if (bits.size.rem(33) != 0) throw InvalidMnemonicLength()
-        val checksumSize = bits.size / 33
-        val checksum = bits.subList(bits.size - checksumSize, bits.size)
-        val entropy = bits.subList(0, bits.size - checksumSize)
-        if (computeChecksum(entropy) != checksum) throw InvalidChecksumException()
-        return byteArray(entropy)
-    }
-}
-
-class InvalidChecksumException : Exception()
-class InvalidWordException(word: String) : Exception(word)
-class InvalidMnemonicLength : Exception()