Merge branch 'dev' into feature/sync2

Bump minSdk to 28
This change is mostly to reduce the number of APIs we need to run tests for (from 11 APIs to 6). API 27 was released 5 years ago. Also, as of 2022-09-01, 95.1% of our monthly active users are on API 28 or higher.
2025-12-06 09:08:52 -06:00 · 2022-09-11 06:09:27 -05:00 · 2022-09-10 19:57:57 -05:00 · 2022-09-10 19:25:40 -05:00 · 2022-09-10 17:04:43 -05:00 · 2022-09-10 16:51:20 -05:00
144 changed files with 22005 additions and 1422 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,7 +17,7 @@ jobs:
      run: ./build.sh build

    - name: Run Android tests
-      run: ./build.sh android-tests-parallel 24 25 26 28 30 31
+      run: ./build.sh android-tests-parallel 28 29 30 31 32 33

    - name: Upload artifacts
      if: always()
--- a/.gitignore
+++ b/.gitignore
@@ -12,13 +12,8 @@
 .idea
 .secret
 build
-build/
-captures
 local.properties
 node_modules
 *xcuserdata*
 *.sketch
-/design
-/releases
-/screenshots
 crowdin.yml
--- a/.secret/decrypt.sh
+++ b/.secret/decrypt.sh
@@ -1,16 +0,0 @@
-#!/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
--- a/.secret/secret
+++ b/.secret/secret
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,24 +1,5 @@
 # Changelog

-## [2.1.2] -- 2023-05-26
-### Fixed
- Fix bug that caused widget to enter checkmark on wrong date (@iSoron, #1541)
- Fix widget corners on Android 12 (@iSoron)
- Fix bug that caused notes to be lost when editing a checkmark (@iSoron, #1566)
- Prevent soft keyboard from covering entry popup (@iSoron)
- Accept comma (instead of dot) in certain locales (@iSoron)
-
-### Changed
- Remove update delay after entering a checkmark (@iSoron)
-
-### Removed
- Remove stack widgets (@iSoron)
-
-
-## [2.1.1] -- 2022-09-24
-### Fixed
- Fix Tasker plugin (@iSoron, #1503)
-
 ## [2.1.0] -- 2022-09-10
 ### Added
 - Allow user to add notes to specific dates (@vbh, #1103)
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
-    val kotlinVersion = "1.6.10"
-    id("com.android.application") version ("7.0.3") apply (false)
+    val kotlinVersion = "1.7.10"
+    id("com.android.application") version ("7.3.0-rc01") 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 "10.2.1"
+    id("org.jlleitschuh.gradle.ktlint") version "11.0.0"
 }

 apply {
--- a/build.sh
+++ b/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;default;x86_64") || return 1
+        (echo "y" | $SDKMANAGER --install "system-images;android-$API;google_apis;x86_64") || return 1
        $AVDMANAGER create avd \
                --name $AVDNAME \
-                --package "system-images;android-$API;default;x86_64" \
+                --package "system-images;android-$API;google_apis;x86_64" \
                --device "Nexus 4" || return 1

        flock -u 10
@@ -217,28 +217,20 @@ android_test_parallel() {
        (
            LOG=build/android-test-$API.log
            log_info "API $API: Running tests..."
-            android_test $API 1>$LOG 2>&1
-            ret_code=$?
-            if [ $ret_code = 0 ]; then
+            if android_test $API 1>$LOG 2>&1; then
                log_info "API $API: Passed"
            else
                log_error "API $API: Failed"
            fi
            pkill -9 -f ${AVD_PREFIX}${API}
-            exit $ret_code
        )&
 	PIDS+=" $!"
    done

    # Check exit codes
-    success=0
+    RET_CODE=0
    for pid in $PIDS; do
-        wait $pid
-        ret_code=$?
-        if [ $ret_code != 0 ]; then
-            success=1
-        fi
-        echo pid=$pid ret_code=$ret_code success=$success
+        wait $pid || RET_CODE=1
    done

    # Print all logs
@@ -248,7 +240,7 @@ android_test_parallel() {
        echo "::endgroup::"
    done

-    return $success
+    return $RET_CODE
 }

 android_build() {
--- a/docs/BUILD.md
+++ b/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 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 feel free to customize the device.
 6. Click the menu "Run" and "uhabits-android". The application should launch.


--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/landing/.gitignore
+++ b/landing/.gitignore
@@ -1,2 +0,0 @@
-out/
-.sass-cache
--- a/landing/Makefile
+++ b/landing/Makefile
@@ -1,27 +0,0 @@
-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
-
--- a/landing/README.md
+++ b/landing/README.md
@@ -1,27 +0,0 @@
-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/
-```
-
--- a/landing/assets/faq.html
+++ b/landing/assets/faq.html
@@ -1 +0,0 @@
-<meta http-equiv="Refresh" content="0; url='https://github.com/iSoron/uhabits/discussions/689'" />
--- a/landing/assets/images/f-droid.png
+++ b/landing/assets/images/f-droid.png
--- a/landing/assets/images/google-play.png
+++ b/landing/assets/images/google-play.png
--- a/landing/assets/images/hero-background-filter.jpg
+++ b/landing/assets/images/hero-background-filter.jpg
--- a/landing/assets/lib/css/bootstrap.min.css
+++ b/landing/assets/lib/css/bootstrap.min.css
--- a/landing/assets/lib/css/bootstrap.min.css.map
+++ b/landing/assets/lib/css/bootstrap.min.css.map
--- a/landing/assets/lib/js/bootstrap.bundle.min.js
+++ b/landing/assets/lib/js/bootstrap.bundle.min.js
--- a/landing/assets/lib/js/bootstrap.bundle.min.js.map
+++ b/landing/assets/lib/js/bootstrap.bundle.min.js.map
--- a/landing/assets/lib/js/jquery.min.js
+++ b/landing/assets/lib/js/jquery.min.js
--- a/landing/assets/screenshots/uhabits1.png
+++ b/landing/assets/screenshots/uhabits1.png
--- a/landing/assets/screenshots/uhabits1_th.png
+++ b/landing/assets/screenshots/uhabits1_th.png
--- a/landing/assets/screenshots/uhabits2.png
+++ b/landing/assets/screenshots/uhabits2.png
--- a/landing/assets/screenshots/uhabits2_th.png
+++ b/landing/assets/screenshots/uhabits2_th.png
--- a/landing/assets/screenshots/uhabits3.png
+++ b/landing/assets/screenshots/uhabits3.png
--- a/landing/assets/screenshots/uhabits3_th.png
+++ b/landing/assets/screenshots/uhabits3_th.png
--- a/landing/assets/screenshots/uhabits4.png
+++ b/landing/assets/screenshots/uhabits4.png
--- a/landing/assets/screenshots/uhabits4_th.png
+++ b/landing/assets/screenshots/uhabits4_th.png
--- a/landing/assets/screenshots/uhabits5.png
+++ b/landing/assets/screenshots/uhabits5.png
--- a/landing/assets/screenshots/uhabits5_th.png
+++ b/landing/assets/screenshots/uhabits5_th.png
--- a/landing/assets/screenshots/uhabits6.png
+++ b/landing/assets/screenshots/uhabits6.png
--- a/landing/assets/screenshots/uhabits6_th.png
+++ b/landing/assets/screenshots/uhabits6_th.png
--- a/landing/src/index.haml
+++ b/landing/src/index.haml
@@ -1,106 +0,0 @@
-!!! 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&trade; 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&ndash;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")
--- a/landing/src/index.sass
+++ b/landing/src/index.sass
@@ -1,104 +0,0 @@
-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
--- a/landing/src/privacy.haml
+++ b/landing/src/privacy.haml
@@ -1,32 +0,0 @@
-!!! 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}
--- a/landing/src/privacy.md
+++ b/landing/src/privacy.md
@@ -1,14 +0,0 @@
-## 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.
--- a/uhabits-android/build.gradle.kts
+++ b/uhabits-android/build.gradle.kts
@@ -32,12 +32,12 @@ tasks.compileLint {

 android {

-    compileSdk = 31
+    compileSdk = 32

    defaultConfig {
-        versionCode = 20103
-        versionName = "2.1.3"
-        minSdk = 23
+        versionCode = 20100
+        versionName = "2.1.0"
+        minSdk = 28
        targetSdk = 31
        applicationId = "org.isoron.uhabits"
        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -68,12 +68,6 @@ android {
        }
    }

-    lint {
-        isCheckReleaseBuilds = false
-        isAbortOnError = false
-        disable("GoogleAppIndexingWarning")
-    }
-
    compileOptions {
        isCoreLibraryDesugaringEnabled = true
        targetCompatibility(JavaVersion.VERSION_1_8)
@@ -86,25 +80,25 @@ android {
 }

 dependencies {
-    val daggerVersion = "2.41"
-    val kotlinVersion = "1.6.21"
-    val kxCoroutinesVersion = "1.6.1"
+    val daggerVersion = "2.43.2"
+    val kotlinVersion = "1.7.10"
+    val kxCoroutinesVersion = "1.6.4"
    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.1")
+    androidTestImplementation("com.linkedin.dexmaker:dexmaker-mockito:2.28.3")
    androidTestImplementation("io.ktor:ktor-client-mock:$ktorVersion")
    androidTestImplementation("io.ktor:ktor-jackson:$ktorVersion")
-    androidTestImplementation("androidx.annotation:annotation:1.3.0")
+    androidTestImplementation("androidx.annotation:annotation:1.4.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.1.5")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2")
    implementation("com.github.AppIntro:AppIntro:6.2.0")
    implementation("com.google.code.findbugs:jsr305:3.0.2")
    implementation("com.google.dagger:dagger:$daggerVersion")
@@ -116,10 +110,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.4.1")
+    implementation("androidx.appcompat:appcompat:1.5.0")
    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.5.0")
+    implementation("com.google.android.material:material:1.6.1")
    implementation("com.opencsv:opencsv:5.6")
    implementation(project(":uhabits-core"))
    kapt("com.google.dagger:dagger-compiler:$daggerVersion")
--- a/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidget/render.png
+++ b/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidget/render.png
--- a/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/checked.png
+++ b/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/checked.png
--- a/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/large_size.png
+++ b/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/large_size.png
--- a/uhabits-android/src/androidTest/assets/views/widgets/FrequencyWidget/render.png
+++ b/uhabits-android/src/androidTest/assets/views/widgets/FrequencyWidget/render.png
--- a/uhabits-android/src/androidTest/assets/views/widgets/HistoryWidget/render.png
+++ b/uhabits-android/src/androidTest/assets/views/widgets/HistoryWidget/render.png
--- a/uhabits-android/src/androidTest/assets/views/widgets/ScoreWidget/render.png
+++ b/uhabits-android/src/androidTest/assets/views/widgets/ScoreWidget/render.png
--- a/uhabits-android/src/androidTest/assets/views/widgets/TargetWidget/render.png
+++ b/uhabits-android/src/androidTest/assets/views/widgets/TargetWidget/render.png
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.kt
@@ -20,6 +20,7 @@ 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
@@ -73,7 +74,7 @@ object CommonSteps : BaseUserInterfaceTest() {
    }

    fun offsetHeaders() {
-        device.swipe(750, 160, 600, 160, 20)
+        device.swipe(500, 160, 350, 160, 20)
    }

    fun scrollToText(text: String?) {
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.kt
@@ -53,6 +53,7 @@ object ListHabitsSteps {
                clickViewWithId(R.id.action_filter)
                CommonSteps.clickText(R.string.hide_completed)
            }
+            else -> throw RuntimeException()
        }
        device.waitForIdle()
    }
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/EntryButtonViewTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/EntryButtonViewTest.kt
@@ -44,7 +44,7 @@ class EntryButtonViewTest : BaseViewTest() {
        view = component.getEntryButtonViewFactory().create().apply {
            value = Entry.NO
            color = PaletteUtils.getAndroidTestColor(5)
-            onToggle = { _, _ -> toggled = true }
+            onToggle = { _, _, _ -> toggled = true }
            onEdit = { edited = true }
        }
        measureView(view, dpToPixels(48), dpToPixels(48))
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/EntryPanelViewTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/EntryPanelViewTest.kt
@@ -77,7 +77,7 @@ class EntryPanelViewTest : BaseViewTest() {
    @Test
    fun testToggle() {
        val timestamps = mutableListOf<Timestamp>()
-        view.onToggle = { t, _, _ -> timestamps.add(t) }
+        view.onToggle = { t, _, _, _ -> timestamps.add(t) }
        view.buttons[0].performLongClick()
        view.buttons[2].performLongClick()
        view.buttons[3].performLongClick()
@@ -88,7 +88,7 @@ class EntryPanelViewTest : BaseViewTest() {
    fun testToggle_withOffset() {
        val timestamps = mutableListOf<Timestamp>()
        view.dataOffset = 3
-        view.onToggle = { t, _, _ -> timestamps += t }
+        view.onToggle = { t, _, _, _ -> timestamps += t }
        view.buttons[0].performLongClick()
        view.buttons[2].performLongClick()
        view.buttons[3].performLongClick()
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.kt
@@ -36,7 +36,6 @@ class CheckmarkWidgetViewTest : BaseViewTest() {
    @Before
    override fun setUp() {
        super.setUp()
-        similarityCutoff = 0.00025
        setTheme(R.style.WidgetTheme)
        val habit = fixtures.createShortHabit()
        val computedEntries = habit.computedEntries
--- a/uhabits-android/src/main/AndroidManifest.xml
+++ b/uhabits-android/src/main/AndroidManifest.xml
@@ -79,6 +79,14 @@
                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=""
@@ -270,7 +278,7 @@
        <!-- Locale/Tasker -->
        <receiver
            android:name=".automation.FireSettingReceiver"
-            android:exported="true">
+            android:exported="false">
            <intent-filter>
                <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING" />
            </intent-filter>
--- a/uhabits-android/src/main/java/com/android/datetimepicker/Utils.java
+++ b/uhabits-android/src/main/java/com/android/datetimepicker/Utils.java
@@ -22,7 +22,6 @@ 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;

@@ -43,17 +42,13 @@ 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 (isJellybeanOrLater() && view != null && text != null) {
+        if (view != null && text != null) {
            view.announceForAccessibility(text);
        }
    }
--- a/uhabits-android/src/main/java/com/android/datetimepicker/date/DayPickerView.java
+++ b/uhabits-android/src/main/java/com/android/datetimepicker/date/DayPickerView.java
@@ -383,10 +383,6 @@ 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;
                }
            }
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkDialog.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkDialog.kt
@@ -20,60 +20,109 @@
 package org.isoron.uhabits.activities.common.dialogs

 import android.app.Dialog
-import android.os.Bundle
+import android.content.Context
 import android.view.LayoutInflater
+import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import androidx.appcompat.app.AppCompatDialogFragment
-import org.isoron.uhabits.HabitsApplication
 import org.isoron.uhabits.R
 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
+import org.isoron.uhabits.core.models.Entry.Companion.YES_AUTO
 import org.isoron.uhabits.core.models.Entry.Companion.YES_MANUAL
+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

-class CheckmarkDialog : AppCompatDialogFragment() {
-    var onToggle: (Int, String) -> Unit = { _, _ -> }
+const val POPUP_WIDTH = 4 * 48f + 16f
+const val POPUP_HEIGHT = 48f * 2.5f + 8f

-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val appComponent = (requireActivity().application as HabitsApplication).component
-        val prefs = appComponent.preferences
-        val view = CheckmarkPopupBinding.inflate(LayoutInflater.from(context))
+class CheckmarkPopup(
+    private val context: Context,
+    private val color: Int,
+    private var notes: String,
+    private var value: Int,
+    private val prefs: Preferences,
+    private val anchor: View,
+) {
+    var onToggle: (Int, String) -> Unit = { _, _ -> }
+    private lateinit var dialog: Dialog
+
+    private val view = CheckmarkPopupBinding.inflate(LayoutInflater.from(context)).apply {
+        // Required for round corners
+        container.clipToOutline = true
+    }
+
+    init {
+        view.booleanButtons.visibility = VISIBLE
+        initColors()
+        initTypefaces()
+        hideDisabledButtons()
+        populate()
+    }
+
+    private fun initColors() {
        arrayOf(view.yesBtn, view.skipBtn).forEach {
-            it.setTextColor(requireArguments().getInt("color"))
+            it.setTextColor(color)
        }
        arrayOf(view.noBtn, view.unknownBtn).forEach {
            it.setTextColor(view.root.sres.getColor(R.attr.contrast60))
        }
+    }
+
+    private fun initTypefaces() {
        arrayOf(view.yesBtn, view.noBtn, view.skipBtn, view.unknownBtn).forEach {
-            it.typeface = getFontAwesome(requireContext())
+            it.typeface = getFontAwesome(context)
        }
-        view.notes.setText(requireArguments().getString("notes")!!)
+    }
+
+    private fun hideDisabledButtons() {
        if (!prefs.isSkipEnabled) view.skipBtn.visibility = GONE
        if (!prefs.areQuestionMarksEnabled) view.unknownBtn.visibility = GONE
-        view.booleanButtons.visibility = VISIBLE
-        val dialog = Dialog(requireContext())
+    }
+
+    private fun populate() {
+        val selectedBtn = when (value) {
+            YES_MANUAL -> view.yesBtn
+            YES_AUTO -> view.noBtn
+            NO -> view.noBtn
+            UNKNOWN -> if (prefs.areQuestionMarksEnabled) view.unknownBtn else view.noBtn
+            SKIP -> if (prefs.isSkipEnabled) view.skipBtn else view.noBtn
+            else -> null
+        }
+        view.notes.setText(notes)
+    }
+
+    fun show() {
+        dialog = Dialog(context, android.R.style.Theme_NoTitleBar)
        dialog.setContentView(view.root)
        dialog.window?.apply {
+            setLayout(
+                view.root.dp(POPUP_WIDTH).toInt(),
+                view.root.dp(POPUP_HEIGHT).toInt()
+            )
            setBackgroundDrawableResource(android.R.color.transparent)
        }
        fun onClick(v: Int) {
-            val notes = view.notes.text.toString().trim()
-            onToggle(v, notes)
-            requireDialog().dismiss()
+            this.value = v
+            save()
        }
        view.yesBtn.setOnClickListener { onClick(YES_MANUAL) }
        view.noBtn.setOnClickListener { onClick(NO) }
        view.skipBtn.setOnClickListener { onClick(SKIP) }
        view.unknownBtn.setOnClickListener { onClick(UNKNOWN) }
-        view.notes.setOnEditorActionListener { v, actionId, event ->
-            onClick(requireArguments().getInt("value"))
-            true
-        }
+        dialog.setCanceledOnTouchOutside(true)
+        dialog.dimBehind()
+        dialog.dismissCurrentAndShow()
+    }

-        return dialog
+    fun save() {
+        onToggle(value, view.notes.text.toString().trim())
+        dialog.dismiss()
    }
 }
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.kt
@@ -28,7 +28,7 @@ import org.isoron.uhabits.utils.toPaletteColor
 class ColorPickerDialog : ColorPickerDialog() {
    fun setListener(callback: OnColorPickedCallback) {
        super.setOnColorSelectedListener { c: Int ->
-            val pc = c.toPaletteColor(context!!)
+            val pc = c.toPaletteColor(requireContext())
            callback.onColorPicked(pc)
        }
    }
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt
@@ -51,12 +51,12 @@ class HistoryEditorDialog : AppCompatDialogFragment(), CommandRunner.Listener {

    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
        clearCurrentDialog()
-        val component = (activity!!.application as HabitsApplication).component
+        val component = (requireActivity().application as HabitsApplication).component
        commandRunner = component.commandRunner
-        habit = component.habitList.getById(arguments!!.getLong("habit"))!!
+        habit = component.habitList.getById(requireArguments().getLong("habit"))!!
        preferences = component.preferences

-        val themeSwitcher = AndroidThemeSwitcher(activity!!, preferences)
+        val themeSwitcher = AndroidThemeSwitcher(requireActivity(), preferences)
        themeSwitcher.apply()

        chart = HistoryChart(
@@ -71,10 +71,10 @@ class HistoryEditorDialog : AppCompatDialogFragment(), CommandRunner.Listener {
            onDateClickedListener = onDateClickedListener ?: object : OnDateClickedListener {},
            padding = 10.0,
        )
-        dataView = AndroidDataView(context!!, null)
+        dataView = AndroidDataView(requireContext(), null)
        dataView.view = chart!!

-        val dialog = Dialog(context!!).apply {
+        val dialog = Dialog(requireContext()).apply {
            val metrics = resources.displayMetrics
            val maxHeight = resources.getDimensionPixelSize(R.dimen.history_editor_max_height)
            setContentView(dataView)
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberDialog.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberDialog.kt
@@ -1,115 +0,0 @@
-package org.isoron.uhabits.activities.common.dialogs
-
-import android.app.Dialog
-import android.os.Bundle
-import android.provider.Settings
-import android.text.method.DigitsKeyListener
-import android.view.KeyEvent
-import android.view.LayoutInflater
-import android.view.MotionEvent
-import android.view.View
-import android.view.inputmethod.EditorInfo
-import androidx.appcompat.app.AppCompatDialogFragment
-import org.isoron.uhabits.HabitsApplication
-import org.isoron.uhabits.R
-import org.isoron.uhabits.core.models.Entry
-import org.isoron.uhabits.databinding.CheckmarkPopupBinding
-import org.isoron.uhabits.utils.InterfaceUtils
-import org.isoron.uhabits.utils.requestFocusWithKeyboard
-import org.isoron.uhabits.utils.sres
-import java.text.DecimalFormat
-import java.text.DecimalFormatSymbols
-import java.text.NumberFormat
-import java.text.ParseException
-
-class NumberDialog : AppCompatDialogFragment() {
-
-    var onToggle: (Double, String) -> Unit = { _, _ -> }
-    var onDismiss: () -> Unit = {}
-
-    private var originalNotes: String = ""
-    private var originalValue: Double = 0.0
-    private lateinit var view: CheckmarkPopupBinding
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val appComponent = (requireActivity().application as HabitsApplication).component
-        val prefs = appComponent.preferences
-        view = CheckmarkPopupBinding.inflate(LayoutInflater.from(context))
-        arrayOf(view.yesBtn, view.skipBtn).forEach {
-            it.setTextColor(requireArguments().getInt("color"))
-        }
-        arrayOf(view.noBtn, view.unknownBtn).forEach {
-            it.setTextColor(view.root.sres.getColor(R.attr.contrast60))
-        }
-        arrayOf(view.yesBtn, view.noBtn, view.skipBtn, view.unknownBtn).forEach {
-            it.typeface = InterfaceUtils.getFontAwesome(requireContext())
-        }
-        if (!prefs.isSkipEnabled) view.skipBtnNumber.visibility = View.GONE
-        view.numberButtons.visibility = View.VISIBLE
-        fixDecimalSeparator(view)
-        originalNotes = requireArguments().getString("notes")!!
-        originalValue = requireArguments().getDouble("value")
-        view.notes.setText(originalNotes)
-        view.value.setText(
-            when {
-                originalValue < 0.01 -> "0"
-                else -> DecimalFormat("#.##").format(originalValue)
-            }
-        )
-        view.value.setOnKeyListener { _, keyCode, event ->
-            if (event.action == MotionEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER) {
-                save()
-                return@setOnKeyListener true
-            }
-            return@setOnKeyListener false
-        }
-        view.saveBtn.setOnClickListener {
-            save()
-        }
-        view.skipBtnNumber.setOnClickListener {
-            view.value.setText(DecimalFormat("#.###").format((Entry.SKIP.toDouble() / 1000)))
-            save()
-        }
-        view.notes.setOnEditorActionListener { v, actionId, event ->
-            save()
-            true
-        }
-        view.value.requestFocusWithKeyboard()
-        val dialog = Dialog(requireContext())
-        dialog.setContentView(view.root)
-        dialog.window?.apply {
-            setBackgroundDrawableResource(android.R.color.transparent)
-        }
-        dialog.setOnDismissListener { onDismiss() }
-        return dialog
-    }
-
-    private fun fixDecimalSeparator(view: CheckmarkPopupBinding) {
-        // https://stackoverflow.com/a/34256139
-        val separator = DecimalFormatSymbols.getInstance().decimalSeparator
-        view.value.keyListener = DigitsKeyListener.getInstance("0123456789$separator")
-
-        // https://github.com/flutter/flutter/issues/61175
-        val currKeyboard = Settings.Secure.getString(
-            requireContext().contentResolver,
-            Settings.Secure.DEFAULT_INPUT_METHOD
-        )
-        if (currKeyboard.contains("swiftkey") || currKeyboard.contains("samsung")) {
-            view.value.inputType = EditorInfo.TYPE_CLASS_TEXT
-        }
-    }
-
-    fun save() {
-        var value = originalValue
-        try {
-            val numberFormat = NumberFormat.getInstance()
-            val valueStr = view.value.text.toString()
-            value = numberFormat.parse(valueStr)!!.toDouble()
-        } catch (e: ParseException) {
-            // NOP
-        }
-        val notes = view.notes.text.toString()
-        onToggle(value, notes)
-        requireDialog().dismiss()
-    }
-}
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPopup.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPopup.kt
@@ -0,0 +1,116 @@
+/*
+ * 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.common.dialogs
+
+import android.app.Dialog
+import android.content.Context
+import android.view.KeyEvent.KEYCODE_ENTER
+import android.view.LayoutInflater
+import android.view.MotionEvent.ACTION_DOWN
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+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
+
+class NumberPopup(
+    private val context: Context,
+    private var notes: String,
+    private var value: Double,
+    private val prefs: Preferences,
+    private val anchor: View,
+) {
+    var onToggle: (Double, String) -> Unit = { _, _ -> }
+    var onDismiss: () -> Unit = {}
+    private val originalValue = value
+    private lateinit var dialog: Dialog
+
+    private val view = CheckmarkPopupBinding.inflate(LayoutInflater.from(context)).apply {
+        // Required for round corners
+        container.clipToOutline = true
+    }
+
+    init {
+        view.numberButtons.visibility = VISIBLE
+        hideDisabledButtons()
+        populate()
+    }
+
+    private fun hideDisabledButtons() {
+        if (!prefs.isSkipEnabled) view.skipBtnNumber.visibility = GONE
+    }
+
+    private fun populate() {
+        view.notes.setText(notes)
+        view.value.setText(
+            when {
+                value < 0.01 -> "0"
+                else -> DecimalFormat("#.##").format(value)
+            }
+        )
+    }
+
+    fun show() {
+        dialog = Dialog(context, android.R.style.Theme_NoTitleBar)
+        dialog.setContentView(view.root)
+        dialog.window?.apply {
+            setLayout(
+                view.root.dp(POPUP_WIDTH).toInt(),
+                view.root.dp(POPUP_HEIGHT).toInt()
+            )
+            setBackgroundDrawableResource(android.R.color.transparent)
+        }
+        dialog.setOnDismissListener {
+            onDismiss()
+        }
+
+        view.value.setOnKeyListener { _, keyCode, event ->
+            if (event.action == ACTION_DOWN && keyCode == KEYCODE_ENTER) {
+                save()
+                return@setOnKeyListener true
+            }
+            return@setOnKeyListener false
+        }
+        view.saveBtn.setOnClickListener {
+            save()
+        }
+        view.skipBtnNumber.setOnClickListener {
+            view.value.setText((Entry.SKIP.toDouble() / 1000).toString())
+            save()
+        }
+        view.value.requestFocusWithKeyboard()
+        dialog.setCanceledOnTouchOutside(true)
+        dialog.dimBehind()
+        dialog.dismissCurrentAndShow()
+    }
+
+    fun save() {
+        val value = view.value.text.toString().toDoubleOrNull() ?: originalValue
+        val notes = view.notes.text.toString()
+        onToggle(value, notes)
+        dialog.dismiss()
+    }
+}
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.kt
@@ -60,7 +60,7 @@ class WeekdayPickerDialog :

    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
        val builder = AlertDialog.Builder(
-            activity!!
+            requireActivity()
        )
        builder
            .setTitle(R.string.select_weekdays)
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/HabitTypeDialog.kt
+++ b/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(activity!!, HabitType.YES_NO.value)
+            val intent = IntentFactory().startEditActivity(requireActivity(), HabitType.YES_NO.value)
            startActivity(intent)
            dismiss()
        }

        binding.buttonMeasurable.setOnClickListener {
-            val intent = IntentFactory().startEditActivity(activity!!, HabitType.NUMERICAL.value)
+            val intent = IntentFactory().startEditActivity(requireActivity(), HabitType.NUMERICAL.value)
            startActivity(intent)
            dismiss()
        }
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt
@@ -40,7 +40,6 @@ import org.isoron.uhabits.inject.ActivityContextModule
 import org.isoron.uhabits.inject.DaggerHabitsActivityComponent
 import org.isoron.uhabits.inject.HabitsActivityComponent
 import org.isoron.uhabits.inject.HabitsApplicationComponent
-import org.isoron.uhabits.utils.dismissCurrentDialog
 import org.isoron.uhabits.utils.restartWithFade

 class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
@@ -92,7 +91,6 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
        midnightTimer.onPause()
        screen.onDetached()
        adapter.cancelRefresh()
-        dismissCurrentDialog()
        super.onPause()
    }

@@ -101,7 +99,6 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
        screen.onAttached()
        rootView.postInvalidate()
        midnightTimer.onResume()
-        appComponent.reminderScheduler.scheduleAll()
        taskRunner.run {
            try {
                AutoBackup(this@ListHabitsActivity).run()
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
@@ -22,15 +22,14 @@ package org.isoron.uhabits.activities.habits.list
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import dagger.Lazy
 import org.isoron.platform.gui.toInt
 import org.isoron.uhabits.R
-import org.isoron.uhabits.activities.common.dialogs.CheckmarkDialog
+import org.isoron.uhabits.activities.common.dialogs.CheckmarkPopup
 import org.isoron.uhabits.activities.common.dialogs.ColorPickerDialogFactory
 import org.isoron.uhabits.activities.common.dialogs.ConfirmDeleteDialog
-import org.isoron.uhabits.activities.common.dialogs.NumberDialog
+import org.isoron.uhabits.activities.common.dialogs.NumberPopup
 import org.isoron.uhabits.activities.habits.edit.HabitTypeDialog
 import org.isoron.uhabits.activities.habits.list.views.HabitCardListAdapter
 import org.isoron.uhabits.core.commands.ArchiveHabitsCommand
@@ -234,14 +233,17 @@ class ListHabitsScreen
        notes: String,
        callback: ListHabitsBehavior.NumberPickerCallback
    ) {
-        val fm = (context as AppCompatActivity).supportFragmentManager
-        val dialog = NumberDialog()
-        dialog.arguments = Bundle().apply {
-            putDouble("value", value)
-            putString("notes", notes)
+        val view = rootView.get()
+        NumberPopup(
+            context = context,
+            prefs = preferences,
+            anchor = view,
+            notes = notes,
+            value = value,
+        ).apply {
+            onToggle = { value, notes -> callback.onNumberPicked(value, notes) }
+            show()
        }
-        dialog.onToggle = { v, n -> callback.onNumberPicked(v, n) }
-        dialog.dismissCurrentAndShow(fm, "numberDialog")
    }

    override fun showCheckmarkPopup(
@@ -250,16 +252,18 @@ class ListHabitsScreen
        color: PaletteColor,
        callback: ListHabitsBehavior.CheckMarkDialogCallback
    ) {
-        val theme = rootView.get().currentTheme()
-        val fm = (context as AppCompatActivity).supportFragmentManager
-        val dialog = CheckmarkDialog()
-        dialog.arguments = Bundle().apply {
-            putInt("color", theme.color(color).toInt())
-            putInt("value", selectedValue)
-            putString("notes", notes)
+        val view = rootView.get()
+        CheckmarkPopup(
+            context = context,
+            prefs = preferences,
+            anchor = view,
+            color = view.currentTheme().color(color).toInt(),
+            notes = notes,
+            value = selectedValue,
+        ).apply {
+            onToggle = { value, notes -> callback.onNotesSaved(value, notes) }
+            show()
        }
-        dialog.onToggle = { v, n -> callback.onNotesSaved(v, n) }
-        dialog.dismissCurrentAndShow(fm, "checkmarkDialog")
    }

    private fun getExecuteString(command: Command): String? {
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
@@ -44,6 +44,8 @@ import org.isoron.uhabits.utils.sres
 import org.isoron.uhabits.utils.toMeasureSpec
 import javax.inject.Inject

+const val TOGGLE_DELAY_MILLIS = 2000L
+
 class CheckmarkButtonViewFactory
@Inject constructor(
    @ActivityContext val context: Context,
@@ -77,7 +79,7 @@ class CheckmarkButtonView(
            invalidate()
        }

-    var onToggle: (Int, String) -> Unit = { _, _ -> }
+    var onToggle: (Int, String, Long) -> Unit = { _, _, _ -> }

    var onEdit: () -> Unit = { }

@@ -88,25 +90,25 @@ class CheckmarkButtonView(
        setOnLongClickListener(this)
    }

-    fun performToggle() {
+    fun performToggle(delay: Long) {
        value = Entry.nextToggleValue(
            value = value,
            isSkipEnabled = preferences.isSkipEnabled,
            areQuestionMarksEnabled = preferences.areQuestionMarksEnabled
        )
-        onToggle(value, notes)
+        onToggle(value, notes, delay)
        performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
        invalidate()
    }

    override fun onClick(v: View) {
-        if (preferences.isShortToggleEnabled) performToggle()
+        if (preferences.isShortToggleEnabled) performToggle(TOGGLE_DELAY_MILLIS)
        else onEdit()
    }

    override fun onLongClick(v: View): Boolean {
        if (preferences.isShortToggleEnabled) onEdit()
-        else performToggle()
+        else performToggle(TOGGLE_DELAY_MILLIS)
        return true
    }

--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.kt
@@ -60,7 +60,7 @@ class CheckmarkPanelView(
            setupButtons()
        }

-    var onToggle: (Timestamp, Int, String) -> Unit = { _, _, _ -> }
+    var onToggle: (Timestamp, Int, String, Long) -> Unit = { _, _, _, _ -> }
        set(value) {
            field = value
            setupButtons()
@@ -89,7 +89,7 @@ class CheckmarkPanelView(
                else -> ""
            }
            button.color = color
-            button.onToggle = { value, notes -> onToggle(timestamp, value, notes) }
+            button.onToggle = { value, notes, delay -> onToggle(timestamp, value, notes, delay) }
            button.onEdit = { onEdit(timestamp) }
        }
    }
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt
@@ -57,6 +57,13 @@ class HabitCardViewFactory
    fun create() = HabitCardView(context, checkmarkPanelFactory, numberPanelFactory, behavior)
 }

+data class DelayedToggle(
+    var habit: Habit,
+    var timestamp: Timestamp,
+    var value: Int,
+    var notes: String
+)
+
 class HabitCardView(
    @ActivityContext context: Context,
    checkmarkPanelFactory: CheckmarkPanelViewFactory,
@@ -129,6 +136,7 @@ class HabitCardView(
    private var scoreRing: RingView

    private var currentToggleTaskId = 0
+    private var queuedToggles = mutableListOf<DelayedToggle>()

    init {
        scoreRing = RingView(context).apply {
@@ -152,9 +160,12 @@ class HabitCardView(
        }

        checkmarkPanel = checkmarkPanelFactory.create().apply {
-            onToggle = { timestamp, value, notes ->
-                triggerRipple(timestamp)
-                habit?.let { behavior.onToggle(it, timestamp, value, notes) }
+            onToggle = { timestamp, value, notes, delay ->
+                if (delay > 0) triggerRipple(timestamp)
+                habit?.let {
+                    val taskId = queueToggle(it, timestamp, value, notes);
+                    { runPendingToggles(taskId) }.delay(delay)
+                }
            }
            onEdit = { timestamp ->
                triggerRipple(timestamp)
@@ -194,6 +205,25 @@ class HabitCardView(
        addView(innerFrame)
    }

+    @Synchronized
+    private fun runPendingToggles(id: Int) {
+        if (currentToggleTaskId != id) return
+        for ((h, t, v, n) in queuedToggles) behavior.onToggle(h, t, v, n)
+        queuedToggles.clear()
+    }
+
+    @Synchronized
+    private fun queueToggle(
+        it: Habit,
+        timestamp: Timestamp,
+        value: Int,
+        notes: String,
+    ): Int {
+        currentToggleTaskId += 1
+        queuedToggles.add(DelayedToggle(it, timestamp, value, notes))
+        return currentToggleTaskId
+    }
+
    override fun onModelChange() {
        Handler(Looper.getMainLooper()).post {
            habit?.let { copyAttributesFrom(it) }
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
@@ -34,10 +34,10 @@ import org.isoron.uhabits.HabitsApplication
 import org.isoron.uhabits.R
 import org.isoron.uhabits.activities.AndroidThemeSwitcher
 import org.isoron.uhabits.activities.HabitsDirFinder
-import org.isoron.uhabits.activities.common.dialogs.CheckmarkDialog
+import org.isoron.uhabits.activities.common.dialogs.CheckmarkPopup
 import org.isoron.uhabits.activities.common.dialogs.ConfirmDeleteDialog
 import org.isoron.uhabits.activities.common.dialogs.HistoryEditorDialog
-import org.isoron.uhabits.activities.common.dialogs.NumberDialog
+import org.isoron.uhabits.activities.common.dialogs.NumberPopup
 import org.isoron.uhabits.core.commands.Command
 import org.isoron.uhabits.core.commands.CommandRunner
 import org.isoron.uhabits.core.models.Habit
@@ -51,7 +51,6 @@ 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.dismissCurrentDialog
 import org.isoron.uhabits.utils.showMessage
 import org.isoron.uhabits.utils.showSendFileScreen
 import org.isoron.uhabits.widgets.WidgetUpdater
@@ -130,7 +129,6 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
    }

    override fun onPause() {
-        dismissCurrentDialog()
        commandRunner.removeListener(this)
        super.onPause()
    }
@@ -172,32 +170,41 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
        override fun showNumberPopup(
            value: Double,
            notes: String,
+            preferences: Preferences,
            callback: ListHabitsBehavior.NumberPickerCallback
        ) {
-            val dialog = NumberDialog()
-            dialog.arguments = Bundle().apply {
-                putDouble("value", value)
-                putString("notes", notes)
+            val anchor = getPopupAnchor() ?: return
+            NumberPopup(
+                context = this@ShowHabitActivity,
+                prefs = preferences,
+                notes = notes,
+                anchor = anchor,
+                value = value,
+            ).apply {
+                onToggle = { v, n -> callback.onNumberPicked(v, n) }
+                show()
            }
-            dialog.onToggle = { v, n -> callback.onNumberPicked(v, n) }
-            dialog.dismissCurrentAndShow(supportFragmentManager, "numberDialog")
        }

        override fun showCheckmarkPopup(
            selectedValue: Int,
            notes: String,
+            preferences: Preferences,
            color: PaletteColor,
            callback: ListHabitsBehavior.CheckMarkDialogCallback
        ) {
-            val theme = view.currentTheme()
-            val dialog = CheckmarkDialog()
-            dialog.arguments = Bundle().apply {
-                putInt("color", theme.color(color).toInt())
-                putInt("value", selectedValue)
-                putString("notes", notes)
+            val anchor = getPopupAnchor() ?: return
+            CheckmarkPopup(
+                context = this@ShowHabitActivity,
+                prefs = preferences,
+                notes = notes,
+                color = view.currentTheme().color(color).toInt(),
+                anchor = anchor,
+                value = selectedValue,
+            ).apply {
+                onToggle = { v, n -> callback.onNotesSaved(v, n) }
+                show()
            }
-            dialog.onToggle = { v, n -> callback.onNotesSaved(v, n) }
-            dialog.dismissCurrentAndShow(supportFragmentManager, "checkmarkDialog")
        }

        private fun getPopupAnchor(): View? {
@@ -214,6 +221,7 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
                ShowHabitMenuPresenter.Message.COULD_NOT_EXPORT -> {
                    showMessage(resources.getString(R.string.could_not_export))
                }
+                else -> {}
            }
        }

--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt
@@ -22,8 +22,6 @@ 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
@@ -65,7 +63,7 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        addPreferencesFromResource(R.xml.preferences)
-        val appContext = context!!.applicationContext
+        val appContext = requireContext().applicationContext
        if (appContext is HabitsApplication) {
            prefs = appContext.component.preferences
            widgetUpdater = appContext.component.widgetUpdater
@@ -98,10 +96,9 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
            showRingtonePicker()
            return true
        } else if (key == "reminderCustomize") {
-            if (SDK_INT < Build.VERSION_CODES.O) return true
-            createAndroidNotificationChannel(context!!)
+            createAndroidNotificationChannel(requireContext())
            val intent = Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
-            intent.putExtra(Settings.EXTRA_APP_PACKAGE, context!!.packageName)
+            intent.putExtra(Settings.EXTRA_APP_PACKAGE, requireContext().packageName)
            intent.putExtra(Settings.EXTRA_CHANNEL_ID, NotificationTray.REMINDERS_CHANNEL_ID)
            startActivity(intent)
            return true
@@ -111,7 +108,7 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis

    override fun onResume() {
        super.onResume()
-        ringtoneManager = RingtoneManager(activity!!)
+        ringtoneManager = RingtoneManager(requireActivity())
        sharedPrefs = preferenceManager.sharedPreferences
        sharedPrefs!!.registerOnSharedPreferenceChangeListener(this)
        if (!prefs.isDeveloper) {
@@ -120,11 +117,7 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
        }
        updateWeekdayPreference()

-        if (SDK_INT < Build.VERSION_CODES.O)
-            findPreference("reminderCustomize").isVisible = false
-        else {
-            findPreference("reminderSound").isVisible = false
-        }
+        findPreference("reminderSound").isVisible = false
    }

    private fun updateWeekdayPreference() {
@@ -154,8 +147,8 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
        val pref = findPreference(key)
        pref.onPreferenceClickListener =
            Preference.OnPreferenceClickListener {
-                activity!!.setResult(result)
-                activity!!.finish()
+                requireActivity().setResult(result)
+                requireActivity().finish()
                true
            }
    }
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/sync/SyncActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/sync/SyncActivity.kt
@@ -0,0 +1,100 @@
+/*
+ * 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
+    }
+}
--- a/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt
@@ -25,7 +25,6 @@ import android.app.AlarmManager.RTC_WAKEUP
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Context.ALARM_SERVICE
-import android.os.Build
 import android.util.Log
 import org.isoron.uhabits.core.AppScope
 import org.isoron.uhabits.core.models.Habit
@@ -57,10 +56,6 @@ class IntentScheduler
            )
            return SchedulerResult.IGNORED
        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && !manager.canScheduleExactAlarms()) {
-            Log.e("IntentScheduler", "No permission to schedule exact alarms")
-            return SchedulerResult.IGNORED
-        }
        manager.setExactAndAllowWhileIdle(alarmType, timestamp, intent)
        return SchedulerResult.OK
    }
--- a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
@@ -168,14 +168,12 @@ class AndroidNotificationTray
        fun createAndroidNotificationChannel(context: Context) {
            val notificationManager = context.getSystemService(Activity.NOTIFICATION_SERVICE)
                as NotificationManager
-            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)
-            }
+            val channel = NotificationChannel(
+                REMINDERS_CHANNEL_ID,
+                context.resources.getString(R.string.reminder),
+                NotificationManager.IMPORTANCE_DEFAULT
+            )
+            notificationManager.createNotificationChannel(channel)
        }
    }
 }
--- a/uhabits-android/src/main/java/org/isoron/uhabits/utils/DialogUtils.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/utils/DialogUtils.kt
@@ -6,24 +6,16 @@ import androidx.fragment.app.FragmentManager
 import java.lang.ref.WeakReference

 var currentDialog: WeakReference<Dialog> = WeakReference(null)
-var currentDialogFragment: WeakReference<DialogFragment> = WeakReference(null)
-
-fun dismissCurrentDialog() {
-    currentDialog.get()?.dismiss()
-    currentDialog = WeakReference(null)
-    currentDialogFragment.get()?.dismiss()
-    currentDialogFragment = WeakReference(null)
-}

 fun Dialog.dismissCurrentAndShow() {
-    dismissCurrentDialog()
+    currentDialog.get()?.dismiss()
    currentDialog = WeakReference(this)
    show()
 }

 fun DialogFragment.dismissCurrentAndShow(fragmentManager: FragmentManager, tag: String) {
-    dismissCurrentDialog()
-    currentDialogFragment = WeakReference(this)
+    currentDialog.get()?.dismiss()
    show(fragmentManager, tag)
    fragmentManager.executePendingTransactions()
+    currentDialog = WeakReference(this.dialog)
 }
--- a/uhabits-android/src/main/java/org/isoron/uhabits/utils/SystemUtils.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/utils/SystemUtils.kt
@@ -21,18 +21,11 @@ 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) {
-        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)
-        }
+        val km = activity.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+        km.requestDismissKeyguard(activity, null)
    }
 }
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt
@@ -21,9 +21,7 @@ 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
@@ -43,13 +41,12 @@ open class CheckmarkWidget(

    override fun getOnClickPendingIntent(context: Context): PendingIntent? {
        return if (habit.isNumerical) {
-            pendingIntentFactory.showNumberPicker(habit, DateUtils.getTodayWithOffset())
+            pendingIntentFactory.showNumberPicker(habit, DateUtils.getToday())
        } else {
            pendingIntentFactory.toggleCheckmark(habit, null)
        }
    }

-    @RequiresApi(Build.VERSION_CODES.O)
    override fun refreshData(widgetView: View) {
        (widgetView as CheckmarkWidgetView).apply {
            val today = DateUtils.getTodayWithOffset()
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.kt
@@ -33,7 +33,7 @@ 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.getTodayWithOffset
+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
@@ -101,7 +101,7 @@ internal class StackRemoteViewsFactory(private val context: Context, intent: Int
        val landscapeViews = widget.landscapeRemoteViews
        val portraitViews = widget.portraitRemoteViews
        val factory = PendingIntentFactory(context, IntentFactory())
-        val intent = StackWidgetType.getIntentFillIn(factory, widgetType, h, habits, getTodayWithOffset())
+        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)
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt
@@ -24,6 +24,7 @@ import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
 import android.appwidget.AppWidgetManager.INVALID_APPWIDGET_ID
 import android.content.Intent
 import android.os.Bundle
+import android.widget.AbsListView.CHOICE_MODE_MULTIPLE
 import android.widget.ArrayAdapter
 import android.widget.Button
 import android.widget.ListView
@@ -33,6 +34,7 @@ import org.isoron.uhabits.R
 import org.isoron.uhabits.activities.AndroidThemeSwitcher
 import org.isoron.uhabits.core.preferences.WidgetPreferences
 import org.isoron.uhabits.widgets.WidgetUpdater
+import java.util.ArrayList

 class BooleanHabitPickerDialog : HabitPickerDialog() {
    override fun shouldHideNumerical() = true
@@ -86,12 +88,20 @@ open class HabitPickerDialog : Activity() {
        with(listView) {
            adapter = ArrayAdapter(
                context,
-                android.R.layout.simple_list_item_1,
+                android.R.layout.simple_list_item_multiple_choice,
                habitNames
            )
-            setOnItemClickListener { parent, view, position, id ->
-                confirm(mutableListOf(habitIds[position]))
+            choiceMode = CHOICE_MODE_MULTIPLE
+            itemsCanFocus = false
+        }
+        saveButton.setOnClickListener {
+            val selectedIds = mutableListOf<Long>()
+            for (i in 0..listView.count) {
+                if (listView.isItemChecked(i)) {
+                    selectedIds.add(habitIds[i])
+                }
            }
+            confirm(selectedIds)
        }
    }

--- 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
@@ -66,21 +66,23 @@ class CheckmarkWidgetView : HabitWidgetView {
        val res = StyledResources(context)
        val bgColor: Int
        val fgColor: Int
-        setShadowAlpha(0x4f)
        when (entryState) {
            YES_MANUAL, SKIP -> {
                bgColor = activeColor
                fgColor = res.getColor(R.attr.contrast0)
+                setShadowAlpha(0x4f)
                backgroundPaint!!.color = bgColor
                frame!!.setBackgroundDrawable(background)
            }
            YES_AUTO, NO, UNKNOWN -> {
                bgColor = res.getColor(R.attr.cardBgColor)
                fgColor = res.getColor(R.attr.contrast60)
+                setShadowAlpha(0x00)
            }
            else -> {
                bgColor = res.getColor(R.attr.cardBgColor)
                fgColor = res.getColor(R.attr.contrast60)
+                setShadowAlpha(0x00)
            }
        }
        ring.setPercentage(percentage)
@@ -124,7 +126,7 @@ class CheckmarkWidgetView : HabitWidgetView {
        } else {
            width = min(width, height)
        }
-        val textSize = min(0.175f * width, getDimension(context, R.dimen.smallTextSize))
+        val textSize = min(0.2f * width, getDimension(context, R.dimen.smallerTextSize))
        label.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize)
        if (isNumerical) {
            ring.setTextSize(textSize * 0.9f)
@@ -139,8 +141,7 @@ class CheckmarkWidgetView : HabitWidgetView {
    }

    private fun init() {
-        val appComponent: HabitsApplicationComponent =
-            (context.applicationContext as HabitsApplication).component
+        val appComponent: HabitsApplicationComponent = (context.applicationContext as HabitsApplication).component
        preferences = appComponent.preferences
        ring = findViewById<View>(R.id.scoreRing) as RingView
        label = findViewById<View>(R.id.label) as TextView
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.kt
@@ -69,7 +69,7 @@ abstract class HabitWidgetView : FrameLayout {
        val shadowRadius = dpToPixels(context, 2f).toInt()
        val shadowOffset = dpToPixels(context, 1f).toInt()
        val shadowColor = Color.argb(shadowAlpha, 0, 0, 0)
-        val cornerRadius = dpToPixels(context, 12f)
+        val cornerRadius = dpToPixels(context, 5f)
        val radii = FloatArray(8)
        Arrays.fill(radii, cornerRadius)
        val shape = RoundRectShape(radii, null, null)
--- 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,6 +1,3 @@
-2.1.1:
-* Fix Tasker plugin
-
 2.1:
 * Add notes to specific dates
 * Track at-most measurable habits
--- a/uhabits-android/src/main/res/drawable-v21/widget_button_background.xml
+++ b/uhabits-android/src/main/res/drawable-v21/widget_button_background.xml
@@ -1,39 +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/>.
-  -->
-
-<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="12dp"/>
-                    <solid android:color="?android:colorPrimary"/>
-                </shape>
-                <color android:color="@color/white"/>
-            </item>
-        </ripple>
-    </item>
-
-</layer-list>
--- a/uhabits-android/src/main/res/drawable/ic_sync_dark.xml
+++ b/uhabits-android/src/main/res/drawable/ic_sync_dark.xml
@@ -0,0 +1,55 @@
+<!--
+  ~ 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>
--- a/uhabits-android/src/main/res/drawable/ic_sync_light.xml
+++ b/uhabits-android/src/main/res/drawable/ic_sync_light.xml
@@ -0,0 +1,36 @@
+<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>
--- a/uhabits-android/src/main/res/drawable-v21/ripple.xml
+++ b/uhabits-android/src/main/res/drawable-v21/ripple.xml
--- a/uhabits-android/src/main/res/drawable-v21/ripple_transparent.xml
+++ b/uhabits-android/src/main/res/drawable-v21/ripple_transparent.xml
--- a/uhabits-android/src/main/res/drawable-v21/selected_box.xml
+++ b/uhabits-android/src/main/res/drawable-v21/selected_box.xml
--- a/uhabits-android/src/main/res/drawable/widget_button_background.xml
+++ b/uhabits-android/src/main/res/drawable/widget_button_background.xml
@@ -17,18 +17,23 @@
  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
  -->

-<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">
+<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="#30ffffff"/>
+                    <solid android:color="?android:colorPrimary"/>
                </shape>
+                <color android:color="@color/white"/>
            </item>
-        </layer-list>
+        </ripple>
    </item>
-</selector>
+
+</layer-list>
--- a/uhabits-android/src/main/res/layout/checkmark_popup.xml
+++ b/uhabits-android/src/main/res/layout/checkmark_popup.xml
@@ -21,10 +21,8 @@
 <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="wrap_content"
-    android:layout_height="wrap_content"
-    android:minHeight="128dp"
-    android:minWidth="208dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
    app:divider="@drawable/checkmark_dialog_divider"
    app:showDividers="middle"
    android:orientation="vertical"
--- a/uhabits-android/src/main/res/layout/sync_activity.xml
+++ b/uhabits-android/src/main/res/layout/sync_activity.xml
@@ -0,0 +1,162 @@
+<!--
+  ~ 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>
--- a/uhabits-android/src/main/res/layout/widget_configure_activity.xml
+++ b/uhabits-android/src/main/res/layout/widget_configure_activity.xml
@@ -30,4 +30,10 @@
        android:layout_weight="1">
    </ListView>

+    <Button
+        android:id="@+id/buttonSave"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:text="@string/save"/>
+
 </LinearLayout>
--- a/uhabits-android/src/main/res/layout/widget_graph.xml
+++ b/uhabits-android/src/main/res/layout/widget_graph.xml
@@ -35,7 +35,7 @@
        android:paddingTop="4dp"
        android:paddingLeft="8dp"
        android:paddingRight="8dp"
-        android:paddingBottom="8dp"
+        android:paddingBottom="4dp"
        tools:ignore="UselessParent">

        <TextView
@@ -44,7 +44,6 @@
            android:layout_height="wrap_content"
            android:gravity="center"
            android:textSize="@dimen/smallTextSize"
-            android:maxLines="2"
            android:textColor="@color/white"/>

    </LinearLayout>
--- a/uhabits-android/src/main/res/mipmap-anydpi
+++ b/uhabits-android/src/main/res/mipmap-anydpi
--- a/uhabits-android/src/main/res/values-v21/styles_list_habits.xml
+++ b/uhabits-android/src/main/res/values-v21/styles_list_habits.xml
@@ -1,23 +0,0 @@
-<?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>
--- a/uhabits-android/src/main/res/values/attrs.xml
+++ b/uhabits-android/src/main/res/values/attrs.xml
@@ -43,6 +43,7 @@
    <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"/>
--- a/uhabits-android/src/main/res/values/strings.xml
+++ b/uhabits-android/src/main/res/values/strings.xml
@@ -233,4 +233,18 @@
    <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>
--- a/uhabits-android/src/main/res/values/styles.xml
+++ b/uhabits-android/src/main/res/values/styles.xml
@@ -45,6 +45,7 @@
        <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>
@@ -89,6 +90,7 @@
        <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>
--- a/uhabits-android/src/main/res/xml/preferences.xml
+++ b/uhabits-android/src/main/res/xml/preferences.xml
@@ -107,6 +107,24 @@

    </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">
--- a/uhabits-core/assets/main/bip39/chinese_simplified.txt
+++ b/uhabits-core/assets/main/bip39/chinese_simplified.txt
--- a/uhabits-core/assets/main/bip39/chinese_traditional.txt
+++ b/uhabits-core/assets/main/bip39/chinese_traditional.txt
--- a/uhabits-core/assets/main/bip39/czech.txt
+++ b/uhabits-core/assets/main/bip39/czech.txt
--- a/uhabits-core/assets/main/bip39/en_US.txt
+++ b/uhabits-core/assets/main/bip39/en_US.txt
--- a/uhabits-core/assets/main/bip39/french.txt
+++ b/uhabits-core/assets/main/bip39/french.txt
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`<meta http-equiv="Refresh" content="0; url='https://github.com/iSoron/uhabits/discussions/689'" />`