diff --git a/android/settings.gradle b/android/settings.gradle index 3c3f626c5..fce649473 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1 +1 @@ -include ':uhabits-android', ':uhabits-core', ':android-pickers' +include ':uhabits-android', ':uhabits-core-legacy', ':android-pickers', ':uhabits-core' diff --git a/android/uhabits-android/build.gradle b/android/uhabits-android/build.gradle index 2ba358d08..d729da52f 100644 --- a/android/uhabits-android/build.gradle +++ b/android/uhabits-android/build.gradle @@ -3,7 +3,7 @@ plugins { id 'com.android.application' id 'kotlin-android' id 'kotlin-kapt' - id 'com.github.triplet.play' version '2.6.2' + //id 'com.github.triplet.play' version '2.6.2' id 'kotlin-android-extensions' } @@ -92,7 +92,7 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' androidTestImplementation 'androidx.test:rules:1.3.0' - androidTestImplementation project(":uhabits-core") + androidTestImplementation project(':uhabits-core-legacy') annotationProcessor "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION" compileOnly "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION" compileOnly "javax.annotation:jsr250-api:1.0" @@ -114,7 +114,7 @@ dependencies { 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(":uhabits-core") + implementation project(':uhabits-core-legacy') implementation project(":android-pickers") kapt "com.google.dagger:dagger-compiler:$DAGGER_VERSION" kaptAndroidTest "com.google.dagger:dagger-compiler:$DAGGER_VERSION" @@ -128,7 +128,7 @@ kapt { correctErrorTypes = true } -play { - serviceAccountCredentials = file("../../.secret/gcp-key.json") - track = "alpha" -} +//play { +// serviceAccountCredentials = file("../../.secret/gcp-key.json") +// track = "alpha" +//} diff --git a/android/uhabits-core/.gitignore b/android/uhabits-core-legacy/.gitignore similarity index 100% rename from android/uhabits-core/.gitignore rename to android/uhabits-core-legacy/.gitignore diff --git a/android/uhabits-core/assets/main/fonts/FontAwesome.ttf b/android/uhabits-core-legacy/assets/main/fonts/FontAwesome.ttf similarity index 100% rename from android/uhabits-core/assets/main/fonts/FontAwesome.ttf rename to android/uhabits-core-legacy/assets/main/fonts/FontAwesome.ttf diff --git a/android/uhabits-core/assets/main/fonts/NotoSans-Bold.ttf b/android/uhabits-core-legacy/assets/main/fonts/NotoSans-Bold.ttf similarity index 100% rename from android/uhabits-core/assets/main/fonts/NotoSans-Bold.ttf rename to android/uhabits-core-legacy/assets/main/fonts/NotoSans-Bold.ttf diff --git a/android/uhabits-core/assets/main/fonts/NotoSans-Regular.ttf b/android/uhabits-core-legacy/assets/main/fonts/NotoSans-Regular.ttf similarity index 100% rename from android/uhabits-core/assets/main/fonts/NotoSans-Regular.ttf rename to android/uhabits-core-legacy/assets/main/fonts/NotoSans-Regular.ttf diff --git a/android/uhabits-core/assets/test/hello.txt b/android/uhabits-core-legacy/assets/test/hello.txt similarity index 100% rename from android/uhabits-core/assets/test/hello.txt rename to android/uhabits-core-legacy/assets/test/hello.txt diff --git a/android/uhabits-core/assets/test/views/BarChart/base.png b/android/uhabits-core-legacy/assets/test/views/BarChart/base.png similarity index 100% rename from android/uhabits-core/assets/test/views/BarChart/base.png rename to android/uhabits-core-legacy/assets/test/views/BarChart/base.png diff --git a/android/uhabits-core/assets/test/views/BarChart/offset.png b/android/uhabits-core-legacy/assets/test/views/BarChart/offset.png similarity index 100% rename from android/uhabits-core/assets/test/views/BarChart/offset.png rename to android/uhabits-core-legacy/assets/test/views/BarChart/offset.png diff --git a/android/uhabits-core/assets/test/views/BarChart/themeDark.png b/android/uhabits-core-legacy/assets/test/views/BarChart/themeDark.png similarity index 100% rename from android/uhabits-core/assets/test/views/BarChart/themeDark.png rename to android/uhabits-core-legacy/assets/test/views/BarChart/themeDark.png diff --git a/android/uhabits-core/assets/test/views/BarChart/themeWidget.png b/android/uhabits-core-legacy/assets/test/views/BarChart/themeWidget.png similarity index 100% rename from android/uhabits-core/assets/test/views/BarChart/themeWidget.png rename to android/uhabits-core-legacy/assets/test/views/BarChart/themeWidget.png diff --git a/android/uhabits-core/assets/test/views/CanvasTest.png b/android/uhabits-core-legacy/assets/test/views/CanvasTest.png similarity index 100% rename from android/uhabits-core/assets/test/views/CanvasTest.png rename to android/uhabits-core-legacy/assets/test/views/CanvasTest.png diff --git a/android/uhabits-core/assets/test/views/CheckmarkButton/explicit.png b/android/uhabits-core-legacy/assets/test/views/CheckmarkButton/explicit.png similarity index 100% rename from android/uhabits-core/assets/test/views/CheckmarkButton/explicit.png rename to android/uhabits-core-legacy/assets/test/views/CheckmarkButton/explicit.png diff --git a/android/uhabits-core/assets/test/views/CheckmarkButton/implicit.png b/android/uhabits-core-legacy/assets/test/views/CheckmarkButton/implicit.png similarity index 100% rename from android/uhabits-core/assets/test/views/CheckmarkButton/implicit.png rename to android/uhabits-core-legacy/assets/test/views/CheckmarkButton/implicit.png diff --git a/android/uhabits-core/assets/test/views/CheckmarkButton/unchecked.png b/android/uhabits-core-legacy/assets/test/views/CheckmarkButton/unchecked.png similarity index 100% rename from android/uhabits-core/assets/test/views/CheckmarkButton/unchecked.png rename to android/uhabits-core-legacy/assets/test/views/CheckmarkButton/unchecked.png diff --git a/android/uhabits-core/assets/test/views/HabitListHeader/light.png b/android/uhabits-core-legacy/assets/test/views/HabitListHeader/light.png similarity index 100% rename from android/uhabits-core/assets/test/views/HabitListHeader/light.png rename to android/uhabits-core-legacy/assets/test/views/HabitListHeader/light.png diff --git a/android/uhabits-core/assets/test/views/HistoryChart/base.png b/android/uhabits-core-legacy/assets/test/views/HistoryChart/base.png similarity index 100% rename from android/uhabits-core/assets/test/views/HistoryChart/base.png rename to android/uhabits-core-legacy/assets/test/views/HistoryChart/base.png diff --git a/android/uhabits-core/assets/test/views/HistoryChart/scroll.png b/android/uhabits-core-legacy/assets/test/views/HistoryChart/scroll.png similarity index 100% rename from android/uhabits-core/assets/test/views/HistoryChart/scroll.png rename to android/uhabits-core-legacy/assets/test/views/HistoryChart/scroll.png diff --git a/android/uhabits-core/assets/test/views/HistoryChart/small.png b/android/uhabits-core-legacy/assets/test/views/HistoryChart/small.png similarity index 100% rename from android/uhabits-core/assets/test/views/HistoryChart/small.png rename to android/uhabits-core-legacy/assets/test/views/HistoryChart/small.png diff --git a/android/uhabits-core/assets/test/views/HistoryChart/themeDark.png b/android/uhabits-core-legacy/assets/test/views/HistoryChart/themeDark.png similarity index 100% rename from android/uhabits-core/assets/test/views/HistoryChart/themeDark.png rename to android/uhabits-core-legacy/assets/test/views/HistoryChart/themeDark.png diff --git a/android/uhabits-core/assets/test/views/HistoryChart/themeWidget.png b/android/uhabits-core-legacy/assets/test/views/HistoryChart/themeWidget.png similarity index 100% rename from android/uhabits-core/assets/test/views/HistoryChart/themeWidget.png rename to android/uhabits-core-legacy/assets/test/views/HistoryChart/themeWidget.png diff --git a/android/uhabits-core/assets/test/views/HistoryChart/weekday.png b/android/uhabits-core-legacy/assets/test/views/HistoryChart/weekday.png similarity index 100% rename from android/uhabits-core/assets/test/views/HistoryChart/weekday.png rename to android/uhabits-core-legacy/assets/test/views/HistoryChart/weekday.png diff --git a/android/uhabits-core/assets/test/views/NumberButton/render_above.png b/android/uhabits-core-legacy/assets/test/views/NumberButton/render_above.png similarity index 100% rename from android/uhabits-core/assets/test/views/NumberButton/render_above.png rename to android/uhabits-core-legacy/assets/test/views/NumberButton/render_above.png diff --git a/android/uhabits-core/assets/test/views/NumberButton/render_below.png b/android/uhabits-core-legacy/assets/test/views/NumberButton/render_below.png similarity index 100% rename from android/uhabits-core/assets/test/views/NumberButton/render_below.png rename to android/uhabits-core-legacy/assets/test/views/NumberButton/render_below.png diff --git a/android/uhabits-core/assets/test/views/NumberButton/render_zero.png b/android/uhabits-core-legacy/assets/test/views/NumberButton/render_zero.png similarity index 100% rename from android/uhabits-core/assets/test/views/NumberButton/render_zero.png rename to android/uhabits-core-legacy/assets/test/views/NumberButton/render_zero.png diff --git a/android/uhabits-core/assets/test/views/Ring/draw1.png b/android/uhabits-core-legacy/assets/test/views/Ring/draw1.png similarity index 100% rename from android/uhabits-core/assets/test/views/Ring/draw1.png rename to android/uhabits-core-legacy/assets/test/views/Ring/draw1.png diff --git a/android/uhabits-core-legacy/build.gradle b/android/uhabits-core-legacy/build.gradle new file mode 100644 index 000000000..f8c6dc82c --- /dev/null +++ b/android/uhabits-core-legacy/build.gradle @@ -0,0 +1,32 @@ +apply plugin: 'idea' +apply plugin: 'java' +apply plugin: 'kotlin' + +dependencies { + annotationProcessor "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION" + annotationProcessor "com.google.dagger:dagger:$DAGGER_VERSION" + compileOnly "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION" + compileOnly "com.google.dagger:dagger:$DAGGER_VERSION" + compileOnly 'javax.annotation:jsr250-api:1.0' + compileOnly 'org.jetbrains:annotations:18.0.0' + implementation "com.google.guava:guava:30.0-jre" + implementation "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:$KX_COROUTINES_VERSION" + implementation 'androidx.annotation:annotation:1.1.0' + implementation 'com.google.code.findbugs:jsr305:3.0.2' + implementation 'commons-codec:commons-codec:1.15' + implementation 'org.apache.commons:commons-lang3:3.5' + implementation 'com.opencsv:opencsv:3.10' + implementation project(':uhabits-core') + testImplementation "org.jetbrains.kotlin:kotlin-reflect:$KOTLIN_VERSION" + testImplementation "org.jetbrains.kotlin:kotlin-test:$KOTLIN_VERSION" + testImplementation 'junit:junit:4.12' + testImplementation 'nl.jqno.equalsverifier:equalsverifier:2.4.8' + testImplementation 'org.apache.commons:commons-io:1.3.2' + testImplementation 'org.hamcrest:hamcrest-library:1.4-atlassian-1' + testImplementation 'org.mockito:mockito-core:2.28.2' + testImplementation 'org.xerial:sqlite-jdbc:3.18.0' +} + +sourceCompatibility = "1.8" +targetCompatibility = "1.8" diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/AppScope.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/AppScope.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/AppScope.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/AppScope.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/Constants.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/Constants.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/Constants.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/Constants.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommand.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommand.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommand.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommand.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommand.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommand.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommand.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommand.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/Command.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/commands/Command.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/Command.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/commands/Command.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CommandRunner.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/commands/CommandRunner.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CommandRunner.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/commands/CommandRunner.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateHabitCommand.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/commands/CreateHabitCommand.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateHabitCommand.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/commands/CreateHabitCommand.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateRepetitionCommand.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/commands/CreateRepetitionCommand.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateRepetitionCommand.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/commands/CreateRepetitionCommand.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/DeleteHabitsCommand.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/commands/DeleteHabitsCommand.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/DeleteHabitsCommand.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/commands/DeleteHabitsCommand.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/EditHabitCommand.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/commands/EditHabitCommand.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/EditHabitCommand.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/commands/EditHabitCommand.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommand.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommand.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommand.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommand.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Column.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/Column.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Column.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/Column.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Cursor.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/Cursor.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Cursor.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/Cursor.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Database.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/Database.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Database.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/Database.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/DatabaseOpener.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/DatabaseOpener.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/DatabaseOpener.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/DatabaseOpener.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/JdbcCursor.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/JdbcCursor.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/JdbcCursor.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/JdbcCursor.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/JdbcDatabase.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/JdbcDatabase.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/JdbcDatabase.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/JdbcDatabase.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/MigrationHelper.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/MigrationHelper.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/MigrationHelper.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/MigrationHelper.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Repository.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/Repository.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Repository.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/Repository.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/SQLParser.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/SQLParser.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/SQLParser.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/SQLParser.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Table.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/Table.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Table.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/Table.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/UnsupportedDatabaseVersionException.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/UnsupportedDatabaseVersionException.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/UnsupportedDatabaseVersionException.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/database/UnsupportedDatabaseVersionException.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/AbstractImporter.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/io/AbstractImporter.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/AbstractImporter.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/io/AbstractImporter.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/GenericImporter.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/io/GenericImporter.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/GenericImporter.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/io/GenericImporter.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitsCSVExporter.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/io/HabitsCSVExporter.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/HabitsCSVExporter.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/io/HabitsCSVExporter.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/Logging.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/io/Logging.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/Logging.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/io/Logging.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/LoopDBImporter.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/io/LoopDBImporter.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/LoopDBImporter.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/io/LoopDBImporter.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/RewireDBImporter.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/io/RewireDBImporter.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/RewireDBImporter.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/io/RewireDBImporter.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/TickmateDBImporter.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/io/TickmateDBImporter.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/io/TickmateDBImporter.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/io/TickmateDBImporter.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Entry.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/Entry.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Entry.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/Entry.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/EntryList.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/EntryList.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/EntryList.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/EntryList.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Frequency.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/Frequency.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Frequency.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/Frequency.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/Habit.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/Habit.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitList.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/HabitList.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitList.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/HabitList.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitMatcher.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/HabitMatcher.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitMatcher.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/HabitMatcher.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitMatcherBuilder.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/HabitMatcherBuilder.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitMatcherBuilder.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/HabitMatcherBuilder.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitNotFoundException.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/HabitNotFoundException.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitNotFoundException.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/HabitNotFoundException.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelFactory.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/ModelFactory.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelFactory.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/ModelFactory.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelObservable.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/ModelObservable.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ModelObservable.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/ModelObservable.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/PaletteColor.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/PaletteColor.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/PaletteColor.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/PaletteColor.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Reminder.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/Reminder.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Reminder.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/Reminder.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Score.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/Score.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Score.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/Score.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/ScoreList.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/ScoreList.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Streak.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/Streak.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Streak.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/Streak.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/StreakList.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/StreakList.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/StreakList.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/StreakList.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Timestamp.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/Timestamp.java similarity index 77% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Timestamp.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/Timestamp.java index 8abf9ef3f..59d1e483a 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Timestamp.java +++ b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/Timestamp.java @@ -19,31 +19,29 @@ package org.isoron.uhabits.core.models; -import org.apache.commons.lang3.builder.*; import org.isoron.platform.time.LocalDate; +import org.apache.commons.lang3.builder.*; import org.isoron.uhabits.core.utils.*; -import org.jetbrains.annotations.*; -import java.time.*; import java.util.*; -import kotlin.*; - import static java.util.Calendar.*; -public final class Timestamp implements Comparable -{ +public final class Timestamp implements Comparable { public static final long DAY_LENGTH = 86400000; public static final Timestamp ZERO = new Timestamp(0); private final long unixTime; - public Timestamp(long unixTime) - { + public static Timestamp fromLocalDate(LocalDate date) { + return new Timestamp(946684800000L + date.getDaysSince2000() * 86400000L); + } + + public Timestamp(long unixTime) { if (unixTime < 0) throw new IllegalArgumentException( - "Invalid unix time: " + unixTime); + "Invalid unix time: " + unixTime); if (unixTime % DAY_LENGTH != 0) unixTime = (unixTime / DAY_LENGTH) * DAY_LENGTH; @@ -51,25 +49,21 @@ public final class Timestamp implements Comparable this.unixTime = unixTime; } - public Timestamp(GregorianCalendar cal) - { + public Timestamp(GregorianCalendar cal) { this(cal.getTimeInMillis()); } - public static Timestamp from(int year, int javaMonth, int day) - { + public static Timestamp from(int year, int javaMonth, int day) { GregorianCalendar cal = DateUtils.getStartOfTodayCalendar(); cal.set(year, javaMonth, day, 0, 0, 0); return new Timestamp(cal.getTimeInMillis()); } - public long getUnixTime() - { + public long getUnixTime() { return unixTime; } - public LocalDate toLocalDate() - { + public LocalDate toLocalDate() { long millisSince2000 = unixTime - 946684800000L; int daysSince2000 = (int) (millisSince2000 / 86400000); return new LocalDate(daysSince2000); @@ -80,14 +74,12 @@ public final class Timestamp implements Comparable * timestamp is newer, or zero if they are equal. */ @Override - public int compareTo(Timestamp other) - { + public int compareTo(Timestamp other) { return Long.signum(this.unixTime - other.unixTime); } @Override - public boolean equals(Object o) - { + public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -95,31 +87,27 @@ public final class Timestamp implements Comparable Timestamp timestamp = (Timestamp) o; return new EqualsBuilder() - .append(unixTime, timestamp.unixTime) - .isEquals(); + .append(unixTime, timestamp.unixTime) + .isEquals(); } @Override - public int hashCode() - { + public int hashCode() { return new HashCodeBuilder(17, 37).append(unixTime).toHashCode(); } /** * Given two timestamps, returns whichever timestamp is the oldest one. */ - public static Timestamp oldest(Timestamp first, Timestamp second) - { + public static Timestamp oldest(Timestamp first, Timestamp second) { return first.unixTime < second.unixTime ? first : second; } - public Timestamp minus(int days) - { + public Timestamp minus(int days) { return plus(-days); } - public Timestamp plus(int days) - { + public Timestamp plus(int days) { return new Timestamp(unixTime + DAY_LENGTH * days); } @@ -128,38 +116,32 @@ public final class Timestamp implements Comparable * the other timestamp equals this one, returns zero. If the other timestamp * is older than this one, returns a negative number. */ - public int daysUntil(Timestamp other) - { + public int daysUntil(Timestamp other) { return (int) ((other.unixTime - this.unixTime) / DAY_LENGTH); } - public boolean isNewerThan(Timestamp other) - { + public boolean isNewerThan(Timestamp other) { return compareTo(other) > 0; } - public boolean isOlderThan(Timestamp other) - { + public boolean isOlderThan(Timestamp other) { return compareTo(other) < 0; } - public Date toJavaDate() - { + public Date toJavaDate() { return new Date(unixTime); } - public GregorianCalendar toCalendar() - { + public GregorianCalendar toCalendar() { GregorianCalendar day = - new GregorianCalendar(TimeZone.getTimeZone("GMT")); + new GregorianCalendar(TimeZone.getTimeZone("GMT")); day.setTimeInMillis(unixTime); return day; } @Override - public String toString() - { + public String toString() { return DateFormats.getCSVDateFormat().format(new Date(unixTime)); } @@ -167,13 +149,11 @@ public final class Timestamp implements Comparable * Returns an integer corresponding to the day of the week. Saturday maps * to 0, Sunday maps to 1, and so on. */ - public int getWeekday() - { + public int getWeekday() { return toCalendar().get(DAY_OF_WEEK) % 7; } - Timestamp truncate(DateUtils.TruncateField field, int firstWeekday) - { + Timestamp truncate(DateUtils.TruncateField field, int firstWeekday) { return new Timestamp(DateUtils.truncate(field, unixTime, firstWeekday)); } } diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/WeekdayList.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/WeekdayList.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/WeekdayList.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/WeekdayList.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryModelFactory.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/memory/MemoryModelFactory.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryModelFactory.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/memory/MemoryModelFactory.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/package-info.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/memory/package-info.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/package-info.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/memory/package-info.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLModelFactory.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLModelFactory.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLModelFactory.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLModelFactory.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryList.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryList.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryList.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryList.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitList.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitList.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitList.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitList.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/package-info.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/sqlite/package-info.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/package-info.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/sqlite/package-info.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/records/EntryRecord.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/sqlite/records/EntryRecord.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/records/EntryRecord.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/sqlite/records/EntryRecord.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecord.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecord.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecord.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecord.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/PropertiesStorage.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/preferences/PropertiesStorage.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/PropertiesStorage.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/preferences/PropertiesStorage.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/WidgetPreferences.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/preferences/WidgetPreferences.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/WidgetPreferences.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/preferences/WidgetPreferences.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/reminders/ReminderScheduler.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/reminders/ReminderScheduler.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/reminders/ReminderScheduler.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/reminders/ReminderScheduler.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/AbstractSyncServer.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/sync/AbstractSyncServer.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/AbstractSyncServer.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/sync/AbstractSyncServer.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/EncryptionExt.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/sync/EncryptionExt.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/EncryptionExt.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/sync/EncryptionExt.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/NetworkManager.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/sync/NetworkManager.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/NetworkManager.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/sync/NetworkManager.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/SyncData.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/sync/SyncData.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/SyncData.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/sync/SyncData.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/SyncException.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/sync/SyncException.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/SyncException.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/sync/SyncException.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/SyncManager.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/sync/SyncManager.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/sync/SyncManager.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/sync/SyncManager.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/ExportCSVTask.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/tasks/ExportCSVTask.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/ExportCSVTask.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/tasks/ExportCSVTask.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunner.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunner.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunner.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunner.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/Task.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/tasks/Task.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/Task.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/tasks/Task.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/TaskRunner.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/tasks/TaskRunner.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/tasks/TaskRunner.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/tasks/TaskRunner.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/test/HabitFixtures.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/test/HabitFixtures.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/test/HabitFixtures.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/test/HabitFixtures.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/NotificationTray.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/NotificationTray.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/NotificationTray.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/NotificationTray.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/ThemeSwitcher.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/ThemeSwitcher.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/ThemeSwitcher.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/ThemeSwitcher.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnColorPickedCallback.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnColorPickedCallback.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnColorPickedCallback.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnColorPickedCallback.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnConfirmedCallback.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnConfirmedCallback.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnConfirmedCallback.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnConfirmedCallback.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnFinishedCallback.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnFinishedCallback.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnFinishedCallback.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnFinishedCallback.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnToggleCheckmarkListener.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnToggleCheckmarkListener.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnToggleCheckmarkListener.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/callbacks/OnToggleCheckmarkListener.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCache.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCache.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCache.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCache.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HintList.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HintList.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HintList.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HintList.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehavior.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehavior.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehavior.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehavior.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabit.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabit.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabit.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabit.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenter.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenter.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenter.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenter.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/BarCard.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/BarCard.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/BarCard.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/BarCard.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/FrequencyCard.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/FrequencyCard.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/FrequencyCard.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/FrequencyCard.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt similarity index 98% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt index 6efe24e51..103d9d419 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt +++ b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt @@ -30,6 +30,7 @@ import org.isoron.uhabits.core.models.Entry.Companion.YES_MANUAL import org.isoron.uhabits.core.models.Habit import org.isoron.uhabits.core.models.HabitList import org.isoron.uhabits.core.models.PaletteColor +import org.isoron.uhabits.core.models.Timestamp import org.isoron.uhabits.core.preferences.Preferences import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior import org.isoron.uhabits.core.ui.views.HistoryChart @@ -56,7 +57,7 @@ class HistoryCardPresenter( ) : OnDateClickedListener { override fun onDateClicked(date: LocalDate) { - val timestamp = date.timestamp + val timestamp = Timestamp.fromLocalDate(date) screen.showFeedback() if (habit.isNumerical) { val entries = habit.computedEntries diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/NotesCard.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/NotesCard.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/NotesCard.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/NotesCard.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/OverviewCard.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/OverviewCard.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/OverviewCard.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/OverviewCard.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/ScoreCard.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/ScoreCard.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/ScoreCard.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/ScoreCard.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/StreakCart.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/StreakCart.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/StreakCart.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/StreakCart.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/SubtitleCard.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/SubtitleCard.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/SubtitleCard.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/SubtitleCard.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/TargetCard.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/TargetCard.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/TargetCard.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/views/TargetCard.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/sync/SyncBehavior.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/sync/SyncBehavior.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/sync/SyncBehavior.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/screens/sync/SyncBehavior.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/views/BarChart.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/views/BarChart.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/views/BarChart.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/views/BarChart.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/views/CheckmarkButton.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/views/CheckmarkButton.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/views/CheckmarkButton.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/views/CheckmarkButton.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/views/HabitListHeader.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/views/HabitListHeader.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/views/HabitListHeader.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/views/HabitListHeader.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/views/NumberButton.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/views/NumberButton.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/views/NumberButton.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/views/NumberButton.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/views/Ring.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/views/Ring.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/views/Ring.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/views/Ring.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/views/Themes.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/views/Themes.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/views/Themes.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/views/Themes.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateFormats.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/utils/DateFormats.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateFormats.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/utils/DateFormats.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateUtils.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/utils/DateUtils.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/DateUtils.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/utils/DateUtils.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/FileExtensions.kt b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/utils/FileExtensions.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/FileExtensions.kt rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/utils/FileExtensions.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/MidnightTimer.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/utils/MidnightTimer.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/MidnightTimer.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/utils/MidnightTimer.java diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/StringUtils.java b/android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/utils/StringUtils.java similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/uhabits/core/utils/StringUtils.java rename to android/uhabits-core-legacy/src/main/java/org/isoron/uhabits/core/utils/StringUtils.java diff --git a/android/uhabits-core/src/main/resources/migrations/09.sql b/android/uhabits-core-legacy/src/main/resources/migrations/09.sql similarity index 100% rename from android/uhabits-core/src/main/resources/migrations/09.sql rename to android/uhabits-core-legacy/src/main/resources/migrations/09.sql diff --git a/android/uhabits-core/src/main/resources/migrations/10.sql b/android/uhabits-core-legacy/src/main/resources/migrations/10.sql similarity index 100% rename from android/uhabits-core/src/main/resources/migrations/10.sql rename to android/uhabits-core-legacy/src/main/resources/migrations/10.sql diff --git a/android/uhabits-core/src/main/resources/migrations/11.sql b/android/uhabits-core-legacy/src/main/resources/migrations/11.sql similarity index 100% rename from android/uhabits-core/src/main/resources/migrations/11.sql rename to android/uhabits-core-legacy/src/main/resources/migrations/11.sql diff --git a/android/uhabits-core/src/main/resources/migrations/12.sql b/android/uhabits-core-legacy/src/main/resources/migrations/12.sql similarity index 100% rename from android/uhabits-core/src/main/resources/migrations/12.sql rename to android/uhabits-core-legacy/src/main/resources/migrations/12.sql diff --git a/android/uhabits-core/src/main/resources/migrations/13.sql b/android/uhabits-core-legacy/src/main/resources/migrations/13.sql similarity index 100% rename from android/uhabits-core/src/main/resources/migrations/13.sql rename to android/uhabits-core-legacy/src/main/resources/migrations/13.sql diff --git a/android/uhabits-core/src/main/resources/migrations/14.sql b/android/uhabits-core-legacy/src/main/resources/migrations/14.sql similarity index 100% rename from android/uhabits-core/src/main/resources/migrations/14.sql rename to android/uhabits-core-legacy/src/main/resources/migrations/14.sql diff --git a/android/uhabits-core/src/main/resources/migrations/15.sql b/android/uhabits-core-legacy/src/main/resources/migrations/15.sql similarity index 100% rename from android/uhabits-core/src/main/resources/migrations/15.sql rename to android/uhabits-core-legacy/src/main/resources/migrations/15.sql diff --git a/android/uhabits-core/src/main/resources/migrations/16.sql b/android/uhabits-core-legacy/src/main/resources/migrations/16.sql similarity index 100% rename from android/uhabits-core/src/main/resources/migrations/16.sql rename to android/uhabits-core-legacy/src/main/resources/migrations/16.sql diff --git a/android/uhabits-core/src/main/resources/migrations/17.sql b/android/uhabits-core-legacy/src/main/resources/migrations/17.sql similarity index 100% rename from android/uhabits-core/src/main/resources/migrations/17.sql rename to android/uhabits-core-legacy/src/main/resources/migrations/17.sql diff --git a/android/uhabits-core/src/main/resources/migrations/18.sql b/android/uhabits-core-legacy/src/main/resources/migrations/18.sql similarity index 100% rename from android/uhabits-core/src/main/resources/migrations/18.sql rename to android/uhabits-core-legacy/src/main/resources/migrations/18.sql diff --git a/android/uhabits-core/src/main/resources/migrations/19.sql b/android/uhabits-core-legacy/src/main/resources/migrations/19.sql similarity index 100% rename from android/uhabits-core/src/main/resources/migrations/19.sql rename to android/uhabits-core-legacy/src/main/resources/migrations/19.sql diff --git a/android/uhabits-core/src/main/resources/migrations/20.sql b/android/uhabits-core-legacy/src/main/resources/migrations/20.sql similarity index 100% rename from android/uhabits-core/src/main/resources/migrations/20.sql rename to android/uhabits-core-legacy/src/main/resources/migrations/20.sql diff --git a/android/uhabits-core/src/main/resources/migrations/21.sql b/android/uhabits-core-legacy/src/main/resources/migrations/21.sql similarity index 100% rename from android/uhabits-core/src/main/resources/migrations/21.sql rename to android/uhabits-core-legacy/src/main/resources/migrations/21.sql diff --git a/android/uhabits-core/src/main/resources/migrations/22.sql b/android/uhabits-core-legacy/src/main/resources/migrations/22.sql similarity index 100% rename from android/uhabits-core/src/main/resources/migrations/22.sql rename to android/uhabits-core-legacy/src/main/resources/migrations/22.sql diff --git a/android/uhabits-core/src/main/resources/migrations/23.sql b/android/uhabits-core-legacy/src/main/resources/migrations/23.sql similarity index 100% rename from android/uhabits-core/src/main/resources/migrations/23.sql rename to android/uhabits-core-legacy/src/main/resources/migrations/23.sql diff --git a/android/uhabits-core/src/main/resources/migrations/24.sql b/android/uhabits-core-legacy/src/main/resources/migrations/24.sql similarity index 100% rename from android/uhabits-core/src/main/resources/migrations/24.sql rename to android/uhabits-core-legacy/src/main/resources/migrations/24.sql diff --git a/android/uhabits-core/src/test/java/org/isoron/platform/gui/JavaCanvasTest.kt b/android/uhabits-core-legacy/src/test/java/org/isoron/platform/gui/JavaCanvasTest.kt similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/platform/gui/JavaCanvasTest.kt rename to android/uhabits-core-legacy/src/test/java/org/isoron/platform/gui/JavaCanvasTest.kt diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/BaseUnitTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/BaseUnitTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/BaseUnitTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/BaseUnitTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommandTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommandTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommandTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/commands/ArchiveHabitsCommandTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommandTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommandTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommandTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommandTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CreateHabitCommandTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/commands/CreateHabitCommandTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CreateHabitCommandTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/commands/CreateHabitCommandTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CreateRepetitionCommandTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/commands/CreateRepetitionCommandTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/CreateRepetitionCommandTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/commands/CreateRepetitionCommandTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/DeleteHabitsCommandTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/commands/DeleteHabitsCommandTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/DeleteHabitsCommandTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/commands/DeleteHabitsCommandTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/EditHabitCommandTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/commands/EditHabitCommandTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/EditHabitCommandTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/commands/EditHabitCommandTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommandTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommandTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommandTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/commands/UnarchiveHabitsCommandTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/database/RepositoryTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/database/RepositoryTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/database/RepositoryTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/database/RepositoryTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/database/migrations/Version22Test.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/database/migrations/Version22Test.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/database/migrations/Version22Test.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/database/migrations/Version22Test.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/database/migrations/Version23Test.kt b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/database/migrations/Version23Test.kt similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/database/migrations/Version23Test.kt rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/database/migrations/Version23Test.kt diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/io/ImportTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/io/ImportTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/io/ImportTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/io/ImportTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/EntryListTest.kt b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/EntryListTest.kt similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/EntryListTest.kt rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/EntryListTest.kt diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/HabitListTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/HabitTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/HabitTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreListTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/ScoreListTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreListTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/ScoreListTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/ScoreTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/ScoreTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/ScoreTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/StreakListTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/StreakListTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/StreakListTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/StreakListTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/TimestampTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/TimestampTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/TimestampTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/TimestampTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/WeekdayListTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/WeekdayListTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/WeekdayListTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/WeekdayListTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryListTest.kt b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryListTest.kt similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryListTest.kt rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryListTest.kt diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitListTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/records/EntryRecordTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/sqlite/records/EntryRecordTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/records/EntryRecordTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/sqlite/records/EntryRecordTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecordTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecordTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecordTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecordTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/preferences/PreferencesTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/preferences/PreferencesTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/preferences/PreferencesTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/preferences/PreferencesTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/preferences/PropertiesStorageTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/preferences/PropertiesStorageTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/preferences/PropertiesStorageTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/preferences/PropertiesStorageTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/reminders/ReminderSchedulerTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/reminders/ReminderSchedulerTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/reminders/ReminderSchedulerTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/reminders/ReminderSchedulerTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/sync/EncryptionExtTest.kt b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/sync/EncryptionExtTest.kt similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/sync/EncryptionExtTest.kt rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/sync/EncryptionExtTest.kt diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunnerTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCacheTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/HintListTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenterTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenterTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenterTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuPresenterTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/views/BarChartTest.kt b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/ui/views/BarChartTest.kt similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/views/BarChartTest.kt rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/ui/views/BarChartTest.kt diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/widgets/WidgetBehaviorTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/ui/widgets/WidgetBehaviorTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/widgets/WidgetBehaviorTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/ui/widgets/WidgetBehaviorTest.java diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/utils/DateUtilsTest.java b/android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/utils/DateUtilsTest.java similarity index 100% rename from android/uhabits-core/src/test/java/org/isoron/uhabits/core/utils/DateUtilsTest.java rename to android/uhabits-core-legacy/src/test/java/org/isoron/uhabits/core/utils/DateUtilsTest.java diff --git a/android/uhabits-core/src/test/resources/databases/021.db b/android/uhabits-core-legacy/src/test/resources/databases/021.db similarity index 100% rename from android/uhabits-core/src/test/resources/databases/021.db rename to android/uhabits-core-legacy/src/test/resources/databases/021.db diff --git a/android/uhabits-core/src/test/resources/databases/022.db b/android/uhabits-core-legacy/src/test/resources/databases/022.db similarity index 100% rename from android/uhabits-core/src/test/resources/databases/022.db rename to android/uhabits-core-legacy/src/test/resources/databases/022.db diff --git a/android/uhabits-core/src/test/resources/habitbull.csv b/android/uhabits-core-legacy/src/test/resources/habitbull.csv similarity index 100% rename from android/uhabits-core/src/test/resources/habitbull.csv rename to android/uhabits-core-legacy/src/test/resources/habitbull.csv diff --git a/android/uhabits-core/src/test/resources/loop.db b/android/uhabits-core-legacy/src/test/resources/loop.db similarity index 100% rename from android/uhabits-core/src/test/resources/loop.db rename to android/uhabits-core-legacy/src/test/resources/loop.db diff --git a/android/uhabits-core/src/test/resources/rewire.db b/android/uhabits-core-legacy/src/test/resources/rewire.db similarity index 100% rename from android/uhabits-core/src/test/resources/rewire.db rename to android/uhabits-core-legacy/src/test/resources/rewire.db diff --git a/android/uhabits-core/src/test/resources/tickmate.db b/android/uhabits-core-legacy/src/test/resources/tickmate.db similarity index 100% rename from android/uhabits-core/src/test/resources/tickmate.db rename to android/uhabits-core-legacy/src/test/resources/tickmate.db diff --git a/android/uhabits-core/build.gradle b/android/uhabits-core/build.gradle index 9f553108d..f6f16dafb 100644 --- a/android/uhabits-core/build.gradle +++ b/android/uhabits-core/build.gradle @@ -1,31 +1,61 @@ -apply plugin: 'idea' -apply plugin: 'java' -apply plugin: 'kotlin' +/* + * Copyright (C) 2016-2019 Álinson Santos Xavier + * + * This file is part of Loop Habit Tracker. + * + * Loop Habit Tracker is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * Loop Habit Tracker is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ -dependencies { - annotationProcessor "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION" - annotationProcessor "com.google.dagger:dagger:$DAGGER_VERSION" - compileOnly "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION" - compileOnly "com.google.dagger:dagger:$DAGGER_VERSION" - compileOnly 'javax.annotation:jsr250-api:1.0' - compileOnly 'org.jetbrains:annotations:18.0.0' - implementation "com.google.guava:guava:30.0-jre" - implementation "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:$KX_COROUTINES_VERSION" - implementation 'androidx.annotation:annotation:1.1.0' - implementation 'com.google.code.findbugs:jsr305:3.0.2' - implementation 'commons-codec:commons-codec:1.15' - implementation 'org.apache.commons:commons-lang3:3.5' - implementation 'com.opencsv:opencsv:3.10' - testImplementation "org.jetbrains.kotlin:kotlin-reflect:$KOTLIN_VERSION" - testImplementation "org.jetbrains.kotlin:kotlin-test:$KOTLIN_VERSION" - testImplementation 'junit:junit:4.12' - testImplementation 'nl.jqno.equalsverifier:equalsverifier:2.4.8' - testImplementation 'org.apache.commons:commons-io:1.3.2' - testImplementation 'org.hamcrest:hamcrest-library:1.4-atlassian-1' - testImplementation 'org.mockito:mockito-core:2.28.2' - testImplementation 'org.xerial:sqlite-jdbc:3.18.0' +plugins { + id 'kotlin-multiplatform' } -sourceCompatibility = "1.8" -targetCompatibility = "1.8" +repositories { + mavenCentral() +} + +kotlin { + jvm() + + sourceSets { + commonMain { + dependencies { + implementation kotlin('stdlib-common') + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.8" + } + } + + commonTest { + dependencies { + implementation kotlin('test-common') + implementation kotlin('test-annotations-common') + } + } + + jvmMain { + dependencies { + implementation kotlin('stdlib-jdk8') + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$KX_COROUTINES_VERSION" + } + } + + jvmTest { + dependencies { + implementation kotlin('test') + implementation kotlin('test-junit') + implementation 'org.xerial:sqlite-jdbc:3.25.2' + } + } + } +} diff --git a/android/uhabits-core/src/main/java/org/isoron/platform/gui/Canvas.kt b/android/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/Canvas.kt similarity index 98% rename from android/uhabits-core/src/main/java/org/isoron/platform/gui/Canvas.kt rename to android/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/Canvas.kt index c8218641d..7e9449c39 100644 --- a/android/uhabits-core/src/main/java/org/isoron/platform/gui/Canvas.kt +++ b/android/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/Canvas.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2019 Álinson Santos Xavier + * Copyright (C) 2016-2020 Álinson Santos Xavier * * This file is part of Loop Habit Tracker. * diff --git a/android/uhabits-core/src/main/java/org/isoron/platform/gui/Color.kt b/android/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/Color.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/platform/gui/Color.kt rename to android/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/Color.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/platform/gui/FontAwesome.kt b/android/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/FontAwesome.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/platform/gui/FontAwesome.kt rename to android/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/FontAwesome.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/platform/gui/Image.kt b/android/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/Image.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/platform/gui/Image.kt rename to android/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/Image.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/platform/gui/View.kt b/android/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/View.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/platform/gui/View.kt rename to android/uhabits-core/src/commonMain/kotlin/org/isoron/platform/gui/View.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/platform/io/Files.kt b/android/uhabits-core/src/commonMain/kotlin/org/isoron/platform/io/Files.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/platform/io/Files.kt rename to android/uhabits-core/src/commonMain/kotlin/org/isoron/platform/io/Files.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/platform/time/Dates.kt b/android/uhabits-core/src/commonMain/kotlin/org/isoron/platform/time/Dates.kt similarity index 96% rename from android/uhabits-core/src/main/java/org/isoron/platform/time/Dates.kt rename to android/uhabits-core/src/commonMain/kotlin/org/isoron/platform/time/Dates.kt index 066f2a304..80be59d29 100644 --- a/android/uhabits-core/src/main/java/org/isoron/platform/time/Dates.kt +++ b/android/uhabits-core/src/commonMain/kotlin/org/isoron/platform/time/Dates.kt @@ -19,7 +19,6 @@ package org.isoron.platform.time -import org.isoron.uhabits.core.models.Timestamp import kotlin.math.abs import kotlin.math.ceil @@ -55,11 +54,6 @@ data class LocalDate(val daysSince2000: Int) { } } - val timestamp: Timestamp - get() { - return Timestamp(946684800000 + daysSince2000.toLong() * 86400000) - } - val year: Int get() { if (yearCache < 0) updateYearMonthDayCache() diff --git a/android/uhabits-core/src/main/java/org/isoron/platform/gui/JavaCanvas.kt b/android/uhabits-core/src/jvmMain/kotlin/org/isoron/platform/gui/JavaCanvas.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/platform/gui/JavaCanvas.kt rename to android/uhabits-core/src/jvmMain/kotlin/org/isoron/platform/gui/JavaCanvas.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/platform/gui/JavaImage.kt b/android/uhabits-core/src/jvmMain/kotlin/org/isoron/platform/gui/JavaImage.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/platform/gui/JavaImage.kt rename to android/uhabits-core/src/jvmMain/kotlin/org/isoron/platform/gui/JavaImage.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/platform/io/JavaFiles.kt b/android/uhabits-core/src/jvmMain/kotlin/org/isoron/platform/io/JavaFiles.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/platform/io/JavaFiles.kt rename to android/uhabits-core/src/jvmMain/kotlin/org/isoron/platform/io/JavaFiles.kt diff --git a/android/uhabits-core/src/main/java/org/isoron/platform/time/JavaDates.kt b/android/uhabits-core/src/jvmMain/kotlin/org/isoron/time/JavaDates.kt similarity index 100% rename from android/uhabits-core/src/main/java/org/isoron/platform/time/JavaDates.kt rename to android/uhabits-core/src/jvmMain/kotlin/org/isoron/time/JavaDates.kt