diff --git a/.metadata b/.metadata deleted file mode 100644 index 8566542..0000000 --- a/.metadata +++ /dev/null @@ -1,42 +0,0 @@ -# This file tracks properties of this Flutter project. -# Used by Flutter tool to assess capabilities and perform upgrades etc. -# -# This file should be version controlled. - -version: - revision: 135454af32477f815a7525073027a3ff9eff1bfd - channel: stable - -project_type: app - -# Tracks metadata for the flutter migrate command -migration: - platforms: - - platform: root - create_revision: 135454af32477f815a7525073027a3ff9eff1bfd - base_revision: 135454af32477f815a7525073027a3ff9eff1bfd - - platform: android - create_revision: 135454af32477f815a7525073027a3ff9eff1bfd - base_revision: 135454af32477f815a7525073027a3ff9eff1bfd - - platform: ios - create_revision: 135454af32477f815a7525073027a3ff9eff1bfd - base_revision: 135454af32477f815a7525073027a3ff9eff1bfd - - platform: linux - create_revision: 135454af32477f815a7525073027a3ff9eff1bfd - base_revision: 135454af32477f815a7525073027a3ff9eff1bfd - - platform: macos - create_revision: 135454af32477f815a7525073027a3ff9eff1bfd - base_revision: 135454af32477f815a7525073027a3ff9eff1bfd - - platform: windows - create_revision: 135454af32477f815a7525073027a3ff9eff1bfd - base_revision: 135454af32477f815a7525073027a3ff9eff1bfd - - # User provided section - - # List of Local paths (relative to this file) that should be - # ignored by the migrate tool. - # - # Files that are not part of the templates will be ignored by default. - unmanaged_files: - - 'lib/main.dart' - - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/README.md b/README.md index c058bea..186f397 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# nextcloud_reminder +# todotxt_reminder A Reminder based on todo.txt synced via nextcloud @@ -10,6 +10,7 @@ A Reminder based on todo.txt synced via nextcloud - [x] save/load data to/from disk - [x] adding/removing tasks - [x] respect ordering that was used when starting the app when saving. +- [ ] add annoying pop-up message so you actually do your tasks ^^ - [ ] add Nextcloud-login for getting a Token - [ ] use webdav for synchronizing with Nextcloud using that token - [ ] sorting by "next up", "priority" diff --git a/android/app/build.gradle b/android/app/build.gradle index f7f5c4c..51c8c4b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,10 +26,13 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion flutter.compileSdkVersion + //compileSdkVersion flutter.compileSdkVersion + compileSdkVersion 33 //default: 31, flutter_local_notification needs min 33 ndkVersion flutter.ndkVersion compileOptions { + //coreLibraryDesugaringEnabled true //flutter_local_notification + sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } @@ -43,14 +46,18 @@ android { } defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "cloud.dresselhaus.nextcloud_reminder.nextcloud_reminder" + applicationId "cloud.dresselhaus.todotxt_reminder" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. - minSdkVersion flutter.minSdkVersion - targetSdkVersion flutter.targetSdkVersion + //minSdkVersion flutter.minSdkVersion + minSdkVersion 20 + //targetSdkVersion flutter.targetSdkVersion + targetSdkVersion 33 //flutter.targetSdkVersion //33 = Android 13 = needed for request of notification-permissions. versionCode flutterVersionCode.toInteger() versionName flutterVersionName + + //flutter_local_notification + multiDexEnabled true } buildTypes { @@ -67,5 +74,8 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.0' //1.1.5 + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation 'androidx.window:window:1.0.0' //flutter_local_notification for Android 12L + implementation 'androidx.window:window-java:1.0.0' //flutter_local_notification for Android 12L } diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro new file mode 100644 index 0000000..b5a0907 --- /dev/null +++ b/android/app/proguard-rules.pro @@ -0,0 +1,28 @@ +# FROM: https://github.com/MaikuB/flutter_local_notifications/blob/master/flutter_local_notifications/example/android/app/proguard-rules.pro +## Gson rules +# Gson uses generic type information stored in a class file when working with fields. Proguard +# removes such information by default, so configure it to keep all of it. +-keepattributes Signature + +# For using GSON @Expose annotation +-keepattributes *Annotation* + +# Gson specific classes +-dontwarn sun.misc.** +#-keep class com.google.gson.stream.** { *; } + +# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory, +# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter) +-keep class * extends com.google.gson.TypeAdapter +-keep class * implements com.google.gson.TypeAdapterFactory +-keep class * implements com.google.gson.JsonSerializer +-keep class * implements com.google.gson.JsonDeserializer + +# Prevent R8 from leaving Data object members always null +-keepclassmembers,allowobfuscation class * { + @com.google.gson.annotations.SerializedName ; +} + +# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher. +-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken +-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken \ No newline at end of file diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index 93b2c53..21a61e3 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="cloud.dresselhaus.todotxt_reminder"> + + + \ No newline at end of file diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml index 93b2c53..8cf7258 100644 --- a/android/app/src/profile/AndroidManifest.xml +++ b/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="cloud.dresselhaus.todotxt_reminder">