diff --git a/build.sh b/build.sh index f8bbe1175..a69207f42 100755 --- a/build.sh +++ b/build.sh @@ -23,7 +23,7 @@ AVDMANAGER="${ANDROID_HOME}/tools/bin/avdmanager" AVDNAME="uhabitsTest" GRADLE="./gradlew --stacktrace --quiet" PACKAGE_NAME=org.isoron.uhabits -ANDROID_OUTPUTS_DIR="uhabits-android/uhabits-android/build/outputs" +ANDROID_OUTPUTS_DIR="uhabits-android/build/outputs" VERSION=$(cat uhabits-android/gradle.properties | grep VERSION_NAME | sed -e 's/.*=//g;s/ //g') if [ ! -f "${ANDROID_HOME}/platform-tools/adb" ]; then @@ -94,14 +94,14 @@ build_apk() { log_info "Building release APK..." $GRADLE assembleRelease cp -v \ - uhabits-android/build/outputs/apk/release/uhabits-android-release.apk \ + build/outputs/apk/release/uhabits-android-release.apk \ build/loop-$VERSION-release.apk fi log_info "Building debug APK..." $GRADLE assembleDebug --stacktrace || fail cp -v \ - uhabits-android/build/outputs/apk/debug/uhabits-android-debug.apk \ + build/outputs/apk/debug/uhabits-android-debug.apk \ build/loop-$VERSION-debug.apk cd .. @@ -242,16 +242,21 @@ parse_opts() { } remove_build_dir() { - rm -rfv uhabits-core/build - rm -rfv uhabits-web/node_modules/upath/build - rm -rfv uhabits-web/node_modules/core-js/build - rm -rfv uhabits-web/build - rm -rfv uhabits-core-legacy/build - rm -rfv uhabits-server/build - rm -rfv uhabits-android/build - rm -rfv uhabits-android/uhabits-android/build - rm -rfv uhabits-android/android-pickers/build - rm -rfv uhabits-web/node_modules + rm -rfv ./uhabits-core/build + rm -rfv ./uhabits-web/node_modules/upath/build + rm -rfv ./uhabits-web/node_modules/core-js/build + rm -rfv ./uhabits-web/build + rm -rfv ./uhabits-core-legacy/build + rm -rfv ./uhabits-server/build + rm -rfv ./uhabits-android/build + rm -rfv ./uhabits-android/uhabits-android/build + rm -rfv ./uhabits-android/android-pickers/build + rm -rfv ./uhabits-web/node_modules + rm -rfv ./uhabits-core/.gradle + rm -rfv ./uhabits-core-legacy/.gradle + rm -rfv ./uhabits-server/.gradle + rm -rfv ./uhabits-android/.gradle + rm -rfv ./.gradle } main() { diff --git a/settings.gradle-fdroid b/settings.gradle-fdroid index 0cc822abf..f576a3d91 100644 --- a/settings.gradle-fdroid +++ b/settings.gradle-fdroid @@ -1,3 +1,3 @@ # Dummy settings.gradle file that helps F-Droid locate the Android project # metadata (app description and screenshots). See #670 for more details. -include ':android:uhabits-android' +include ':uhabits-android' diff --git a/uhabits-android/android-pickers/.gitignore b/uhabits-android/android-pickers/.gitignore deleted file mode 100644 index 796b96d1c..000000000 --- a/uhabits-android/android-pickers/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/uhabits-android/android-pickers/build.gradle b/uhabits-android/android-pickers/build.gradle deleted file mode 100644 index c559f7366..000000000 --- a/uhabits-android/android-pickers/build.gradle +++ /dev/null @@ -1,24 +0,0 @@ -apply plugin: 'com.android.library' - -android { - compileSdkVersion COMPILE_SDK_VERSION as Integer - - defaultConfig { - minSdkVersion MIN_SDK_VERSION as Integer - targetSdkVersion TARGET_SDK_VERSION as Integer - } - - compileOptions { - targetCompatibility JavaVersion.VERSION_1_8 - sourceCompatibility JavaVersion.VERSION_1_8 - } - - lintOptions { - checkReleaseBuilds false - abortOnError false - } -} - -dependencies { - implementation 'androidx.appcompat:appcompat:1.2.0' -} diff --git a/uhabits-android/android-pickers/proguard-rules.pro b/uhabits-android/android-pickers/proguard-rules.pro deleted file mode 100644 index 2d5885450..000000000 --- a/uhabits-android/android-pickers/proguard-rules.pro +++ /dev/null @@ -1,25 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /gemini-b/opt/android-sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/uhabits-android/android-pickers/src/main/AndroidManifest.xml b/uhabits-android/android-pickers/src/main/AndroidManifest.xml deleted file mode 100644 index c8e4c8bd3..000000000 --- a/uhabits-android/android-pickers/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - diff --git a/uhabits-android/android-pickers/src/main/res/values/strings.xml b/uhabits-android/android-pickers/src/main/res/values/strings.xml deleted file mode 100644 index 9e6581a37..000000000 --- a/uhabits-android/android-pickers/src/main/res/values/strings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/uhabits-android/build.gradle b/uhabits-android/build.gradle index 359a9ee8a..4b1490e22 100644 --- a/uhabits-android/build.gradle +++ b/uhabits-android/build.gradle @@ -1,26 +1,118 @@ -buildscript { - repositories { - google() - jcenter() - maven { - url "https://plugins.gradle.org/m2/" +plugins { + id 'com.github.triplet.play' version '2.6.2' + id "org.jlleitschuh.gradle.ktlint" version "9.4.1" + id 'com.android.application' version "4.1.0" + id "org.jetbrains.kotlin.android" version "$KOTLIN_VERSION" + id "org.jetbrains.kotlin.kapt" version "$KOTLIN_VERSION" + id "org.jetbrains.kotlin.android.extensions" version "$KOTLIN_VERSION" +} + +repositories { + google() + jcenter() +} + +android { + compileSdkVersion COMPILE_SDK_VERSION as Integer + + def secretPropsFile = file(".secret/gradle.properties") + if (secretPropsFile.exists()) { + def secrets = new Properties() + secretPropsFile.withInputStream { secrets.load(it) } + signingConfigs { + release { + storeFile file(secrets.LOOP_KEY_STORE) + storePassword secrets.LOOP_STORE_PASSWORD + keyAlias secrets.LOOP_KEY_ALIAS + keyPassword secrets.LOOP_KEY_PASSWORD + } } + buildTypes.release.signingConfig signingConfigs.release } - dependencies { - classpath "com.android.tools.build:gradle:$BUILD_TOOLS_VERSION" - classpath "com.neenbedankt.gradle.plugins:android-apt:1.8" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION" - classpath "org.ajoberstar:grgit:1.5.0" - classpath "org.jlleitschuh.gradle:ktlint-gradle:9.4.1" + defaultConfig { + versionCode VERSION_CODE as Integer + versionName "$VERSION_NAME" + minSdkVersion MIN_SDK_VERSION as Integer + targetSdkVersion TARGET_SDK_VERSION as Integer + applicationId "org.isoron.uhabits" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + + debug { + testCoverageEnabled true + } } -} -allprojects { - repositories { - google() - maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } - jcenter() + lintOptions { + checkReleaseBuilds false + abortOnError false + disable 'GoogleAppIndexingWarning' } - apply plugin: "org.jlleitschuh.gradle.ktlint" + + compileOptions { + coreLibraryDesugaringEnabled true + targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_1_8 + } + + buildFeatures { + viewBinding true + } +} + +dependencies { + androidTestImplementation "androidx.test.espresso:espresso-contrib:$ESPRESSO_VERSION" + androidTestImplementation "androidx.test.espresso:espresso-core:$ESPRESSO_VERSION" + androidTestImplementation "com.google.dagger:dagger:$DAGGER_VERSION" + androidTestImplementation "com.linkedin.dexmaker:dexmaker-mockito:2.28.0" + androidTestImplementation "com.linkedin.testbutler:test-butler-library:1.3.1" + androidTestImplementation "io.ktor:ktor-client-mock:$KTOR_VERSION" + androidTestImplementation "io.ktor:ktor-jackson:$KTOR_VERSION" + androidTestImplementation "org.mockito:mockito-core:2.28.2" + androidTestImplementation 'androidx.annotation:annotation:1.1.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' + androidTestImplementation 'androidx.test:rules:1.3.0' + compileOnly "javax.annotation:jsr250-api:1.0" + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1' + implementation "com.github.paolorotolo:appintro:3.4.0" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "com.google.dagger:dagger:$DAGGER_VERSION" + implementation "com.google.guava:guava:30.0-android" + implementation "io.ktor:ktor-client-android:$KTOR_VERSION" + implementation "io.ktor:ktor-client-core:$KTOR_VERSION" + implementation "io.ktor:ktor-client-jackson:$KTOR_VERSION" + implementation "io.ktor:ktor-client-json:$KTOR_VERSION" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$KX_COROUTINES_VERSION" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$KX_COROUTINES_VERSION" + implementation 'androidx.appcompat:appcompat:1.2.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.2.1' + implementation 'com.google.zxing:core:3.4.1' + implementation 'com.opencsv:opencsv:3.10' + implementation files("../uhabits-core/build/libs/uhabits-core-jvm.jar") + kapt "com.google.dagger:dagger-compiler:$DAGGER_VERSION" + kaptAndroidTest "com.google.dagger:dagger-compiler:$DAGGER_VERSION" + testImplementation "com.google.dagger:dagger:$DAGGER_VERSION" + testImplementation "junit:junit:4.12" + testImplementation "org.mockito:mockito-core:2.28.2" + testImplementation "org.mockito:mockito-inline:2.8.9" +} + +kapt { + correctErrorTypes = true +} + +play { + serviceAccountCredentials = file("../.secret/gcp-key.json") + track = "alpha" } diff --git a/uhabits-android/gradle.properties b/uhabits-android/gradle.properties index 87da1ae2b..f961b8b49 100644 --- a/uhabits-android/gradle.properties +++ b/uhabits-android/gradle.properties @@ -6,7 +6,7 @@ TARGET_SDK_VERSION = 29 COMPILE_SDK_VERSION = 29 DAGGER_VERSION = 2.25.4 -KOTLIN_VERSION = 1.4.10 +KOTLIN_VERSION = 1.4.21 KX_COROUTINES_VERSION = 1.4.2 SUPPORT_LIBRARY_VERSION = 28.0.0 AUTO_FACTORY_VERSION = 1.0-beta6 diff --git a/uhabits-android/play b/uhabits-android/play deleted file mode 120000 index 1ecaa16de..000000000 --- a/uhabits-android/play +++ /dev/null @@ -1 +0,0 @@ -uhabits-android/src/main/play/ \ No newline at end of file diff --git a/uhabits-android/uhabits-android/proguard-rules.txt b/uhabits-android/proguard-rules.txt similarity index 100% rename from uhabits-android/uhabits-android/proguard-rules.txt rename to uhabits-android/proguard-rules.txt diff --git a/uhabits-android/settings.gradle b/uhabits-android/settings.gradle index c32440e2f..80df3893c 100644 --- a/uhabits-android/settings.gradle +++ b/uhabits-android/settings.gradle @@ -1 +1,14 @@ -include ':uhabits-android', ':android-pickers' +pluginManagement { + repositories { + gradlePluginPortal() + jcenter() + google() + } + resolutionStrategy { + eachPlugin { + if (requested.id.id == "com.android.application") { + useModule("com.android.tools.build:gradle:${requested.version}") + } + } + } +} diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/fontawesome-webfont.ttf b/uhabits-android/src/androidTest/assets/fontawesome-webfont.ttf similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/fontawesome-webfont.ttf rename to uhabits-android/src/androidTest/assets/fontawesome-webfont.ttf diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/CanvasTest.png b/uhabits-android/src/androidTest/assets/views/CanvasTest.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/CanvasTest.png rename to uhabits-android/src/androidTest/assets/views/CanvasTest.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/render.png b/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/render.png rename to uhabits-android/src/androidTest/assets/views/common/FrequencyChart/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderDataOffset.png b/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderDataOffset.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderDataOffset.png rename to uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderDataOffset.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderDifferentSize.png b/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderDifferentSize.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderDifferentSize.png rename to uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderDifferentSize.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderTransparent.png b/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderTransparent.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderTransparent.png rename to uhabits-android/src/androidTest/assets/views/common/FrequencyChart/renderTransparent.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/common/RingView/render.png b/uhabits-android/src/androidTest/assets/views/common/RingView/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/common/RingView/render.png rename to uhabits-android/src/androidTest/assets/views/common/RingView/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/common/RingView/renderDifferentParams.png b/uhabits-android/src/androidTest/assets/views/common/RingView/renderDifferentParams.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/common/RingView/renderDifferentParams.png rename to uhabits-android/src/androidTest/assets/views/common/RingView/renderDifferentParams.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/render.png b/uhabits-android/src/androidTest/assets/views/common/ScoreChart/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/render.png rename to uhabits-android/src/androidTest/assets/views/common/ScoreChart/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderDataOffset.png b/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderDataOffset.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderDataOffset.png rename to uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderDataOffset.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderDifferentSize.png b/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderDifferentSize.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderDifferentSize.png rename to uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderDifferentSize.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderMonthly.png b/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderMonthly.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderMonthly.png rename to uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderMonthly.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderTransparent.png b/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderTransparent.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderTransparent.png rename to uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderTransparent.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderYearly.png b/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderYearly.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderYearly.png rename to uhabits-android/src/androidTest/assets/views/common/ScoreChart/renderYearly.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/common/StreakChart/render.png b/uhabits-android/src/androidTest/assets/views/common/StreakChart/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/common/StreakChart/render.png rename to uhabits-android/src/androidTest/assets/views/common/StreakChart/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/common/StreakChart/renderSmallSize.png b/uhabits-android/src/androidTest/assets/views/common/StreakChart/renderSmallSize.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/common/StreakChart/renderSmallSize.png rename to uhabits-android/src/androidTest/assets/views/common/StreakChart/renderSmallSize.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/common/StreakChart/renderTransparent.png b/uhabits-android/src/androidTest/assets/views/common/StreakChart/renderTransparent.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/common/StreakChart/renderTransparent.png rename to uhabits-android/src/androidTest/assets/views/common/StreakChart/renderTransparent.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_explicit_check.png b/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_explicit_check.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_explicit_check.png rename to uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_explicit_check.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_implicit_check.png b/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_implicit_check.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_implicit_check.png rename to uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_implicit_check.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_unchecked.png b/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_unchecked.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_unchecked.png rename to uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_unchecked.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render.png b/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render.png rename to uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render_offset.png b/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render_offset.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render_offset.png rename to uhabits-android/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render_offset.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render.png b/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render.png rename to uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_changed.png b/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_changed.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_changed.png rename to uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_changed.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_numerical.png b/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_numerical.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_numerical.png rename to uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_numerical.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_selected.png b/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_selected.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_selected.png rename to uhabits-android/src/androidTest/assets/views/habits/list/HabitCardView/render_selected.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HeaderView/render.png b/uhabits-android/src/androidTest/assets/views/habits/list/HeaderView/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HeaderView/render.png rename to uhabits-android/src/androidTest/assets/views/habits/list/HeaderView/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HeaderView/render_reverse.png b/uhabits-android/src/androidTest/assets/views/habits/list/HeaderView/render_reverse.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HeaderView/render_reverse.png rename to uhabits-android/src/androidTest/assets/views/habits/list/HeaderView/render_reverse.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HintView/render.png b/uhabits-android/src/androidTest/assets/views/habits/list/HintView/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/HintView/render.png rename to uhabits-android/src/androidTest/assets/views/habits/list/HintView/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_above.png b/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_above.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_above.png rename to uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_above.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_below.png b/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_below.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_below.png rename to uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_below.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_zero.png b/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_zero.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_zero.png rename to uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_zero.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render.png b/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render.png rename to uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_different_color.png b/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_different_color.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_different_color.png rename to uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_different_color.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_offset.png b/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_offset.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_offset.png rename to uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_offset.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_reversed.png b/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_reversed.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_reversed.png rename to uhabits-android/src/androidTest/assets/views/habits/list/NumberPanelView/render_reversed.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/FrequencyCard/render.png b/uhabits-android/src/androidTest/assets/views/habits/show/FrequencyCard/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/FrequencyCard/render.png rename to uhabits-android/src/androidTest/assets/views/habits/show/FrequencyCard/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/HistoryCard/render.png b/uhabits-android/src/androidTest/assets/views/habits/show/HistoryCard/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/HistoryCard/render.png rename to uhabits-android/src/androidTest/assets/views/habits/show/HistoryCard/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/NotesCard/render-empty-description.png b/uhabits-android/src/androidTest/assets/views/habits/show/NotesCard/render-empty-description.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/NotesCard/render-empty-description.png rename to uhabits-android/src/androidTest/assets/views/habits/show/NotesCard/render-empty-description.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/NotesCard/render.png b/uhabits-android/src/androidTest/assets/views/habits/show/NotesCard/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/NotesCard/render.png rename to uhabits-android/src/androidTest/assets/views/habits/show/NotesCard/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/OverviewCard/render.png b/uhabits-android/src/androidTest/assets/views/habits/show/OverviewCard/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/OverviewCard/render.png rename to uhabits-android/src/androidTest/assets/views/habits/show/OverviewCard/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/ScoreCard/render.png b/uhabits-android/src/androidTest/assets/views/habits/show/ScoreCard/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/ScoreCard/render.png rename to uhabits-android/src/androidTest/assets/views/habits/show/ScoreCard/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/StreakCard/render.png b/uhabits-android/src/androidTest/assets/views/habits/show/StreakCard/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/StreakCard/render.png rename to uhabits-android/src/androidTest/assets/views/habits/show/StreakCard/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/SubtitleCard/render.png b/uhabits-android/src/androidTest/assets/views/habits/show/SubtitleCard/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/habits/show/SubtitleCard/render.png rename to uhabits-android/src/androidTest/assets/views/habits/show/SubtitleCard/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidget/render.png b/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidget/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidget/render.png rename to uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidget/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/checked.png b/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/checked.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/checked.png rename to uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/checked.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/implicitly_checked.png b/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/implicitly_checked.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/implicitly_checked.png rename to uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/implicitly_checked.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/large_size.png b/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/large_size.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/large_size.png rename to uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/large_size.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/unchecked.png b/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/unchecked.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/unchecked.png rename to uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/unchecked.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/FrequencyWidget/render.png b/uhabits-android/src/androidTest/assets/views/widgets/FrequencyWidget/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/FrequencyWidget/render.png rename to uhabits-android/src/androidTest/assets/views/widgets/FrequencyWidget/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/HistoryWidget/render.png b/uhabits-android/src/androidTest/assets/views/widgets/HistoryWidget/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/HistoryWidget/render.png rename to uhabits-android/src/androidTest/assets/views/widgets/HistoryWidget/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/ScoreWidget/render.png b/uhabits-android/src/androidTest/assets/views/widgets/ScoreWidget/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/ScoreWidget/render.png rename to uhabits-android/src/androidTest/assets/views/widgets/ScoreWidget/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/StreakWidget/render.png b/uhabits-android/src/androidTest/assets/views/widgets/StreakWidget/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/StreakWidget/render.png rename to uhabits-android/src/androidTest/assets/views/widgets/StreakWidget/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/TargetWidget/render.png b/uhabits-android/src/androidTest/assets/views/widgets/TargetWidget/render.png similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/assets/views/widgets/TargetWidget/render.png rename to uhabits-android/src/androidTest/assets/views/widgets/TargetWidget/render.png diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/platform/gui/AndroidCanvasTest.kt b/uhabits-android/src/androidTest/java/org/isoron/platform/gui/AndroidCanvasTest.kt similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/platform/gui/AndroidCanvasTest.kt rename to uhabits-android/src/androidTest/java/org/isoron/platform/gui/AndroidCanvasTest.kt diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTestComponent.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTestComponent.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTestComponent.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTestComponent.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/AboutTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/AboutTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/AboutTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/AboutTest.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/BackupTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/BackupTest.kt similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/BackupTest.kt rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/BackupTest.kt diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/WidgetTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/WidgetTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/WidgetTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/WidgetTest.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/BackupSteps.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/BackupSteps.kt similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/BackupSteps.kt rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/BackupSteps.kt diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/RingViewTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/RingViewTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/RingViewTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/RingViewTest.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java diff --git a/uhabits-android/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 similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/EntryButtonViewTest.kt rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/EntryButtonViewTest.kt diff --git a/uhabits-android/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 similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/EntryPanelViewTest.kt rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/EntryPanelViewTest.kt diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.kt similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.kt rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.kt diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardViewTest.kt similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardViewTest.kt rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardViewTest.kt diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardViewTest.kt similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardViewTest.kt rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardViewTest.kt diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/NotesCardViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/NotesCardViewTest.kt similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/NotesCardViewTest.kt rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/NotesCardViewTest.kt diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardViewTest.kt similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardViewTest.kt rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardViewTest.kt diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardViewTest.kt similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardViewTest.kt rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardViewTest.kt diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardViewTest.kt similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardViewTest.kt rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardViewTest.kt diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardViewTest.kt similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardViewTest.kt rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardViewTest.kt diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AndroidDatabaseTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AndroidDatabaseTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AndroidDatabaseTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AndroidDatabaseTest.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AutoBackupTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AutoBackupTest.kt similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AutoBackupTest.kt rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/database/AutoBackupTest.kt diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/intents/IntentSchedulerTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/intents/IntentSchedulerTest.kt similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/intents/IntentSchedulerTest.kt rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/intents/IntentSchedulerTest.kt diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/performance/PerformanceTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/performance/PerformanceTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/performance/PerformanceTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/performance/PerformanceTest.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/ListHabitsRegressionTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/ListHabitsRegressionTest.kt similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/ListHabitsRegressionTest.kt rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/ListHabitsRegressionTest.kt diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/SavedStateTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/SavedStateTest.kt similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/SavedStateTest.kt rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/SavedStateTest.kt diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/sync/RemoteSyncServerTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/sync/RemoteSyncServerTest.kt similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/sync/RemoteSyncServerTest.kt rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/sync/RemoteSyncServerTest.kt diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/TargetWidgetTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/TargetWidgetTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/TargetWidgetTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/TargetWidgetTest.java diff --git a/uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java rename to uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java diff --git a/uhabits-android/uhabits-android/src/main/AndroidManifest.xml b/uhabits-android/src/main/AndroidManifest.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/AndroidManifest.xml rename to uhabits-android/src/main/AndroidManifest.xml diff --git a/uhabits-android/uhabits-android/src/main/assets/cacert.pem b/uhabits-android/src/main/assets/cacert.pem similarity index 100% rename from uhabits-android/uhabits-android/src/main/assets/cacert.pem rename to uhabits-android/src/main/assets/cacert.pem diff --git a/uhabits-android/uhabits-android/src/main/assets/fontawesome-webfont.ttf b/uhabits-android/src/main/assets/fontawesome-webfont.ttf similarity index 100% rename from uhabits-android/uhabits-android/src/main/assets/fontawesome-webfont.ttf rename to uhabits-android/src/main/assets/fontawesome-webfont.ttf diff --git a/uhabits-android/uhabits-android/src/main/ic_launcher-web.png b/uhabits-android/src/main/ic_launcher-web.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/ic_launcher-web.png rename to uhabits-android/src/main/ic_launcher-web.png diff --git a/uhabits-android/uhabits-android/src/main/ic_small_widget_preview-web.png b/uhabits-android/src/main/ic_small_widget_preview-web.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/ic_small_widget_preview-web.png rename to uhabits-android/src/main/ic_small_widget_preview-web.png diff --git a/uhabits-android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java b/uhabits-android/src/main/java/com/android/colorpicker/ColorPickerDialog.java similarity index 94% rename from uhabits-android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java rename to uhabits-android/src/main/java/com/android/colorpicker/ColorPickerDialog.java index a4f503392..a9e668a59 100644 --- a/uhabits-android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java +++ b/uhabits-android/src/main/java/com/android/colorpicker/ColorPickerDialog.java @@ -16,15 +16,19 @@ package com.android.colorpicker; -import android.app.*; -import android.os.*; +import android.app.Activity; +import android.app.Dialog; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.ProgressBar; + import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.*; -import android.view.*; -import android.widget.*; +import androidx.appcompat.app.AppCompatDialogFragment; + +import com.android.colorpicker.ColorPickerSwatch.OnColorSelectedListener; -import com.android.*; -import com.android.colorpicker.ColorPickerSwatch.*; +import org.isoron.uhabits.R; /** * A dialog which takes in as input an array of palette and creates a palette allowing the user to diff --git a/uhabits-android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerPalette.java b/uhabits-android/src/main/java/com/android/colorpicker/ColorPickerPalette.java similarity index 94% rename from uhabits-android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerPalette.java rename to uhabits-android/src/main/java/com/android/colorpicker/ColorPickerPalette.java index 0e7102ad9..b0f18abcf 100644 --- a/uhabits-android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerPalette.java +++ b/uhabits-android/src/main/java/com/android/colorpicker/ColorPickerPalette.java @@ -16,14 +16,18 @@ package com.android.colorpicker; -import android.content.*; -import android.content.res.*; -import android.util.*; -import android.view.*; -import android.widget.*; - -import com.android.*; -import com.android.colorpicker.ColorPickerSwatch.*; +import android.content.Context; +import android.content.res.Resources; +import android.util.AttributeSet; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TableLayout; +import android.widget.TableRow; + +import com.android.colorpicker.ColorPickerSwatch.OnColorSelectedListener; + +import org.isoron.uhabits.R; /** * A color picker custom view which creates an grid of color squares. The number of squares per diff --git a/uhabits-android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerSwatch.java b/uhabits-android/src/main/java/com/android/colorpicker/ColorPickerSwatch.java similarity index 91% rename from uhabits-android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerSwatch.java rename to uhabits-android/src/main/java/com/android/colorpicker/ColorPickerSwatch.java index a7598ca3b..e30561480 100644 --- a/uhabits-android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerSwatch.java +++ b/uhabits-android/src/main/java/com/android/colorpicker/ColorPickerSwatch.java @@ -16,12 +16,14 @@ package com.android.colorpicker; -import android.content.*; -import android.graphics.drawable.*; -import android.view.*; -import android.widget.*; +import android.content.Context; +import android.graphics.drawable.Drawable; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.FrameLayout; +import android.widget.ImageView; -import com.android.*; +import org.isoron.uhabits.R; /** * Creates a circular swatch of a specified color. Adds a checkmark if marked as checked. diff --git a/uhabits-android/android-pickers/src/main/java/com/android/colorpicker/ColorStateDrawable.java b/uhabits-android/src/main/java/com/android/colorpicker/ColorStateDrawable.java similarity index 100% rename from uhabits-android/android-pickers/src/main/java/com/android/colorpicker/ColorStateDrawable.java rename to uhabits-android/src/main/java/com/android/colorpicker/ColorStateDrawable.java diff --git a/uhabits-android/android-pickers/src/main/java/com/android/colorpicker/HsvColorComparator.java b/uhabits-android/src/main/java/com/android/colorpicker/HsvColorComparator.java similarity index 100% rename from uhabits-android/android-pickers/src/main/java/com/android/colorpicker/HsvColorComparator.java rename to uhabits-android/src/main/java/com/android/colorpicker/HsvColorComparator.java diff --git a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java b/uhabits-android/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java similarity index 100% rename from uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java rename to uhabits-android/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java diff --git a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/AccessibleTextView.java b/uhabits-android/src/main/java/com/android/datetimepicker/AccessibleTextView.java similarity index 99% rename from uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/AccessibleTextView.java rename to uhabits-android/src/main/java/com/android/datetimepicker/AccessibleTextView.java index 98fa74424..47eb9f254 100644 --- a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/AccessibleTextView.java +++ b/uhabits-android/src/main/java/com/android/datetimepicker/AccessibleTextView.java @@ -23,6 +23,7 @@ import android.view.accessibility.AccessibilityNodeInfo; import android.widget.Button; import android.widget.TextView; + /** * Fake Button class, used so TextViews can announce themselves as Buttons, for accessibility. */ diff --git a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/HapticFeedbackController.java b/uhabits-android/src/main/java/com/android/datetimepicker/HapticFeedbackController.java similarity index 100% rename from uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/HapticFeedbackController.java rename to uhabits-android/src/main/java/com/android/datetimepicker/HapticFeedbackController.java diff --git a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/Utils.java b/uhabits-android/src/main/java/com/android/datetimepicker/Utils.java similarity index 100% rename from uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/Utils.java rename to uhabits-android/src/main/java/com/android/datetimepicker/Utils.java diff --git a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java b/uhabits-android/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java similarity index 100% rename from uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java rename to uhabits-android/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java diff --git a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerController.java b/uhabits-android/src/main/java/com/android/datetimepicker/date/DatePickerController.java similarity index 100% rename from uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerController.java rename to uhabits-android/src/main/java/com/android/datetimepicker/date/DatePickerController.java diff --git a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java b/uhabits-android/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java similarity index 94% rename from uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java rename to uhabits-android/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java index dd4e06942..229b8df2e 100644 --- a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java +++ b/uhabits-android/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java @@ -16,23 +16,36 @@ package com.android.datetimepicker.date; -import android.animation.*; -import android.app.*; -import android.content.res.*; -import android.os.*; -import android.text.format.*; -import android.util.*; -import android.view.*; -import android.view.View.*; -import android.view.animation.*; -import android.widget.*; - -import com.android.*; -import com.android.datetimepicker.*; -import com.android.datetimepicker.date.MonthAdapter.*; - -import java.text.*; -import java.util.*; +import android.animation.ObjectAnimator; +import android.app.Activity; +import android.app.DialogFragment; +import android.content.res.Resources; +import android.os.Bundle; +import android.text.format.DateUtils; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.View.OnClickListener; +import android.view.ViewGroup; +import android.view.Window; +import android.view.WindowManager; +import android.view.animation.AlphaAnimation; +import android.view.animation.Animation; +import android.widget.Button; +import android.widget.LinearLayout; +import android.widget.TextView; + +import com.android.datetimepicker.HapticFeedbackController; +import com.android.datetimepicker.Utils; +import com.android.datetimepicker.date.MonthAdapter.CalendarDay; + +import org.isoron.uhabits.R; + +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Locale; /** * Dialog allowing users to select a date. diff --git a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/DayPickerView.java b/uhabits-android/src/main/java/com/android/datetimepicker/date/DayPickerView.java similarity index 100% rename from uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/DayPickerView.java rename to uhabits-android/src/main/java/com/android/datetimepicker/date/DayPickerView.java diff --git a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthAdapter.java b/uhabits-android/src/main/java/com/android/datetimepicker/date/MonthAdapter.java similarity index 100% rename from uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthAdapter.java rename to uhabits-android/src/main/java/com/android/datetimepicker/date/MonthAdapter.java diff --git a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java b/uhabits-android/src/main/java/com/android/datetimepicker/date/MonthView.java similarity index 99% rename from uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java rename to uhabits-android/src/main/java/com/android/datetimepicker/date/MonthView.java index 79cda6b80..b9df53cce 100644 --- a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java +++ b/uhabits-android/src/main/java/com/android/datetimepicker/date/MonthView.java @@ -34,6 +34,8 @@ import com.android.*; import com.android.datetimepicker.*; import com.android.datetimepicker.date.MonthAdapter.*; +import org.isoron.uhabits.R; + import java.security.*; import java.util.*; import java.util.Formatter; diff --git a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java b/uhabits-android/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java similarity index 100% rename from uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java rename to uhabits-android/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java diff --git a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java b/uhabits-android/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java similarity index 100% rename from uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java rename to uhabits-android/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java diff --git a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java b/uhabits-android/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java similarity index 100% rename from uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java rename to uhabits-android/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java diff --git a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java b/uhabits-android/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java similarity index 89% rename from uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java rename to uhabits-android/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java index 148f2faf2..6ff7f6abe 100644 --- a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java +++ b/uhabits-android/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java @@ -16,14 +16,16 @@ package com.android.datetimepicker.date; -import android.content.*; -import android.content.res.*; -import android.graphics.*; -import android.graphics.Paint.*; -import android.util.*; -import android.widget.*; +import android.content.Context; +import android.content.res.Resources; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.Paint.Align; +import android.graphics.Paint.Style; +import android.util.AttributeSet; +import android.widget.TextView; -import com.android.*; +import org.isoron.uhabits.R; /** * A text view which, when pressed or activated, displays a blue circle around the text. diff --git a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/YearPickerView.java b/uhabits-android/src/main/java/com/android/datetimepicker/date/YearPickerView.java similarity index 89% rename from uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/YearPickerView.java rename to uhabits-android/src/main/java/com/android/datetimepicker/date/YearPickerView.java index b2c33f6b5..773645f64 100644 --- a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/date/YearPickerView.java +++ b/uhabits-android/src/main/java/com/android/datetimepicker/date/YearPickerView.java @@ -16,18 +16,24 @@ package com.android.datetimepicker.date; -import android.content.*; -import android.content.res.*; -import android.graphics.drawable.*; -import android.view.*; -import android.view.accessibility.*; -import android.widget.*; -import android.widget.AdapterView.*; - -import com.android.*; -import com.android.datetimepicker.date.DatePickerDialog.*; - -import java.util.*; +import android.content.Context; +import android.content.res.Resources; +import android.graphics.drawable.StateListDrawable; +import android.view.View; +import android.view.ViewGroup; +import android.view.accessibility.AccessibilityEvent; +import android.widget.AdapterView; +import android.widget.AdapterView.OnItemClickListener; +import android.widget.ArrayAdapter; +import android.widget.ListView; +import android.widget.TextView; + +import com.android.datetimepicker.date.DatePickerDialog.OnDateChangedListener; + +import org.isoron.uhabits.R; + +import java.util.ArrayList; +import java.util.List; /** * Displays a selectable list of years. diff --git a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java b/uhabits-android/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java similarity index 99% rename from uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java rename to uhabits-android/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java index 3c6316521..599f6d1f0 100644 --- a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java +++ b/uhabits-android/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java @@ -26,6 +26,8 @@ import android.view.*; import com.android.*; import com.android.datetimepicker.*; +import org.isoron.uhabits.R; + import java.text.*; /** diff --git a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/CircleView.java b/uhabits-android/src/main/java/com/android/datetimepicker/time/CircleView.java similarity index 94% rename from uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/CircleView.java rename to uhabits-android/src/main/java/com/android/datetimepicker/time/CircleView.java index 1765bff93..4f4498a85 100644 --- a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/CircleView.java +++ b/uhabits-android/src/main/java/com/android/datetimepicker/time/CircleView.java @@ -17,13 +17,14 @@ package com.android.datetimepicker.time; -import android.content.*; -import android.content.res.*; -import android.graphics.*; -import android.util.*; -import android.view.*; - -import com.android.*; +import android.content.Context; +import android.content.res.Resources; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.util.Log; +import android.view.View; + +import org.isoron.uhabits.R; /** * Draws a simple white circle on which the numbers will be drawn. diff --git a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java b/uhabits-android/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java similarity index 99% rename from uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java rename to uhabits-android/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java index 307424a3e..b877b8fdb 100644 --- a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java +++ b/uhabits-android/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java @@ -31,6 +31,8 @@ import android.widget.*; import com.android.*; import com.android.datetimepicker.*; +import org.isoron.uhabits.R; + /** * The primary layout to hold the circular picker, and the am/pm buttons. This view well measure * itself to end up as a square. It also handles touches to be passed in to views that need to know diff --git a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java b/uhabits-android/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java similarity index 97% rename from uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java rename to uhabits-android/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java index 018147efa..7af032433 100644 --- a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java +++ b/uhabits-android/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java @@ -16,16 +16,21 @@ package com.android.datetimepicker.time; -import android.animation.*; -import android.animation.ValueAnimator.*; -import android.content.*; -import android.content.res.*; -import android.graphics.*; -import android.util.*; -import android.view.*; - -import com.android.*; -import com.android.datetimepicker.*; +import android.animation.Keyframe; +import android.animation.ObjectAnimator; +import android.animation.PropertyValuesHolder; +import android.animation.ValueAnimator; +import android.animation.ValueAnimator.AnimatorUpdateListener; +import android.content.Context; +import android.content.res.Resources; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.util.Log; +import android.view.View; + +import com.android.datetimepicker.Utils; + +import org.isoron.uhabits.R; /** * View to show what number is selected. This will draw a blue circle over the number, with a blue diff --git a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialTextsView.java b/uhabits-android/src/main/java/com/android/datetimepicker/time/RadialTextsView.java similarity index 96% rename from uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialTextsView.java rename to uhabits-android/src/main/java/com/android/datetimepicker/time/RadialTextsView.java index a944901bf..607d93a61 100644 --- a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialTextsView.java +++ b/uhabits-android/src/main/java/com/android/datetimepicker/time/RadialTextsView.java @@ -16,16 +16,21 @@ package com.android.datetimepicker.time; -import android.animation.*; -import android.animation.ValueAnimator.*; -import android.content.*; -import android.content.res.*; -import android.graphics.*; -import android.graphics.Paint.*; -import android.util.*; -import android.view.*; - -import com.android.*; +import android.animation.Keyframe; +import android.animation.ObjectAnimator; +import android.animation.PropertyValuesHolder; +import android.animation.ValueAnimator; +import android.animation.ValueAnimator.AnimatorUpdateListener; +import android.content.Context; +import android.content.res.Resources; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.Paint.Align; +import android.graphics.Typeface; +import android.util.Log; +import android.view.View; + +import org.isoron.uhabits.R; /** * A view to show a series of numbers in a circular pattern. diff --git a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java b/uhabits-android/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java similarity index 97% rename from uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java rename to uhabits-android/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java index 0a8411bc5..93c4d3ba1 100644 --- a/uhabits-android/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java +++ b/uhabits-android/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java @@ -16,27 +16,38 @@ package com.android.datetimepicker.time; -import android.animation.*; -import android.annotation.*; -import android.app.ActionBar.*; -import android.app.*; -import android.content.*; -import android.content.res.*; -import android.os.*; - -import androidx.appcompat.app.*; - -import android.util.*; -import android.view.*; -import android.view.View.*; -import android.widget.*; - -import com.android.*; -import com.android.datetimepicker.*; -import com.android.datetimepicker.time.RadialPickerLayout.*; - -import java.text.*; -import java.util.*; +import android.animation.ObjectAnimator; +import android.annotation.SuppressLint; +import android.app.ActionBar.LayoutParams; +import android.app.Dialog; +import android.content.Context; +import android.content.DialogInterface; +import android.content.res.Resources; +import android.os.Bundle; +import android.util.Log; +import android.view.KeyCharacterMap; +import android.view.KeyEvent; +import android.view.LayoutInflater; +import android.view.View; +import android.view.View.OnClickListener; +import android.view.View.OnKeyListener; +import android.view.ViewGroup; +import android.view.Window; +import android.widget.RelativeLayout; +import android.widget.TextView; + +import androidx.appcompat.app.AppCompatDialog; +import androidx.appcompat.app.AppCompatDialogFragment; + +import com.android.datetimepicker.HapticFeedbackController; +import com.android.datetimepicker.Utils; +import com.android.datetimepicker.time.RadialPickerLayout.OnValueSelectedListener; + +import org.isoron.uhabits.R; + +import java.text.DateFormatSymbols; +import java.util.ArrayList; +import java.util.Locale; /** * Dialog to set a time. diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidCanvas.kt b/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidCanvas.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidCanvas.kt rename to uhabits-android/src/main/java/org/isoron/platform/gui/AndroidCanvas.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidDataView.kt b/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidDataView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidDataView.kt rename to uhabits-android/src/main/java/org/isoron/platform/gui/AndroidDataView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidImage.kt b/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidImage.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidImage.kt rename to uhabits-android/src/main/java/org/isoron/platform/gui/AndroidImage.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidTestView.kt b/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidTestView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidTestView.kt rename to uhabits-android/src/main/java/org/isoron/platform/gui/AndroidTestView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidView.kt b/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/platform/gui/AndroidView.kt rename to uhabits-android/src/main/java/org/isoron/platform/gui/AndroidView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/AndroidBugReporter.kt b/uhabits-android/src/main/java/org/isoron/uhabits/AndroidBugReporter.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/AndroidBugReporter.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/AndroidBugReporter.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/AndroidDirFinder.kt b/uhabits-android/src/main/java/org/isoron/uhabits/AndroidDirFinder.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/AndroidDirFinder.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/AndroidDirFinder.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/BaseExceptionHandler.kt b/uhabits-android/src/main/java/org/isoron/uhabits/BaseExceptionHandler.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/BaseExceptionHandler.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/BaseExceptionHandler.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.kt b/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsBackupAgent.kt b/uhabits-android/src/main/java/org/isoron/uhabits/HabitsBackupAgent.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsBackupAgent.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/HabitsBackupAgent.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsDatabaseOpener.kt b/uhabits-android/src/main/java/org/isoron/uhabits/HabitsDatabaseOpener.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsDatabaseOpener.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/HabitsDatabaseOpener.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsDirFinder.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsDirFinder.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsDirFinder.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/HabitsDirFinder.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutActivity.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.java rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmSyncKeyDialog.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmSyncKeyDialog.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmSyncKeyDialog.java rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmSyncKeyDialog.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/FrequencyPickerDialog.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/FrequencyPickerDialog.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/FrequencyPickerDialog.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/FrequencyPickerDialog.kt diff --git a/uhabits-android/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 similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HabitChart.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.java rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.java rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TargetChart.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TargetChart.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TargetChart.java rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TargetChart.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TaskProgressBar.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TaskProgressBar.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TaskProgressBar.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TaskProgressBar.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt diff --git a/uhabits-android/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 similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/HabitTypeDialog.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/HabitTypeDialog.kt diff --git a/uhabits-android/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 similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsModule.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt diff --git a/uhabits-android/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 similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsSelectionMenu.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ButtonPanelView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ButtonPanelView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ButtonPanelView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ButtonPanelView.kt diff --git a/uhabits-android/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 similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt diff --git a/uhabits-android/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 similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/EmptyListView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/EmptyListView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/EmptyListView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/EmptyListView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.java rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListController.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt diff --git a/uhabits-android/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 similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewHolder.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewHolder.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewHolder.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewHolder.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HintView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ShadowView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ShadowView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ShadowView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/ShadowView.kt diff --git a/uhabits-android/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 similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitMenu.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitMenu.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitMenu.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitMenu.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCardView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCardView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCardView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCardView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/NotesCardView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/NotesCardView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/NotesCardView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/NotesCardView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCardView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCardView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCardView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCardView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/TargetCardView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/TargetCardView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/TargetCardView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/TargetCardView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java diff --git a/uhabits-android/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 similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/activities/sync/SyncActivity.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/activities/sync/SyncActivity.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingController.kt b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingController.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingController.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingController.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.kt b/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/automation/FireSettingReceiver.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/automation/SettingUtils.kt b/uhabits-android/src/main/java/org/isoron/uhabits/automation/SettingUtils.kt similarity index 97% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/automation/SettingUtils.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/automation/SettingUtils.kt index 1148271dd..dbd41c2d0 100644 --- a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/automation/SettingUtils.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/automation/SettingUtils.kt @@ -1,18 +1,18 @@ -package org.isoron.uhabits.automation - -import android.content.Intent -import org.isoron.uhabits.core.models.Habit -import org.isoron.uhabits.core.models.HabitList - -object SettingUtils { - @JvmStatic - fun parseIntent(intent: Intent, allHabits: HabitList): Arguments? { - val bundle = intent.getBundleExtra(EXTRA_BUNDLE) ?: return null - val action = bundle.getInt("action") - if (action < 0 || action > 4) return null - val habit = allHabits.getById(bundle.getLong("habit")) ?: return null - return Arguments(action, habit) - } - - class Arguments(var action: Int, var habit: Habit) -} +package org.isoron.uhabits.automation + +import android.content.Intent +import org.isoron.uhabits.core.models.Habit +import org.isoron.uhabits.core.models.HabitList + +object SettingUtils { + @JvmStatic + fun parseIntent(intent: Intent, allHabits: HabitList): Arguments? { + val bundle = intent.getBundleExtra(EXTRA_BUNDLE) ?: return null + val action = bundle.getInt("action") + if (action < 0 || action > 4) return null + val habit = allHabits.getById(bundle.getLong("habit")) ?: return null + return Arguments(action, habit) + } + + class Arguments(var action: Int, var habit: Habit) +} diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidCursor.kt b/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidCursor.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidCursor.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidCursor.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabase.kt b/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabase.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabase.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabase.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabaseOpener.kt b/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabaseOpener.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabaseOpener.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabaseOpener.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/database/AutoBackup.kt b/uhabits-android/src/main/java/org/isoron/uhabits/database/AutoBackup.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/database/AutoBackup.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/database/AutoBackup.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContext.kt b/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContext.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContext.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContext.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContextModule.java b/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContextModule.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContextModule.java rename to uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityContextModule.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityScope.kt b/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityScope.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityScope.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/inject/ActivityScope.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContext.kt b/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContext.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContext.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContext.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContextModule.java b/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContextModule.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContextModule.java rename to uhabits-android/src/main/java/org/isoron/uhabits/inject/AppContextModule.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitModule.kt b/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitModule.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitModule.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitModule.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityComponent.kt b/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityComponent.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityComponent.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityComponent.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityModule.kt b/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityModule.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityModule.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsActivityModule.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsApplicationComponent.java b/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsApplicationComponent.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsApplicationComponent.java rename to uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsApplicationComponent.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsModule.kt b/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsModule.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsModule.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsModule.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt b/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.kt b/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentParser.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt b/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt b/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/io/AndroidLogging.kt b/uhabits-android/src/main/java/org/isoron/uhabits/io/AndroidLogging.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/io/AndroidLogging.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/io/AndroidLogging.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.kt b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/notifications/RingtoneManager.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.java b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.java rename to uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt b/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReceiverScope.java b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReceiverScope.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReceiverScope.java rename to uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReceiverScope.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java rename to uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.java b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.java rename to uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java rename to uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/sync/AndroidNetworkManager.kt b/uhabits-android/src/main/java/org/isoron/uhabits/sync/AndroidNetworkManager.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/sync/AndroidNetworkManager.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/sync/AndroidNetworkManager.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/sync/RemoteSyncServer.kt b/uhabits-android/src/main/java/org/isoron/uhabits/sync/RemoteSyncServer.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/sync/RemoteSyncServer.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/sync/RemoteSyncServer.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.java b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.java rename to uhabits-android/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java rename to uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTask.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTaskFactory.kt b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTaskFactory.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTaskFactory.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTaskFactory.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java rename to uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTaskFactory.kt b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTaskFactory.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTaskFactory.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTaskFactory.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/AttributeSetUtils.java b/uhabits-android/src/main/java/org/isoron/uhabits/utils/AttributeSetUtils.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/AttributeSetUtils.java rename to uhabits-android/src/main/java/org/isoron/uhabits/utils/AttributeSetUtils.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/ColorUtils.kt b/uhabits-android/src/main/java/org/isoron/uhabits/utils/ColorUtils.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/ColorUtils.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/utils/ColorUtils.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.java b/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.java rename to uhabits-android/src/main/java/org/isoron/uhabits/utils/DatabaseUtils.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/DateExtensions.kt b/uhabits-android/src/main/java/org/isoron/uhabits/utils/DateExtensions.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/DateExtensions.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/utils/DateExtensions.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/FileUtils.kt b/uhabits-android/src/main/java/org/isoron/uhabits/utils/FileUtils.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/FileUtils.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/utils/FileUtils.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/InterfaceUtils.kt b/uhabits-android/src/main/java/org/isoron/uhabits/utils/InterfaceUtils.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/InterfaceUtils.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/utils/InterfaceUtils.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt b/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/StyledResources.kt b/uhabits-android/src/main/java/org/isoron/uhabits/utils/StyledResources.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/StyledResources.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/utils/StyledResources.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/SystemUtils.java b/uhabits-android/src/main/java/org/isoron/uhabits/utils/SystemUtils.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/SystemUtils.java rename to uhabits-android/src/main/java/org/isoron/uhabits/utils/SystemUtils.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt b/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidget.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/EmptyWidget.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/EmptyWidget.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/EmptyWidget.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/EmptyWidget.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidgetProvider.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidget.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/ScoreWidgetProvider.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidget.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidget.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidget.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidget.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.java rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetService.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetType.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetType.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetType.java rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetType.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidget.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidget.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidget.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidget.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/StreakWidgetProvider.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidget.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidget.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidget.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidget.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidgetProvider.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidgetProvider.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidgetProvider.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/TargetWidgetProvider.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetDimensions.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetDimensions.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetDimensions.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetDimensions.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/WidgetUpdater.kt diff --git a/uhabits-android/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 similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/EmptyWidgetView.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/EmptyWidgetView.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/EmptyWidgetView.java rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/EmptyWidgetView.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/GraphWidgetView.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/GraphWidgetView.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/GraphWidgetView.java rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/GraphWidgetView.java diff --git a/uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java similarity index 100% rename from uhabits-android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java rename to uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/HabitWidgetView.java diff --git a/uhabits-android/uhabits-android/src/main/play/contact-email.txt b/uhabits-android/src/main/play/contact-email.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/contact-email.txt rename to uhabits-android/src/main/play/contact-email.txt diff --git a/uhabits-android/uhabits-android/src/main/play/contact-website.txt b/uhabits-android/src/main/play/contact-website.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/contact-website.txt rename to uhabits-android/src/main/play/contact-website.txt diff --git a/uhabits-android/uhabits-android/src/main/play/default-language.txt b/uhabits-android/src/main/play/default-language.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/default-language.txt rename to uhabits-android/src/main/play/default-language.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ar-rSA/full-description.txt b/uhabits-android/src/main/play/listings/ar-rSA/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ar-rSA/full-description.txt rename to uhabits-android/src/main/play/listings/ar-rSA/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ar-rSA/short-description.txt b/uhabits-android/src/main/play/listings/ar-rSA/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ar-rSA/short-description.txt rename to uhabits-android/src/main/play/listings/ar-rSA/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ar/full-description.txt b/uhabits-android/src/main/play/listings/ar/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ar/full-description.txt rename to uhabits-android/src/main/play/listings/ar/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ar/short-description.txt b/uhabits-android/src/main/play/listings/ar/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ar/short-description.txt rename to uhabits-android/src/main/play/listings/ar/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ar/title.txt b/uhabits-android/src/main/play/listings/ar/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ar/title.txt rename to uhabits-android/src/main/play/listings/ar/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ca-rES/full-description.txt b/uhabits-android/src/main/play/listings/ca-rES/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ca-rES/full-description.txt rename to uhabits-android/src/main/play/listings/ca-rES/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ca-rES/short-description.txt b/uhabits-android/src/main/play/listings/ca-rES/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ca-rES/short-description.txt rename to uhabits-android/src/main/play/listings/ca-rES/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ca/full-description.txt b/uhabits-android/src/main/play/listings/ca/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ca/full-description.txt rename to uhabits-android/src/main/play/listings/ca/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ca/short-description.txt b/uhabits-android/src/main/play/listings/ca/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ca/short-description.txt rename to uhabits-android/src/main/play/listings/ca/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ca/title.txt b/uhabits-android/src/main/play/listings/ca/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ca/title.txt rename to uhabits-android/src/main/play/listings/ca/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/cs-CZ/full-description.txt b/uhabits-android/src/main/play/listings/cs-CZ/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/cs-CZ/full-description.txt rename to uhabits-android/src/main/play/listings/cs-CZ/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/cs-CZ/short-description.txt b/uhabits-android/src/main/play/listings/cs-CZ/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/cs-CZ/short-description.txt rename to uhabits-android/src/main/play/listings/cs-CZ/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/cs-CZ/title.txt b/uhabits-android/src/main/play/listings/cs-CZ/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/cs-CZ/title.txt rename to uhabits-android/src/main/play/listings/cs-CZ/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/cs-rCZ/full-description.txt b/uhabits-android/src/main/play/listings/cs-rCZ/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/cs-rCZ/full-description.txt rename to uhabits-android/src/main/play/listings/cs-rCZ/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/cs-rCZ/short-description.txt b/uhabits-android/src/main/play/listings/cs-rCZ/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/cs-rCZ/short-description.txt rename to uhabits-android/src/main/play/listings/cs-rCZ/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/de-DE/full-description.txt b/uhabits-android/src/main/play/listings/de-DE/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/de-DE/full-description.txt rename to uhabits-android/src/main/play/listings/de-DE/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/de-DE/short-description.txt b/uhabits-android/src/main/play/listings/de-DE/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/de-DE/short-description.txt rename to uhabits-android/src/main/play/listings/de-DE/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/de-DE/title.txt b/uhabits-android/src/main/play/listings/de-DE/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/de-DE/title.txt rename to uhabits-android/src/main/play/listings/de-DE/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/de-rDE/full-description.txt b/uhabits-android/src/main/play/listings/de-rDE/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/de-rDE/full-description.txt rename to uhabits-android/src/main/play/listings/de-rDE/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/de-rDE/short-description.txt b/uhabits-android/src/main/play/listings/de-rDE/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/de-rDE/short-description.txt rename to uhabits-android/src/main/play/listings/de-rDE/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/en-US/full-description.txt b/uhabits-android/src/main/play/listings/en-US/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/en-US/full-description.txt rename to uhabits-android/src/main/play/listings/en-US/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/feature-graphic/1.png b/uhabits-android/src/main/play/listings/en-US/graphics/feature-graphic/1.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/feature-graphic/1.png rename to uhabits-android/src/main/play/listings/en-US/graphics/feature-graphic/1.png diff --git a/uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/icon/1.png b/uhabits-android/src/main/play/listings/en-US/graphics/icon/1.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/icon/1.png rename to uhabits-android/src/main/play/listings/en-US/graphics/icon/1.png diff --git a/uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/1.png b/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/1.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/1.png rename to uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/1.png diff --git a/uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/2.png b/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/2.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/2.png rename to uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/2.png diff --git a/uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/3.png b/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/3.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/3.png rename to uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/3.png diff --git a/uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/4.png b/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/4.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/4.png rename to uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/4.png diff --git a/uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/5.png b/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/5.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/5.png rename to uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/5.png diff --git a/uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/6.png b/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/6.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/6.png rename to uhabits-android/src/main/play/listings/en-US/graphics/phone-screenshots/6.png diff --git a/uhabits-android/uhabits-android/src/main/play/listings/en-US/short-description.txt b/uhabits-android/src/main/play/listings/en-US/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/en-US/short-description.txt rename to uhabits-android/src/main/play/listings/en-US/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/en-US/title.txt b/uhabits-android/src/main/play/listings/en-US/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/en-US/title.txt rename to uhabits-android/src/main/play/listings/en-US/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/eo-rUY/short-description.txt b/uhabits-android/src/main/play/listings/eo-rUY/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/eo-rUY/short-description.txt rename to uhabits-android/src/main/play/listings/eo-rUY/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/es-ES/full-description.txt b/uhabits-android/src/main/play/listings/es-ES/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/es-ES/full-description.txt rename to uhabits-android/src/main/play/listings/es-ES/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/es-ES/short-description.txt b/uhabits-android/src/main/play/listings/es-ES/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/es-ES/short-description.txt rename to uhabits-android/src/main/play/listings/es-ES/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/es-ES/title.txt b/uhabits-android/src/main/play/listings/es-ES/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/es-ES/title.txt rename to uhabits-android/src/main/play/listings/es-ES/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/es-rES/full-description.txt b/uhabits-android/src/main/play/listings/es-rES/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/es-rES/full-description.txt rename to uhabits-android/src/main/play/listings/es-rES/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/es-rES/short-description.txt b/uhabits-android/src/main/play/listings/es-rES/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/es-rES/short-description.txt rename to uhabits-android/src/main/play/listings/es-rES/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/eu-rES/full-description.txt b/uhabits-android/src/main/play/listings/eu-rES/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/eu-rES/full-description.txt rename to uhabits-android/src/main/play/listings/eu-rES/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/eu-rES/short-description.txt b/uhabits-android/src/main/play/listings/eu-rES/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/eu-rES/short-description.txt rename to uhabits-android/src/main/play/listings/eu-rES/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/fa-rIR/short-description.txt b/uhabits-android/src/main/play/listings/fa-rIR/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/fa-rIR/short-description.txt rename to uhabits-android/src/main/play/listings/fa-rIR/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/fr-FR/full-description.txt b/uhabits-android/src/main/play/listings/fr-FR/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/fr-FR/full-description.txt rename to uhabits-android/src/main/play/listings/fr-FR/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/fr-FR/short-description.txt b/uhabits-android/src/main/play/listings/fr-FR/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/fr-FR/short-description.txt rename to uhabits-android/src/main/play/listings/fr-FR/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/fr-FR/title.txt b/uhabits-android/src/main/play/listings/fr-FR/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/fr-FR/title.txt rename to uhabits-android/src/main/play/listings/fr-FR/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/fr-rFR/full-description.txt b/uhabits-android/src/main/play/listings/fr-rFR/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/fr-rFR/full-description.txt rename to uhabits-android/src/main/play/listings/fr-rFR/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/fr-rFR/short-description.txt b/uhabits-android/src/main/play/listings/fr-rFR/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/fr-rFR/short-description.txt rename to uhabits-android/src/main/play/listings/fr-rFR/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/hr/full-description.txt b/uhabits-android/src/main/play/listings/hr/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/hr/full-description.txt rename to uhabits-android/src/main/play/listings/hr/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/hr/short-description.txt b/uhabits-android/src/main/play/listings/hr/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/hr/short-description.txt rename to uhabits-android/src/main/play/listings/hr/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/hr/title.txt b/uhabits-android/src/main/play/listings/hr/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/hr/title.txt rename to uhabits-android/src/main/play/listings/hr/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/id/full-description.txt b/uhabits-android/src/main/play/listings/id/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/id/full-description.txt rename to uhabits-android/src/main/play/listings/id/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/id/short-description.txt b/uhabits-android/src/main/play/listings/id/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/id/short-description.txt rename to uhabits-android/src/main/play/listings/id/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/id/title.txt b/uhabits-android/src/main/play/listings/id/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/id/title.txt rename to uhabits-android/src/main/play/listings/id/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/in-rID/full-description.txt b/uhabits-android/src/main/play/listings/in-rID/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/in-rID/full-description.txt rename to uhabits-android/src/main/play/listings/in-rID/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/in-rID/short-description.txt b/uhabits-android/src/main/play/listings/in-rID/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/in-rID/short-description.txt rename to uhabits-android/src/main/play/listings/in-rID/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/it-IT/full-description.txt b/uhabits-android/src/main/play/listings/it-IT/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/it-IT/full-description.txt rename to uhabits-android/src/main/play/listings/it-IT/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/it-IT/short-description.txt b/uhabits-android/src/main/play/listings/it-IT/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/it-IT/short-description.txt rename to uhabits-android/src/main/play/listings/it-IT/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/it-IT/title.txt b/uhabits-android/src/main/play/listings/it-IT/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/it-IT/title.txt rename to uhabits-android/src/main/play/listings/it-IT/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/it-rIT/full-description.txt b/uhabits-android/src/main/play/listings/it-rIT/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/it-rIT/full-description.txt rename to uhabits-android/src/main/play/listings/it-rIT/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/it-rIT/short-description.txt b/uhabits-android/src/main/play/listings/it-rIT/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/it-rIT/short-description.txt rename to uhabits-android/src/main/play/listings/it-rIT/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ja-JP/full-description.txt b/uhabits-android/src/main/play/listings/ja-JP/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ja-JP/full-description.txt rename to uhabits-android/src/main/play/listings/ja-JP/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ja-JP/short-description.txt b/uhabits-android/src/main/play/listings/ja-JP/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ja-JP/short-description.txt rename to uhabits-android/src/main/play/listings/ja-JP/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ja-JP/title.txt b/uhabits-android/src/main/play/listings/ja-JP/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ja-JP/title.txt rename to uhabits-android/src/main/play/listings/ja-JP/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ja-rJP/short-description.txt b/uhabits-android/src/main/play/listings/ja-rJP/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ja-rJP/short-description.txt rename to uhabits-android/src/main/play/listings/ja-rJP/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ko-KR/full-description.txt b/uhabits-android/src/main/play/listings/ko-KR/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ko-KR/full-description.txt rename to uhabits-android/src/main/play/listings/ko-KR/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ko-KR/short-description.txt b/uhabits-android/src/main/play/listings/ko-KR/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ko-KR/short-description.txt rename to uhabits-android/src/main/play/listings/ko-KR/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ko-KR/title.txt b/uhabits-android/src/main/play/listings/ko-KR/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ko-KR/title.txt rename to uhabits-android/src/main/play/listings/ko-KR/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ko-rKR/short-description.txt b/uhabits-android/src/main/play/listings/ko-rKR/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ko-rKR/short-description.txt rename to uhabits-android/src/main/play/listings/ko-rKR/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/nl-rNL/full-description.txt b/uhabits-android/src/main/play/listings/nl-rNL/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/nl-rNL/full-description.txt rename to uhabits-android/src/main/play/listings/nl-rNL/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/nl-rNL/short-description.txt b/uhabits-android/src/main/play/listings/nl-rNL/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/nl-rNL/short-description.txt rename to uhabits-android/src/main/play/listings/nl-rNL/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/pl-PL/full-description.txt b/uhabits-android/src/main/play/listings/pl-PL/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/pl-PL/full-description.txt rename to uhabits-android/src/main/play/listings/pl-PL/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/pl-PL/short-description.txt b/uhabits-android/src/main/play/listings/pl-PL/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/pl-PL/short-description.txt rename to uhabits-android/src/main/play/listings/pl-PL/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/pl-PL/title.txt b/uhabits-android/src/main/play/listings/pl-PL/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/pl-PL/title.txt rename to uhabits-android/src/main/play/listings/pl-PL/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/pl-rPL/full-description.txt b/uhabits-android/src/main/play/listings/pl-rPL/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/pl-rPL/full-description.txt rename to uhabits-android/src/main/play/listings/pl-rPL/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/pl-rPL/short-description.txt b/uhabits-android/src/main/play/listings/pl-rPL/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/pl-rPL/short-description.txt rename to uhabits-android/src/main/play/listings/pl-rPL/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/pt-BR/full-description.txt b/uhabits-android/src/main/play/listings/pt-BR/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/pt-BR/full-description.txt rename to uhabits-android/src/main/play/listings/pt-BR/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/pt-BR/short-description.txt b/uhabits-android/src/main/play/listings/pt-BR/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/pt-BR/short-description.txt rename to uhabits-android/src/main/play/listings/pt-BR/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/pt-BR/title.txt b/uhabits-android/src/main/play/listings/pt-BR/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/pt-BR/title.txt rename to uhabits-android/src/main/play/listings/pt-BR/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/pt-rBR/full-description.txt b/uhabits-android/src/main/play/listings/pt-rBR/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/pt-rBR/full-description.txt rename to uhabits-android/src/main/play/listings/pt-rBR/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/pt-rBR/short-description.txt b/uhabits-android/src/main/play/listings/pt-rBR/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/pt-rBR/short-description.txt rename to uhabits-android/src/main/play/listings/pt-rBR/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/pt-rPT/full-description.txt b/uhabits-android/src/main/play/listings/pt-rPT/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/pt-rPT/full-description.txt rename to uhabits-android/src/main/play/listings/pt-rPT/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/pt-rPT/short-description.txt b/uhabits-android/src/main/play/listings/pt-rPT/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/pt-rPT/short-description.txt rename to uhabits-android/src/main/play/listings/pt-rPT/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ru-RU/full-description.txt b/uhabits-android/src/main/play/listings/ru-RU/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ru-RU/full-description.txt rename to uhabits-android/src/main/play/listings/ru-RU/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ru-RU/short-description.txt b/uhabits-android/src/main/play/listings/ru-RU/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ru-RU/short-description.txt rename to uhabits-android/src/main/play/listings/ru-RU/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ru-RU/title.txt b/uhabits-android/src/main/play/listings/ru-RU/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ru-RU/title.txt rename to uhabits-android/src/main/play/listings/ru-RU/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ru-rRU/full-description.txt b/uhabits-android/src/main/play/listings/ru-rRU/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ru-rRU/full-description.txt rename to uhabits-android/src/main/play/listings/ru-rRU/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/ru-rRU/short-description.txt b/uhabits-android/src/main/play/listings/ru-rRU/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/ru-rRU/short-description.txt rename to uhabits-android/src/main/play/listings/ru-rRU/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/sk-rSK/full-description.txt b/uhabits-android/src/main/play/listings/sk-rSK/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/sk-rSK/full-description.txt rename to uhabits-android/src/main/play/listings/sk-rSK/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/sk-rSK/short-description.txt b/uhabits-android/src/main/play/listings/sk-rSK/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/sk-rSK/short-description.txt rename to uhabits-android/src/main/play/listings/sk-rSK/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/sl/full-description.txt b/uhabits-android/src/main/play/listings/sl/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/sl/full-description.txt rename to uhabits-android/src/main/play/listings/sl/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/sl/short-description.txt b/uhabits-android/src/main/play/listings/sl/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/sl/short-description.txt rename to uhabits-android/src/main/play/listings/sl/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/sl/title.txt b/uhabits-android/src/main/play/listings/sl/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/sl/title.txt rename to uhabits-android/src/main/play/listings/sl/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/sr/full-description.txt b/uhabits-android/src/main/play/listings/sr/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/sr/full-description.txt rename to uhabits-android/src/main/play/listings/sr/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/sr/short-description.txt b/uhabits-android/src/main/play/listings/sr/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/sr/short-description.txt rename to uhabits-android/src/main/play/listings/sr/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/sr/title.txt b/uhabits-android/src/main/play/listings/sr/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/sr/title.txt rename to uhabits-android/src/main/play/listings/sr/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/sv-SE/full-description.txt b/uhabits-android/src/main/play/listings/sv-SE/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/sv-SE/full-description.txt rename to uhabits-android/src/main/play/listings/sv-SE/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/sv-SE/short-description.txt b/uhabits-android/src/main/play/listings/sv-SE/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/sv-SE/short-description.txt rename to uhabits-android/src/main/play/listings/sv-SE/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/sv-SE/title.txt b/uhabits-android/src/main/play/listings/sv-SE/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/sv-SE/title.txt rename to uhabits-android/src/main/play/listings/sv-SE/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/sv-rSE/full-description.txt b/uhabits-android/src/main/play/listings/sv-rSE/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/sv-rSE/full-description.txt rename to uhabits-android/src/main/play/listings/sv-rSE/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/sv-rSE/short-description.txt b/uhabits-android/src/main/play/listings/sv-rSE/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/sv-rSE/short-description.txt rename to uhabits-android/src/main/play/listings/sv-rSE/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/te-rIN/short-description.txt b/uhabits-android/src/main/play/listings/te-rIN/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/te-rIN/short-description.txt rename to uhabits-android/src/main/play/listings/te-rIN/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/tr-TR/full-description.txt b/uhabits-android/src/main/play/listings/tr-TR/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/tr-TR/full-description.txt rename to uhabits-android/src/main/play/listings/tr-TR/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/tr-TR/short-description.txt b/uhabits-android/src/main/play/listings/tr-TR/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/tr-TR/short-description.txt rename to uhabits-android/src/main/play/listings/tr-TR/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/tr-TR/title.txt b/uhabits-android/src/main/play/listings/tr-TR/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/tr-TR/title.txt rename to uhabits-android/src/main/play/listings/tr-TR/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/tr-rTR/full-description.txt b/uhabits-android/src/main/play/listings/tr-rTR/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/tr-rTR/full-description.txt rename to uhabits-android/src/main/play/listings/tr-rTR/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/tr-rTR/short-description.txt b/uhabits-android/src/main/play/listings/tr-rTR/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/tr-rTR/short-description.txt rename to uhabits-android/src/main/play/listings/tr-rTR/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/uk-rUA/full-description.txt b/uhabits-android/src/main/play/listings/uk-rUA/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/uk-rUA/full-description.txt rename to uhabits-android/src/main/play/listings/uk-rUA/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/uk-rUA/short-description.txt b/uhabits-android/src/main/play/listings/uk-rUA/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/uk-rUA/short-description.txt rename to uhabits-android/src/main/play/listings/uk-rUA/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/uk/full-description.txt b/uhabits-android/src/main/play/listings/uk/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/uk/full-description.txt rename to uhabits-android/src/main/play/listings/uk/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/uk/short-description.txt b/uhabits-android/src/main/play/listings/uk/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/uk/short-description.txt rename to uhabits-android/src/main/play/listings/uk/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/uk/title.txt b/uhabits-android/src/main/play/listings/uk/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/uk/title.txt rename to uhabits-android/src/main/play/listings/uk/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/vi-rVN/full-description.txt b/uhabits-android/src/main/play/listings/vi-rVN/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/vi-rVN/full-description.txt rename to uhabits-android/src/main/play/listings/vi-rVN/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/vi-rVN/short-description.txt b/uhabits-android/src/main/play/listings/vi-rVN/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/vi-rVN/short-description.txt rename to uhabits-android/src/main/play/listings/vi-rVN/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/zh-CN/full-description.txt b/uhabits-android/src/main/play/listings/zh-CN/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/zh-CN/full-description.txt rename to uhabits-android/src/main/play/listings/zh-CN/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/zh-CN/short-description.txt b/uhabits-android/src/main/play/listings/zh-CN/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/zh-CN/short-description.txt rename to uhabits-android/src/main/play/listings/zh-CN/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/zh-CN/title.txt b/uhabits-android/src/main/play/listings/zh-CN/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/zh-CN/title.txt rename to uhabits-android/src/main/play/listings/zh-CN/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/zh-TW/full-description.txt b/uhabits-android/src/main/play/listings/zh-TW/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/zh-TW/full-description.txt rename to uhabits-android/src/main/play/listings/zh-TW/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/zh-TW/short-description.txt b/uhabits-android/src/main/play/listings/zh-TW/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/zh-TW/short-description.txt rename to uhabits-android/src/main/play/listings/zh-TW/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/zh-TW/title.txt b/uhabits-android/src/main/play/listings/zh-TW/title.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/zh-TW/title.txt rename to uhabits-android/src/main/play/listings/zh-TW/title.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/zh-rCN/full-description.txt b/uhabits-android/src/main/play/listings/zh-rCN/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/zh-rCN/full-description.txt rename to uhabits-android/src/main/play/listings/zh-rCN/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/zh-rCN/short-description.txt b/uhabits-android/src/main/play/listings/zh-rCN/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/zh-rCN/short-description.txt rename to uhabits-android/src/main/play/listings/zh-rCN/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/zh-rTW/full-description.txt b/uhabits-android/src/main/play/listings/zh-rTW/full-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/zh-rTW/full-description.txt rename to uhabits-android/src/main/play/listings/zh-rTW/full-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/listings/zh-rTW/short-description.txt b/uhabits-android/src/main/play/listings/zh-rTW/short-description.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/listings/zh-rTW/short-description.txt rename to uhabits-android/src/main/play/listings/zh-rTW/short-description.txt diff --git a/uhabits-android/uhabits-android/src/main/play/release-notes/en-US/default.txt b/uhabits-android/src/main/play/release-notes/en-US/default.txt similarity index 100% rename from uhabits-android/uhabits-android/src/main/play/release-notes/en-US/default.txt rename to uhabits-android/src/main/play/release-notes/en-US/default.txt diff --git a/uhabits-android/uhabits-android/src/main/res/anim/fade_in.xml b/uhabits-android/src/main/res/anim/fade_in.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/anim/fade_in.xml rename to uhabits-android/src/main/res/anim/fade_in.xml diff --git a/uhabits-android/uhabits-android/src/main/res/anim/fade_out.xml b/uhabits-android/src/main/res/anim/fade_out.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/anim/fade_out.xml rename to uhabits-android/src/main/res/anim/fade_out.xml diff --git a/uhabits-android/android-pickers/src/main/res/color/date_picker_selector.xml b/uhabits-android/src/main/res/color/date_picker_selector.xml similarity index 100% rename from uhabits-android/android-pickers/src/main/res/color/date_picker_selector.xml rename to uhabits-android/src/main/res/color/date_picker_selector.xml diff --git a/uhabits-android/android-pickers/src/main/res/color/date_picker_year_selector.xml b/uhabits-android/src/main/res/color/date_picker_year_selector.xml similarity index 100% rename from uhabits-android/android-pickers/src/main/res/color/date_picker_year_selector.xml rename to uhabits-android/src/main/res/color/date_picker_year_selector.xml diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_add_dark.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_add_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_add_dark.png rename to uhabits-android/src/main/res/drawable-hdpi/ic_action_add_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_archive_dark.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_archive_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_archive_dark.png rename to uhabits-android/src/main/res/drawable-hdpi/ic_action_archive_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_cancel.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_cancel.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_cancel.png rename to uhabits-android/src/main/res/drawable-hdpi/ic_action_cancel.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_check.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_check.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_check.png rename to uhabits-android/src/main/res/drawable-hdpi/ic_action_check.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_dark.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_dark.png rename to uhabits-android/src/main/res/drawable-hdpi/ic_action_color_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_light.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_light.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_color_light.png rename to uhabits-android/src/main/res/drawable-hdpi/ic_action_color_light.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_download_dark.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_download_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_download_dark.png rename to uhabits-android/src/main/res/drawable-hdpi/ic_action_download_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_dark.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_dark.png rename to uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_light.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_light.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_light.png rename to uhabits-android/src/main/res/drawable-hdpi/ic_action_edit_light.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_filter_dark.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_filter_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_filter_dark.png rename to uhabits-android/src/main/res/drawable-hdpi/ic_action_filter_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_snooze.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_snooze.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_snooze.png rename to uhabits-android/src/main/res/drawable-hdpi/ic_action_snooze.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_unarchive_dark.png b/uhabits-android/src/main/res/drawable-hdpi/ic_action_unarchive_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_action_unarchive_dark.png rename to uhabits-android/src/main/res/drawable-hdpi/ic_action_unarchive_dark.png diff --git a/uhabits-android/android-pickers/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png b/uhabits-android/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png similarity index 100% rename from uhabits-android/android-pickers/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png rename to uhabits-android/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_notification.png b/uhabits-android/src/main/res/drawable-hdpi/ic_notification.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_notification.png rename to uhabits-android/src/main/res/drawable-hdpi/ic_notification.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_add_dark.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_add_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_add_dark.png rename to uhabits-android/src/main/res/drawable-mdpi/ic_action_add_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_archive_dark.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_archive_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_archive_dark.png rename to uhabits-android/src/main/res/drawable-mdpi/ic_action_archive_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_cancel.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_cancel.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_cancel.png rename to uhabits-android/src/main/res/drawable-mdpi/ic_action_cancel.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_check.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_check.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_check.png rename to uhabits-android/src/main/res/drawable-mdpi/ic_action_check.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_dark.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_dark.png rename to uhabits-android/src/main/res/drawable-mdpi/ic_action_color_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_light.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_light.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_color_light.png rename to uhabits-android/src/main/res/drawable-mdpi/ic_action_color_light.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_download_dark.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_download_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_download_dark.png rename to uhabits-android/src/main/res/drawable-mdpi/ic_action_download_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_dark.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_dark.png rename to uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_light.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_light.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_light.png rename to uhabits-android/src/main/res/drawable-mdpi/ic_action_edit_light.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_filter_dark.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_filter_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_filter_dark.png rename to uhabits-android/src/main/res/drawable-mdpi/ic_action_filter_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_snooze.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_snooze.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_snooze.png rename to uhabits-android/src/main/res/drawable-mdpi/ic_action_snooze.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_unarchive_dark.png b/uhabits-android/src/main/res/drawable-mdpi/ic_action_unarchive_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_action_unarchive_dark.png rename to uhabits-android/src/main/res/drawable-mdpi/ic_action_unarchive_dark.png diff --git a/uhabits-android/android-pickers/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png b/uhabits-android/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png similarity index 100% rename from uhabits-android/android-pickers/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png rename to uhabits-android/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_notification.png b/uhabits-android/src/main/res/drawable-mdpi/ic_notification.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_notification.png rename to uhabits-android/src/main/res/drawable-mdpi/ic_notification.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_checkmark.png b/uhabits-android/src/main/res/drawable-nodpi/widget_preview_checkmark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_checkmark.png rename to uhabits-android/src/main/res/drawable-nodpi/widget_preview_checkmark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_frequency.png b/uhabits-android/src/main/res/drawable-nodpi/widget_preview_frequency.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_frequency.png rename to uhabits-android/src/main/res/drawable-nodpi/widget_preview_frequency.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_history.png b/uhabits-android/src/main/res/drawable-nodpi/widget_preview_history.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_history.png rename to uhabits-android/src/main/res/drawable-nodpi/widget_preview_history.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_score.png b/uhabits-android/src/main/res/drawable-nodpi/widget_preview_score.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_score.png rename to uhabits-android/src/main/res/drawable-nodpi/widget_preview_score.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_streaks.png b/uhabits-android/src/main/res/drawable-nodpi/widget_preview_streaks.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_streaks.png rename to uhabits-android/src/main/res/drawable-nodpi/widget_preview_streaks.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_target.png b/uhabits-android/src/main/res/drawable-nodpi/widget_preview_target.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-nodpi/widget_preview_target.png rename to uhabits-android/src/main/res/drawable-nodpi/widget_preview_target.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-v21/ripple.xml b/uhabits-android/src/main/res/drawable-v21/ripple.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-v21/ripple.xml rename to uhabits-android/src/main/res/drawable-v21/ripple.xml diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-v21/ripple_transparent.xml b/uhabits-android/src/main/res/drawable-v21/ripple_transparent.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-v21/ripple_transparent.xml rename to uhabits-android/src/main/res/drawable-v21/ripple_transparent.xml diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-v21/selected_box.xml b/uhabits-android/src/main/res/drawable-v21/selected_box.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-v21/selected_box.xml rename to uhabits-android/src/main/res/drawable-v21/selected_box.xml diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-v21/widget_button_background.xml b/uhabits-android/src/main/res/drawable-v21/widget_button_background.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-v21/widget_button_background.xml rename to uhabits-android/src/main/res/drawable-v21/widget_button_background.xml diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_add_dark.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_add_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_add_dark.png rename to uhabits-android/src/main/res/drawable-xhdpi/ic_action_add_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_archive_dark.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_archive_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_archive_dark.png rename to uhabits-android/src/main/res/drawable-xhdpi/ic_action_archive_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_cancel.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_cancel.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_cancel.png rename to uhabits-android/src/main/res/drawable-xhdpi/ic_action_cancel.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_check.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_check.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_check.png rename to uhabits-android/src/main/res/drawable-xhdpi/ic_action_check.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_dark.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_dark.png rename to uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_light.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_light.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_light.png rename to uhabits-android/src/main/res/drawable-xhdpi/ic_action_color_light.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_download_dark.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_download_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_download_dark.png rename to uhabits-android/src/main/res/drawable-xhdpi/ic_action_download_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_dark.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_dark.png rename to uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_light.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_light.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_light.png rename to uhabits-android/src/main/res/drawable-xhdpi/ic_action_edit_light.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_filter_dark.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_filter_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_filter_dark.png rename to uhabits-android/src/main/res/drawable-xhdpi/ic_action_filter_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_snooze.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_snooze.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_snooze.png rename to uhabits-android/src/main/res/drawable-xhdpi/ic_action_snooze.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_unarchive_dark.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_action_unarchive_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_action_unarchive_dark.png rename to uhabits-android/src/main/res/drawable-xhdpi/ic_action_unarchive_dark.png diff --git a/uhabits-android/android-pickers/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png similarity index 100% rename from uhabits-android/android-pickers/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png rename to uhabits-android/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_notification.png b/uhabits-android/src/main/res/drawable-xhdpi/ic_notification.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_notification.png rename to uhabits-android/src/main/res/drawable-xhdpi/ic_notification.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_add_dark.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_add_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_add_dark.png rename to uhabits-android/src/main/res/drawable-xxhdpi/ic_action_add_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_archive_dark.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_archive_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_archive_dark.png rename to uhabits-android/src/main/res/drawable-xxhdpi/ic_action_archive_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_cancel.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_cancel.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_cancel.png rename to uhabits-android/src/main/res/drawable-xxhdpi/ic_action_cancel.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_check.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_check.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_check.png rename to uhabits-android/src/main/res/drawable-xxhdpi/ic_action_check.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_dark.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_dark.png rename to uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_light.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_light.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_light.png rename to uhabits-android/src/main/res/drawable-xxhdpi/ic_action_color_light.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_download_dark.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_download_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_download_dark.png rename to uhabits-android/src/main/res/drawable-xxhdpi/ic_action_download_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png rename to uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_light.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_light.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_light.png rename to uhabits-android/src/main/res/drawable-xxhdpi/ic_action_edit_light.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_filter_dark.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_filter_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_filter_dark.png rename to uhabits-android/src/main/res/drawable-xxhdpi/ic_action_filter_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_snooze.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_snooze.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_snooze.png rename to uhabits-android/src/main/res/drawable-xxhdpi/ic_action_snooze.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_unarchive_dark.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_unarchive_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_action_unarchive_dark.png rename to uhabits-android/src/main/res/drawable-xxhdpi/ic_action_unarchive_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_notification.png b/uhabits-android/src/main/res/drawable-xxhdpi/ic_notification.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xxhdpi/ic_notification.png rename to uhabits-android/src/main/res/drawable-xxhdpi/ic_notification.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_filter_dark.png b/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_filter_dark.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_filter_dark.png rename to uhabits-android/src/main/res/drawable-xxxhdpi/ic_action_filter_dark.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable/bg_input_box.xml b/uhabits-android/src/main/res/drawable/bg_input_box.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable/bg_input_box.xml rename to uhabits-android/src/main/res/drawable/bg_input_box.xml diff --git a/uhabits-android/uhabits-android/src/main/res/drawable/bg_input_group.xml b/uhabits-android/src/main/res/drawable/bg_input_group.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable/bg_input_group.xml rename to uhabits-android/src/main/res/drawable/bg_input_group.xml diff --git a/uhabits-android/uhabits-android/src/main/res/drawable/card_amoled_background.xml b/uhabits-android/src/main/res/drawable/card_amoled_background.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable/card_amoled_background.xml rename to uhabits-android/src/main/res/drawable/card_amoled_background.xml diff --git a/uhabits-android/uhabits-android/src/main/res/drawable/card_dark_background.xml b/uhabits-android/src/main/res/drawable/card_dark_background.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable/card_dark_background.xml rename to uhabits-android/src/main/res/drawable/card_dark_background.xml diff --git a/uhabits-android/uhabits-android/src/main/res/drawable/card_light_background.xml b/uhabits-android/src/main/res/drawable/card_light_background.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable/card_light_background.xml rename to uhabits-android/src/main/res/drawable/card_light_background.xml diff --git a/uhabits-android/android-pickers/src/main/res/drawable/color_picker_swatch.xml b/uhabits-android/src/main/res/drawable/color_picker_swatch.xml similarity index 100% rename from uhabits-android/android-pickers/src/main/res/drawable/color_picker_swatch.xml rename to uhabits-android/src/main/res/drawable/color_picker_swatch.xml diff --git a/uhabits-android/android-pickers/src/main/res/drawable/done_background_color.xml b/uhabits-android/src/main/res/drawable/done_background_color.xml similarity index 100% rename from uhabits-android/android-pickers/src/main/res/drawable/done_background_color.xml rename to uhabits-android/src/main/res/drawable/done_background_color.xml diff --git a/uhabits-android/android-pickers/src/main/res/drawable/done_background_color_dark.xml b/uhabits-android/src/main/res/drawable/done_background_color_dark.xml similarity index 100% rename from uhabits-android/android-pickers/src/main/res/drawable/done_background_color_dark.xml rename to uhabits-android/src/main/res/drawable/done_background_color_dark.xml diff --git a/uhabits-android/uhabits-android/src/main/res/drawable/ic_arrow_drop_down_dark.xml b/uhabits-android/src/main/res/drawable/ic_arrow_drop_down_dark.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable/ic_arrow_drop_down_dark.xml rename to uhabits-android/src/main/res/drawable/ic_arrow_drop_down_dark.xml diff --git a/uhabits-android/uhabits-android/src/main/res/drawable/intro_icon_1.png b/uhabits-android/src/main/res/drawable/intro_icon_1.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable/intro_icon_1.png rename to uhabits-android/src/main/res/drawable/intro_icon_1.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable/intro_icon_2.png b/uhabits-android/src/main/res/drawable/intro_icon_2.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable/intro_icon_2.png rename to uhabits-android/src/main/res/drawable/intro_icon_2.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable/intro_icon_4.png b/uhabits-android/src/main/res/drawable/intro_icon_4.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable/intro_icon_4.png rename to uhabits-android/src/main/res/drawable/intro_icon_4.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable/round_ripple.xml b/uhabits-android/src/main/res/drawable/round_ripple.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable/round_ripple.xml rename to uhabits-android/src/main/res/drawable/round_ripple.xml diff --git a/uhabits-android/uhabits-android/src/main/res/drawable/selected_box_amoled.xml b/uhabits-android/src/main/res/drawable/selected_box_amoled.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable/selected_box_amoled.xml rename to uhabits-android/src/main/res/drawable/selected_box_amoled.xml diff --git a/uhabits-android/uhabits-android/src/main/res/drawable/selected_box_dark.xml b/uhabits-android/src/main/res/drawable/selected_box_dark.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable/selected_box_dark.xml rename to uhabits-android/src/main/res/drawable/selected_box_dark.xml diff --git a/uhabits-android/uhabits-android/src/main/res/drawable/selected_box_light.xml b/uhabits-android/src/main/res/drawable/selected_box_light.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable/selected_box_light.xml rename to uhabits-android/src/main/res/drawable/selected_box_light.xml diff --git a/uhabits-android/uhabits-android/src/main/res/drawable/shadow.xml b/uhabits-android/src/main/res/drawable/shadow.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable/shadow.xml rename to uhabits-android/src/main/res/drawable/shadow.xml diff --git a/uhabits-android/uhabits-android/src/main/res/drawable/stripe.png b/uhabits-android/src/main/res/drawable/stripe.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable/stripe.png rename to uhabits-android/src/main/res/drawable/stripe.png diff --git a/uhabits-android/uhabits-android/src/main/res/drawable/widget_background.xml b/uhabits-android/src/main/res/drawable/widget_background.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable/widget_background.xml rename to uhabits-android/src/main/res/drawable/widget_background.xml diff --git a/uhabits-android/uhabits-android/src/main/res/drawable/widget_button_background.xml b/uhabits-android/src/main/res/drawable/widget_button_background.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/drawable/widget_button_background.xml rename to uhabits-android/src/main/res/drawable/widget_button_background.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/about.xml b/uhabits-android/src/main/res/layout/about.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/about.xml rename to uhabits-android/src/main/res/layout/about.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/activity_edit_habit.xml b/uhabits-android/src/main/res/layout/activity_edit_habit.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/activity_edit_habit.xml rename to uhabits-android/src/main/res/layout/activity_edit_habit.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/activity_sync.xml b/uhabits-android/src/main/res/layout/activity_sync.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/activity_sync.xml rename to uhabits-android/src/main/res/layout/activity_sync.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/automation.xml b/uhabits-android/src/main/res/layout/automation.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/automation.xml rename to uhabits-android/src/main/res/layout/automation.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/canvas_test.xml b/uhabits-android/src/main/res/layout/canvas_test.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/canvas_test.xml rename to uhabits-android/src/main/res/layout/canvas_test.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/checkmark_stackview_widget.xml b/uhabits-android/src/main/res/layout/checkmark_stackview_widget.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/checkmark_stackview_widget.xml rename to uhabits-android/src/main/res/layout/checkmark_stackview_widget.xml diff --git a/uhabits-android/android-pickers/src/main/res/layout/color_picker_dialog.xml b/uhabits-android/src/main/res/layout/color_picker_dialog.xml similarity index 100% rename from uhabits-android/android-pickers/src/main/res/layout/color_picker_dialog.xml rename to uhabits-android/src/main/res/layout/color_picker_dialog.xml diff --git a/uhabits-android/android-pickers/src/main/res/layout/color_picker_swatch.xml b/uhabits-android/src/main/res/layout/color_picker_swatch.xml similarity index 100% rename from uhabits-android/android-pickers/src/main/res/layout/color_picker_swatch.xml rename to uhabits-android/src/main/res/layout/color_picker_swatch.xml diff --git a/uhabits-android/android-pickers/src/main/res/layout/date_picker_dialog.xml b/uhabits-android/src/main/res/layout/date_picker_dialog.xml similarity index 100% rename from uhabits-android/android-pickers/src/main/res/layout/date_picker_dialog.xml rename to uhabits-android/src/main/res/layout/date_picker_dialog.xml diff --git a/uhabits-android/android-pickers/src/main/res/layout/date_picker_done_button.xml b/uhabits-android/src/main/res/layout/date_picker_done_button.xml similarity index 100% rename from uhabits-android/android-pickers/src/main/res/layout/date_picker_done_button.xml rename to uhabits-android/src/main/res/layout/date_picker_done_button.xml diff --git a/uhabits-android/android-pickers/src/main/res/layout/date_picker_header_view.xml b/uhabits-android/src/main/res/layout/date_picker_header_view.xml similarity index 100% rename from uhabits-android/android-pickers/src/main/res/layout/date_picker_header_view.xml rename to uhabits-android/src/main/res/layout/date_picker_header_view.xml diff --git a/uhabits-android/android-pickers/src/main/res/layout/date_picker_selected_date.xml b/uhabits-android/src/main/res/layout/date_picker_selected_date.xml similarity index 100% rename from uhabits-android/android-pickers/src/main/res/layout/date_picker_selected_date.xml rename to uhabits-android/src/main/res/layout/date_picker_selected_date.xml diff --git a/uhabits-android/android-pickers/src/main/res/layout/date_picker_view_animator.xml b/uhabits-android/src/main/res/layout/date_picker_view_animator.xml similarity index 100% rename from uhabits-android/android-pickers/src/main/res/layout/date_picker_view_animator.xml rename to uhabits-android/src/main/res/layout/date_picker_view_animator.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/frequency_picker_dialog.xml b/uhabits-android/src/main/res/layout/frequency_picker_dialog.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/frequency_picker_dialog.xml rename to uhabits-android/src/main/res/layout/frequency_picker_dialog.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/frequency_stackview_widget.xml b/uhabits-android/src/main/res/layout/frequency_stackview_widget.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/frequency_stackview_widget.xml rename to uhabits-android/src/main/res/layout/frequency_stackview_widget.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/history_stackview_widget.xml b/uhabits-android/src/main/res/layout/history_stackview_widget.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/history_stackview_widget.xml rename to uhabits-android/src/main/res/layout/history_stackview_widget.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/number_picker_dialog.xml b/uhabits-android/src/main/res/layout/number_picker_dialog.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/number_picker_dialog.xml rename to uhabits-android/src/main/res/layout/number_picker_dialog.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/preference_category_custom.xml b/uhabits-android/src/main/res/layout/preference_category_custom.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/preference_category_custom.xml rename to uhabits-android/src/main/res/layout/preference_category_custom.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/score_stackview_widget.xml b/uhabits-android/src/main/res/layout/score_stackview_widget.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/score_stackview_widget.xml rename to uhabits-android/src/main/res/layout/score_stackview_widget.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/select_habit_type.xml b/uhabits-android/src/main/res/layout/select_habit_type.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/select_habit_type.xml rename to uhabits-android/src/main/res/layout/select_habit_type.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/settings_activity.xml b/uhabits-android/src/main/res/layout/settings_activity.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/settings_activity.xml rename to uhabits-android/src/main/res/layout/settings_activity.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/show_habit.xml b/uhabits-android/src/main/res/layout/show_habit.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/show_habit.xml rename to uhabits-android/src/main/res/layout/show_habit.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/show_habit_bar.xml b/uhabits-android/src/main/res/layout/show_habit_bar.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/show_habit_bar.xml rename to uhabits-android/src/main/res/layout/show_habit_bar.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/show_habit_frequency.xml b/uhabits-android/src/main/res/layout/show_habit_frequency.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/show_habit_frequency.xml rename to uhabits-android/src/main/res/layout/show_habit_frequency.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/show_habit_history.xml b/uhabits-android/src/main/res/layout/show_habit_history.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/show_habit_history.xml rename to uhabits-android/src/main/res/layout/show_habit_history.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/show_habit_notes.xml b/uhabits-android/src/main/res/layout/show_habit_notes.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/show_habit_notes.xml rename to uhabits-android/src/main/res/layout/show_habit_notes.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/show_habit_overview.xml b/uhabits-android/src/main/res/layout/show_habit_overview.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/show_habit_overview.xml rename to uhabits-android/src/main/res/layout/show_habit_overview.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/show_habit_score.xml b/uhabits-android/src/main/res/layout/show_habit_score.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/show_habit_score.xml rename to uhabits-android/src/main/res/layout/show_habit_score.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/show_habit_streak.xml b/uhabits-android/src/main/res/layout/show_habit_streak.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/show_habit_streak.xml rename to uhabits-android/src/main/res/layout/show_habit_streak.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/show_habit_subtitle.xml b/uhabits-android/src/main/res/layout/show_habit_subtitle.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/show_habit_subtitle.xml rename to uhabits-android/src/main/res/layout/show_habit_subtitle.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/show_habit_target.xml b/uhabits-android/src/main/res/layout/show_habit_target.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/show_habit_target.xml rename to uhabits-android/src/main/res/layout/show_habit_target.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/streak_stackview_widget.xml b/uhabits-android/src/main/res/layout/streak_stackview_widget.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/streak_stackview_widget.xml rename to uhabits-android/src/main/res/layout/streak_stackview_widget.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/target_stackview_widget.xml b/uhabits-android/src/main/res/layout/target_stackview_widget.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/target_stackview_widget.xml rename to uhabits-android/src/main/res/layout/target_stackview_widget.xml diff --git a/uhabits-android/android-pickers/src/main/res/layout/time_header_label.xml b/uhabits-android/src/main/res/layout/time_header_label.xml similarity index 100% rename from uhabits-android/android-pickers/src/main/res/layout/time_header_label.xml rename to uhabits-android/src/main/res/layout/time_header_label.xml diff --git a/uhabits-android/android-pickers/src/main/res/layout/time_picker_dialog.xml b/uhabits-android/src/main/res/layout/time_picker_dialog.xml similarity index 100% rename from uhabits-android/android-pickers/src/main/res/layout/time_picker_dialog.xml rename to uhabits-android/src/main/res/layout/time_picker_dialog.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/toolbar.xml b/uhabits-android/src/main/res/layout/toolbar.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/toolbar.xml rename to uhabits-android/src/main/res/layout/toolbar.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/widget_checkmark.xml b/uhabits-android/src/main/res/layout/widget_checkmark.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/widget_checkmark.xml rename to uhabits-android/src/main/res/layout/widget_checkmark.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/widget_configure_activity.xml b/uhabits-android/src/main/res/layout/widget_configure_activity.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/widget_configure_activity.xml rename to uhabits-android/src/main/res/layout/widget_configure_activity.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/widget_empty_activity.xml b/uhabits-android/src/main/res/layout/widget_empty_activity.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/widget_empty_activity.xml rename to uhabits-android/src/main/res/layout/widget_empty_activity.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/widget_error.xml b/uhabits-android/src/main/res/layout/widget_error.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/widget_error.xml rename to uhabits-android/src/main/res/layout/widget_error.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/widget_graph.xml b/uhabits-android/src/main/res/layout/widget_graph.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/widget_graph.xml rename to uhabits-android/src/main/res/layout/widget_graph.xml diff --git a/uhabits-android/uhabits-android/src/main/res/layout/widget_wrapper.xml b/uhabits-android/src/main/res/layout/widget_wrapper.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/layout/widget_wrapper.xml rename to uhabits-android/src/main/res/layout/widget_wrapper.xml diff --git a/uhabits-android/android-pickers/src/main/res/layout/year_label_text_view.xml b/uhabits-android/src/main/res/layout/year_label_text_view.xml similarity index 100% rename from uhabits-android/android-pickers/src/main/res/layout/year_label_text_view.xml rename to uhabits-android/src/main/res/layout/year_label_text_view.xml diff --git a/uhabits-android/uhabits-android/src/main/res/menu/list_habits.xml b/uhabits-android/src/main/res/menu/list_habits.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/menu/list_habits.xml rename to uhabits-android/src/main/res/menu/list_habits.xml diff --git a/uhabits-android/uhabits-android/src/main/res/menu/list_habits_selection.xml b/uhabits-android/src/main/res/menu/list_habits_selection.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/menu/list_habits_selection.xml rename to uhabits-android/src/main/res/menu/list_habits_selection.xml diff --git a/uhabits-android/uhabits-android/src/main/res/menu/show_habit.xml b/uhabits-android/src/main/res/menu/show_habit.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/menu/show_habit.xml rename to uhabits-android/src/main/res/menu/show_habit.xml diff --git a/uhabits-android/uhabits-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/uhabits-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to uhabits-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/uhabits-android/uhabits-android/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/uhabits-android/src/main/res/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/mipmap-hdpi/ic_launcher_foreground.png rename to uhabits-android/src/main/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/uhabits-android/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher.png b/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher.png rename to uhabits-android/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/uhabits-android/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/mipmap-mdpi/ic_launcher_foreground.png rename to uhabits-android/src/main/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/uhabits-android/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher.png b/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher.png rename to uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/uhabits-android/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png rename to uhabits-android/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/uhabits-android/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher.png b/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/uhabits-android/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png rename to uhabits-android/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/uhabits-android/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/uhabits-android/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png rename to uhabits-android/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/uhabits-android/uhabits-android/src/main/res/values-af-rZA/strings.xml b/uhabits-android/src/main/res/values-af-rZA/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-af-rZA/strings.xml rename to uhabits-android/src/main/res/values-af-rZA/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-ar-rSA/strings.xml b/uhabits-android/src/main/res/values-ar-rSA/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-ar-rSA/strings.xml rename to uhabits-android/src/main/res/values-ar-rSA/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-bg-rBG/strings.xml b/uhabits-android/src/main/res/values-bg-rBG/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-bg-rBG/strings.xml rename to uhabits-android/src/main/res/values-bg-rBG/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-ca-rES/strings.xml b/uhabits-android/src/main/res/values-ca-rES/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-ca-rES/strings.xml rename to uhabits-android/src/main/res/values-ca-rES/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-cs-rCZ/strings.xml b/uhabits-android/src/main/res/values-cs-rCZ/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-cs-rCZ/strings.xml rename to uhabits-android/src/main/res/values-cs-rCZ/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-da-rDK/strings.xml b/uhabits-android/src/main/res/values-da-rDK/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-da-rDK/strings.xml rename to uhabits-android/src/main/res/values-da-rDK/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-de-rDE/strings.xml b/uhabits-android/src/main/res/values-de-rDE/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-de-rDE/strings.xml rename to uhabits-android/src/main/res/values-de-rDE/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-el-rGR/strings.xml b/uhabits-android/src/main/res/values-el-rGR/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-el-rGR/strings.xml rename to uhabits-android/src/main/res/values-el-rGR/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-eo-rUY/strings.xml b/uhabits-android/src/main/res/values-eo-rUY/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-eo-rUY/strings.xml rename to uhabits-android/src/main/res/values-eo-rUY/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-es-rES/strings.xml b/uhabits-android/src/main/res/values-es-rES/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-es-rES/strings.xml rename to uhabits-android/src/main/res/values-es-rES/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-eu-rES/strings.xml b/uhabits-android/src/main/res/values-eu-rES/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-eu-rES/strings.xml rename to uhabits-android/src/main/res/values-eu-rES/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-fa-rIR/strings.xml b/uhabits-android/src/main/res/values-fa-rIR/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-fa-rIR/strings.xml rename to uhabits-android/src/main/res/values-fa-rIR/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-fi-rFI/strings.xml b/uhabits-android/src/main/res/values-fi-rFI/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-fi-rFI/strings.xml rename to uhabits-android/src/main/res/values-fi-rFI/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-fr-rFR/strings.xml b/uhabits-android/src/main/res/values-fr-rFR/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-fr-rFR/strings.xml rename to uhabits-android/src/main/res/values-fr-rFR/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-hi-rIN/strings.xml b/uhabits-android/src/main/res/values-hi-rIN/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-hi-rIN/strings.xml rename to uhabits-android/src/main/res/values-hi-rIN/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-hr-rHR/strings.xml b/uhabits-android/src/main/res/values-hr-rHR/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-hr-rHR/strings.xml rename to uhabits-android/src/main/res/values-hr-rHR/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-hu-rHU/strings.xml b/uhabits-android/src/main/res/values-hu-rHU/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-hu-rHU/strings.xml rename to uhabits-android/src/main/res/values-hu-rHU/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-in-rID/strings.xml b/uhabits-android/src/main/res/values-in-rID/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-in-rID/strings.xml rename to uhabits-android/src/main/res/values-in-rID/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-it-rIT/strings.xml b/uhabits-android/src/main/res/values-it-rIT/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-it-rIT/strings.xml rename to uhabits-android/src/main/res/values-it-rIT/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-iw-rIL/strings.xml b/uhabits-android/src/main/res/values-iw-rIL/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-iw-rIL/strings.xml rename to uhabits-android/src/main/res/values-iw-rIL/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-ja-rJP/strings.xml b/uhabits-android/src/main/res/values-ja-rJP/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-ja-rJP/strings.xml rename to uhabits-android/src/main/res/values-ja-rJP/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-ko-rKR/strings.xml b/uhabits-android/src/main/res/values-ko-rKR/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-ko-rKR/strings.xml rename to uhabits-android/src/main/res/values-ko-rKR/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-nl-rNL/strings.xml b/uhabits-android/src/main/res/values-nl-rNL/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-nl-rNL/strings.xml rename to uhabits-android/src/main/res/values-nl-rNL/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-no-rNO/strings.xml b/uhabits-android/src/main/res/values-no-rNO/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-no-rNO/strings.xml rename to uhabits-android/src/main/res/values-no-rNO/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-pl-rPL/strings.xml b/uhabits-android/src/main/res/values-pl-rPL/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-pl-rPL/strings.xml rename to uhabits-android/src/main/res/values-pl-rPL/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-pt-rBR/strings.xml b/uhabits-android/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-pt-rBR/strings.xml rename to uhabits-android/src/main/res/values-pt-rBR/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-pt-rPT/strings.xml b/uhabits-android/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-pt-rPT/strings.xml rename to uhabits-android/src/main/res/values-pt-rPT/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-ro-rRO/strings.xml b/uhabits-android/src/main/res/values-ro-rRO/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-ro-rRO/strings.xml rename to uhabits-android/src/main/res/values-ro-rRO/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-ru-rRU/strings.xml b/uhabits-android/src/main/res/values-ru-rRU/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-ru-rRU/strings.xml rename to uhabits-android/src/main/res/values-ru-rRU/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-sk-rSK/strings.xml b/uhabits-android/src/main/res/values-sk-rSK/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-sk-rSK/strings.xml rename to uhabits-android/src/main/res/values-sk-rSK/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-sl-rSI/strings.xml b/uhabits-android/src/main/res/values-sl-rSI/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-sl-rSI/strings.xml rename to uhabits-android/src/main/res/values-sl-rSI/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-sr-rSP/strings.xml b/uhabits-android/src/main/res/values-sr-rSP/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-sr-rSP/strings.xml rename to uhabits-android/src/main/res/values-sr-rSP/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-sv-rSE/strings.xml b/uhabits-android/src/main/res/values-sv-rSE/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-sv-rSE/strings.xml rename to uhabits-android/src/main/res/values-sv-rSE/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-ta-rIN/strings.xml b/uhabits-android/src/main/res/values-ta-rIN/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-ta-rIN/strings.xml rename to uhabits-android/src/main/res/values-ta-rIN/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-te-rIN/strings.xml b/uhabits-android/src/main/res/values-te-rIN/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-te-rIN/strings.xml rename to uhabits-android/src/main/res/values-te-rIN/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-tr-rTR/strings.xml b/uhabits-android/src/main/res/values-tr-rTR/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-tr-rTR/strings.xml rename to uhabits-android/src/main/res/values-tr-rTR/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-ug-rCN/strings.xml b/uhabits-android/src/main/res/values-ug-rCN/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-ug-rCN/strings.xml rename to uhabits-android/src/main/res/values-ug-rCN/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-uk-rUA/strings.xml b/uhabits-android/src/main/res/values-uk-rUA/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-uk-rUA/strings.xml rename to uhabits-android/src/main/res/values-uk-rUA/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-v21/styles.xml b/uhabits-android/src/main/res/values-v21/styles.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-v21/styles.xml rename to uhabits-android/src/main/res/values-v21/styles.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-v21/styles_list_habits.xml b/uhabits-android/src/main/res/values-v21/styles_list_habits.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-v21/styles_list_habits.xml rename to uhabits-android/src/main/res/values-v21/styles_list_habits.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-vi-rVN/strings.xml b/uhabits-android/src/main/res/values-vi-rVN/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-vi-rVN/strings.xml rename to uhabits-android/src/main/res/values-vi-rVN/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-zh-rCN/strings.xml b/uhabits-android/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-zh-rCN/strings.xml rename to uhabits-android/src/main/res/values-zh-rCN/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values-zh-rTW/strings.xml b/uhabits-android/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values-zh-rTW/strings.xml rename to uhabits-android/src/main/res/values-zh-rTW/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values/attrs.xml b/uhabits-android/src/main/res/values/attrs.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values/attrs.xml rename to uhabits-android/src/main/res/values/attrs.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values/colors.xml b/uhabits-android/src/main/res/values/colors.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values/colors.xml rename to uhabits-android/src/main/res/values/colors.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values/constants.xml b/uhabits-android/src/main/res/values/constants.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values/constants.xml rename to uhabits-android/src/main/res/values/constants.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values/dimens.xml b/uhabits-android/src/main/res/values/dimens.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values/dimens.xml rename to uhabits-android/src/main/res/values/dimens.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values/fontawesome.xml b/uhabits-android/src/main/res/values/fontawesome.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values/fontawesome.xml rename to uhabits-android/src/main/res/values/fontawesome.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values/keys.xml b/uhabits-android/src/main/res/values/keys.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values/keys.xml rename to uhabits-android/src/main/res/values/keys.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values/material_colors.xml b/uhabits-android/src/main/res/values/material_colors.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values/material_colors.xml rename to uhabits-android/src/main/res/values/material_colors.xml diff --git a/uhabits-android/android-pickers/src/main/res/values/pickers.xml b/uhabits-android/src/main/res/values/pickers.xml similarity index 93% rename from uhabits-android/android-pickers/src/main/res/values/pickers.xml rename to uhabits-android/src/main/res/values/pickers.xml index 0e6021524..ed3ff92cb 100644 --- a/uhabits-android/android-pickers/src/main/res/values/pickers.xml +++ b/uhabits-android/src/main/res/values/pickers.xml @@ -121,8 +121,8 @@ #ffd1d2d4 #888888 #888888 - #ffffff - #000000 + + #ff3333 @@ -146,4 +146,11 @@ + + + + + + + \ No newline at end of file diff --git a/uhabits-android/uhabits-android/src/main/res/values/strings.xml b/uhabits-android/src/main/res/values/strings.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values/strings.xml rename to uhabits-android/src/main/res/values/strings.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values/styles.xml b/uhabits-android/src/main/res/values/styles.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values/styles.xml rename to uhabits-android/src/main/res/values/styles.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values/styles_dialog.xml b/uhabits-android/src/main/res/values/styles_dialog.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values/styles_dialog.xml rename to uhabits-android/src/main/res/values/styles_dialog.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values/styles_list_habits.xml b/uhabits-android/src/main/res/values/styles_list_habits.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values/styles_list_habits.xml rename to uhabits-android/src/main/res/values/styles_list_habits.xml diff --git a/uhabits-android/uhabits-android/src/main/res/values/styles_show_habit.xml b/uhabits-android/src/main/res/values/styles_show_habit.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/values/styles_show_habit.xml rename to uhabits-android/src/main/res/values/styles_show_habit.xml diff --git a/uhabits-android/uhabits-android/src/main/res/xml/file_paths.xml b/uhabits-android/src/main/res/xml/file_paths.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/xml/file_paths.xml rename to uhabits-android/src/main/res/xml/file_paths.xml diff --git a/uhabits-android/uhabits-android/src/main/res/xml/preferences.xml b/uhabits-android/src/main/res/xml/preferences.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/xml/preferences.xml rename to uhabits-android/src/main/res/xml/preferences.xml diff --git a/uhabits-android/uhabits-android/src/main/res/xml/widget_checkmark_info.xml b/uhabits-android/src/main/res/xml/widget_checkmark_info.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/xml/widget_checkmark_info.xml rename to uhabits-android/src/main/res/xml/widget_checkmark_info.xml diff --git a/uhabits-android/uhabits-android/src/main/res/xml/widget_frequency_info.xml b/uhabits-android/src/main/res/xml/widget_frequency_info.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/xml/widget_frequency_info.xml rename to uhabits-android/src/main/res/xml/widget_frequency_info.xml diff --git a/uhabits-android/uhabits-android/src/main/res/xml/widget_history_info.xml b/uhabits-android/src/main/res/xml/widget_history_info.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/xml/widget_history_info.xml rename to uhabits-android/src/main/res/xml/widget_history_info.xml diff --git a/uhabits-android/uhabits-android/src/main/res/xml/widget_score_info.xml b/uhabits-android/src/main/res/xml/widget_score_info.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/xml/widget_score_info.xml rename to uhabits-android/src/main/res/xml/widget_score_info.xml diff --git a/uhabits-android/uhabits-android/src/main/res/xml/widget_streak_info.xml b/uhabits-android/src/main/res/xml/widget_streak_info.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/xml/widget_streak_info.xml rename to uhabits-android/src/main/res/xml/widget_streak_info.xml diff --git a/uhabits-android/uhabits-android/src/main/res/xml/widget_target_info.xml b/uhabits-android/src/main/res/xml/widget_target_info.xml similarity index 100% rename from uhabits-android/uhabits-android/src/main/res/xml/widget_target_info.xml rename to uhabits-android/src/main/res/xml/widget_target_info.xml diff --git a/uhabits-android/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidJVMTest.java b/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidJVMTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidJVMTest.java rename to uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidJVMTest.java diff --git a/uhabits-android/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java b/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java similarity index 100% rename from uhabits-android/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java rename to uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java diff --git a/uhabits-android/tools/automator-log-converter-1.5.0.jar b/uhabits-android/tools/automator-log-converter-1.5.0.jar deleted file mode 100644 index 36fde9b1e..000000000 Binary files a/uhabits-android/tools/automator-log-converter-1.5.0.jar and /dev/null differ diff --git a/uhabits-android/tools/coverage-badge/badge.py b/uhabits-android/tools/coverage-badge/badge.py deleted file mode 100644 index 3e6bae8bb..000000000 --- a/uhabits-android/tools/coverage-badge/badge.py +++ /dev/null @@ -1,157 +0,0 @@ -""" -Generate coverage badges for Coverage.py. -Forked from https://github.com/dbrgn/coverage-badge -""" -# -*- coding: utf-8 -*- -from __future__ import print_function, division, absolute_import, unicode_literals - -import os -import sys -import argparse -import pkg_resources -from bs4 import BeautifulSoup - -__version__ = '0.2.0-uhabits' - - -DEFAULT_COLOR = '#a4a61d' -COLORS = { - 'brightgreen': '#4c1', - 'green': '#97CA00', - 'yellowgreen': '#a4a61d', - 'yellow': '#dfb317', - 'orange': '#fe7d37', - 'red': '#e05d44', - 'lightgrey': '#9f9f9f', -} - -COLOR_RANGES = [ - (95, 'brightgreen'), - (90, 'green'), - (75, 'yellowgreen'), - (60, 'yellow'), - (40, 'orange'), - (0, 'red'), -] - - -class Devnull(object): - """ - A file like object that does nothing. - """ - def write(self, *args, **kwargs): - pass - - -def get_total(report): - missed = 0 - covered = 0 - for r in report.split(":"): - doc = BeautifulSoup(open(r), 'xml') - tag = doc.select("report > counter[type^INST]")[0] - missed = missed + float(tag['missed']) - covered = covered + float(tag['covered']) - return str(int(round(100 * covered / (missed + covered)))) - -def get_color(total): - """ - Return color for current coverage percent - """ - try: - xtotal = int(total) - except ValueError: - return COLORS['lightgrey'] - for range_, color in COLOR_RANGES: - if xtotal >= range_: - return COLORS[color] - - -def get_badge(total, color=DEFAULT_COLOR): - """ - Read the SVG template from the package, update total, return SVG as a - string. - """ - template_path = os.path.join('templates', 'flat.svg') - template = pkg_resources.resource_string(__name__, template_path).decode('utf8') - return template.replace('{{ total }}', total).replace('{{ color }}', color) - - -def parse_args(argv=None): - """ - Parse the command line arguments. - """ - parser = argparse.ArgumentParser(description=__doc__) - parser.add_argument('-o', dest='filepath', - help='Save the file to the specified path.') - parser.add_argument('-p', dest='plain_color', action='store_true', - help='Plain color mode. Standard green badge.') - parser.add_argument('-f', dest='force', action='store_true', - help='Force overwrite image, use with -o key.') - parser.add_argument('-q', dest='quiet', action='store_true', - help='Don\'t output any non-error messages.') - parser.add_argument('-v', dest='print_version', action='store_true', - help='Show version.') - parser.add_argument('-i', dest='reportFilename', - help='Jacoco report') - - # If arguments have been passed in, use them. - if argv: - return parser.parse_args(argv) - - # Otherwise, just use sys.argv directly. - else: - return parser.parse_args() - - -def save_badge(badge, filepath, force=False): - """ - Save badge to the specified path. - """ - # Validate path (part 1) - if filepath.endswith('/'): - print('Error: Filepath may not be a directory.') - sys.exit(1) - - # Get absolute filepath - path = os.path.abspath(filepath) - if not path.lower().endswith('.svg'): - path += '.svg' - - # Validate path (part 2) - if not force and os.path.exists(path): - print('Error: "{}" already exists.'.format(path)) - sys.exit(1) - - # Write file - with open(path, 'w') as f: - f.write(badge) - - return path - - -def main(argv=None): - """ - Console scripts entry point. - """ - args = parse_args(argv) - - # Print version - if args.print_version: - print('coverage-badge v{}'.format(__version__)) - sys.exit(0) - - total = get_total(args.reportFilename) - color = DEFAULT_COLOR if args.plain_color else get_color(total) - badge = get_badge(total, color) - - # Show or save output - if args.filepath: - path = save_badge(badge, args.filepath, args.force) - if not args.quiet: - print('Saved badge to {}'.format(path)) - else: - print(badge, end='') - - -if __name__ == '__main__': - main() diff --git a/uhabits-android/tools/coverage-badge/templates/flat.svg b/uhabits-android/tools/coverage-badge/templates/flat.svg deleted file mode 100644 index 169cd8d67..000000000 --- a/uhabits-android/tools/coverage-badge/templates/flat.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - coverage - coverage - {{ total }}% - {{ total }}% - - diff --git a/uhabits-android/uhabits-android/build.gradle b/uhabits-android/uhabits-android/build.gradle deleted file mode 100644 index 320b4ace4..000000000 --- a/uhabits-android/uhabits-android/build.gradle +++ /dev/null @@ -1,129 +0,0 @@ -plugins { - id 'idea' - id 'com.android.application' - id 'kotlin-android' - id 'kotlin-kapt' - //id 'com.github.triplet.play' version '2.6.2' - id 'kotlin-android-extensions' -} - -android { - compileSdkVersion COMPILE_SDK_VERSION as Integer - - def secretPropsFile = file("../../.secret/gradle.properties") - if (secretPropsFile.exists()) { - def secrets = new Properties() - secretPropsFile.withInputStream { secrets.load(it) } - signingConfigs { - release { - storeFile file(secrets.LOOP_KEY_STORE) - storePassword secrets.LOOP_STORE_PASSWORD - keyAlias secrets.LOOP_KEY_ALIAS - keyPassword secrets.LOOP_KEY_PASSWORD - } - } - buildTypes.release.signingConfig signingConfigs.release - } - - defaultConfig { - versionCode VERSION_CODE as Integer - versionName "$VERSION_NAME" - minSdkVersion MIN_SDK_VERSION as Integer - targetSdkVersion TARGET_SDK_VERSION as Integer - - applicationId "org.isoron.uhabits" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - } - - debug { - testCoverageEnabled true - } - } - - lintOptions { - checkReleaseBuilds false - abortOnError false - disable 'GoogleAppIndexingWarning' - } - - compileOptions { - coreLibraryDesugaringEnabled true - targetCompatibility JavaVersion.VERSION_1_8 - sourceCompatibility JavaVersion.VERSION_1_8 - } - - testOptions { - unitTests.all { - testLogging { - events "passed", "skipped", "failed", "standardOut", "standardError" - outputs.upToDateWhen { false } - showStandardStreams = true - } - } - } - - sourceSets { - main.assets.srcDirs += '../uhabits-core/src/main/resources/' - } - - buildFeatures { - viewBinding true - } -} - -dependencies { - androidTestImplementation "androidx.test.espresso:espresso-contrib:$ESPRESSO_VERSION" - androidTestImplementation "androidx.test.espresso:espresso-core:$ESPRESSO_VERSION" - androidTestImplementation "com.google.dagger:dagger:$DAGGER_VERSION" - androidTestImplementation "com.linkedin.dexmaker:dexmaker-mockito:2.28.0" - androidTestImplementation "com.linkedin.testbutler:test-butler-library:1.3.1" - androidTestImplementation "io.ktor:ktor-client-mock:$KTOR_VERSION" - androidTestImplementation "io.ktor:ktor-jackson:$KTOR_VERSION" - androidTestImplementation "org.mockito:mockito-core:2.28.2" - androidTestImplementation 'androidx.annotation:annotation:1.1.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' - androidTestImplementation 'androidx.test:rules:1.3.0' - compileOnly "javax.annotation:jsr250-api:1.0" - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1' - implementation "com.github.paolorotolo:appintro:3.4.0" - implementation "com.google.code.findbugs:jsr305:3.0.2" - implementation "com.google.dagger:dagger:$DAGGER_VERSION" - implementation "com.google.guava:guava:30.0-android" - implementation "io.ktor:ktor-client-android:$KTOR_VERSION" - implementation "io.ktor:ktor-client-core:$KTOR_VERSION" - implementation "io.ktor:ktor-client-jackson:$KTOR_VERSION" - implementation "io.ktor:ktor-client-json:$KTOR_VERSION" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$KX_COROUTINES_VERSION" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$KX_COROUTINES_VERSION" - implementation 'androidx.appcompat:appcompat:1.2.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.2.1' - implementation 'com.google.zxing:core:3.4.1' - implementation 'com.opencsv:opencsv:3.10' - implementation project(":android-pickers") - implementation files("../../uhabits-core/build/libs/uhabits-core-jvm.jar") - kapt "com.google.dagger:dagger-compiler:$DAGGER_VERSION" - kaptAndroidTest "com.google.dagger:dagger-compiler:$DAGGER_VERSION" - testImplementation "com.google.dagger:dagger:$DAGGER_VERSION" - testImplementation "junit:junit:4.12" - testImplementation "org.mockito:mockito-core:2.28.2" - testImplementation "org.mockito:mockito-inline:2.8.9" -} - -kapt { - correctErrorTypes = true -} - -//play { -// serviceAccountCredentials = file("../../.secret/gcp-key.json") -// track = "alpha" -//} diff --git a/uhabits-android/uhabits-android/lint.xml b/uhabits-android/uhabits-android/lint.xml deleted file mode 100644 index 8423c0ef9..000000000 --- a/uhabits-android/uhabits-android/lint.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png b/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png deleted file mode 100644 index 3cbfe1a84..000000000 Binary files a/uhabits-android/uhabits-android/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png and /dev/null differ diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png b/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png deleted file mode 100644 index acbdecac2..000000000 Binary files a/uhabits-android/uhabits-android/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png and /dev/null differ diff --git a/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png b/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png deleted file mode 100644 index 812ff2c39..000000000 Binary files a/uhabits-android/uhabits-android/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png and /dev/null differ diff --git a/uhabits-android/uhabits-android/src/main/res/drawable/color_picker_swatch.xml b/uhabits-android/uhabits-android/src/main/res/drawable/color_picker_swatch.xml deleted file mode 100644 index db71091aa..000000000 --- a/uhabits-android/uhabits-android/src/main/res/drawable/color_picker_swatch.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - \ No newline at end of file