diff --git a/.env.example b/.env.example deleted file mode 100644 index 2990b8c..0000000 --- a/.env.example +++ /dev/null @@ -1,4 +0,0 @@ -TEST_SERVER_NAME=Subsonic Demo -TEST_SERVER_URL=http://demo.subsonic.org -TEST_SERVER_USERNAME=guest -TEST_SERVER_PASSWORD=guest diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json deleted file mode 100644 index 5cb9b8f..0000000 --- a/.fvm/fvm_config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "flutterSdkVersion": "3.7.11", - "flavors": {} -} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 0574f2a..cacf2f2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related @@ -25,12 +27,11 @@ migrate_working_dir/ **/doc/api/ **/ios/Flutter/.last_build_id .dart_tool/ -.flutter-plugins .flutter-plugins-dependencies -.packages .pub-cache/ .pub/ /build/ +/coverage/ # Symbolication related app.*.symbols @@ -43,7 +44,5 @@ app.*.map.json /android/app/profile /android/app/release -/.env -*.sqlite* -/.fvm/flutter_sdk -*.keystore +# VSCode +.vscode/settings.json diff --git a/.metadata b/.metadata index 25a8e60..0691157 100644 --- a/.metadata +++ b/.metadata @@ -1,11 +1,11 @@ # 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. +# This file should be version controlled and should not be manually edited. version: - revision: 9944297138845a94256f1cf37beb88ff9a8e811a - channel: stable + revision: "9f455d2486bcb28cad87b062475f42edc959f636" + channel: "stable" project_type: app @@ -13,11 +13,11 @@ project_type: app migration: platforms: - platform: root - create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a - base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a + create_revision: 9f455d2486bcb28cad87b062475f42edc959f636 + base_revision: 9f455d2486bcb28cad87b062475f42edc959f636 - platform: android - create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a - base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a + create_revision: 9f455d2486bcb28cad87b062475f42edc959f636 + base_revision: 9f455d2486bcb28cad87b062475f42edc959f636 # User provided section diff --git a/.untranslated-messages.json b/.untranslated-messages.json deleted file mode 100644 index c3c8d17..0000000 --- a/.untranslated-messages.json +++ /dev/null @@ -1,500 +0,0 @@ -{ - "ar": [ - "actionsCancel", - "actionsDelete", - "actionsDownload", - "actionsDownloadCancel", - "actionsDownloadDelete", - "actionsOk", - "controlsShuffle", - "resourcesAlbumCount", - "resourcesArtistCount", - "resourcesFilterAlbum", - "resourcesFilterArtist", - "resourcesFilterOwner", - "resourcesFilterYear", - "resourcesPlaylistCount", - "resourcesSongCount", - "resourcesSongListDeleteAllContent", - "resourcesSongListDeleteAllTitle", - "resourcesSortByAlbum", - "resourcesSortByAlbumCount", - "resourcesSortByTitle", - "resourcesSortByUpdated", - "settingsAboutActionsSupport", - "settingsAboutShareLogs", - "settingsAboutChooseLog", - "settingsNetworkOptionsOfflineMode", - "settingsNetworkOptionsOfflineModeOff", - "settingsNetworkOptionsOfflineModeOn", - "settingsNetworkOptionsStreamFormat", - "settingsNetworkOptionsStreamFormatServerDefault", - "settingsServersFieldsName" - ], - - "ca": [ - "actionsCancel", - "actionsDelete", - "actionsDownload", - "actionsDownloadCancel", - "actionsDownloadDelete", - "actionsOk", - "controlsShuffle", - "resourcesAlbumCount", - "resourcesArtistCount", - "resourcesFilterAlbum", - "resourcesFilterArtist", - "resourcesFilterOwner", - "resourcesFilterYear", - "resourcesPlaylistCount", - "resourcesSongCount", - "resourcesSongListDeleteAllContent", - "resourcesSongListDeleteAllTitle", - "resourcesSortByAlbum", - "resourcesSortByAlbumCount", - "resourcesSortByTitle", - "resourcesSortByUpdated", - "settingsAboutActionsSupport", - "settingsAboutShareLogs", - "settingsAboutChooseLog", - "settingsNetworkOptionsOfflineMode", - "settingsNetworkOptionsOfflineModeOff", - "settingsNetworkOptionsOfflineModeOn", - "settingsNetworkOptionsStreamFormat", - "settingsNetworkOptionsStreamFormatServerDefault", - "settingsServersFieldsName" - ], - - "cs": [ - "resourcesAlbumCount", - "resourcesArtistCount", - "resourcesPlaylistCount", - "resourcesSongCount", - "settingsAboutShareLogs", - "settingsAboutChooseLog", - "settingsMusicName", - "settingsMusicOptionsScrobbleDescriptionOff", - "settingsMusicOptionsScrobbleDescriptionOn", - "settingsMusicOptionsScrobbleTitle", - "settingsNetworkOptionsMaxBufferTitle", - "settingsNetworkOptionsMinBufferTitle", - "settingsNetworkOptionsOfflineMode", - "settingsNetworkOptionsOfflineModeOff", - "settingsNetworkOptionsOfflineModeOn" - ], - - "da": [ - "actionsCancel", - "actionsDelete", - "actionsDownload", - "actionsDownloadCancel", - "actionsDownloadDelete", - "actionsOk", - "actionsStar", - "actionsUnstar", - "controlsShuffle", - "resourcesAlbumCount", - "resourcesArtistCount", - "resourcesFilterAlbum", - "resourcesFilterArtist", - "resourcesFilterOwner", - "resourcesFilterStarred", - "resourcesFilterYear", - "resourcesPlaylistCount", - "resourcesSongCount", - "resourcesSongListDeleteAllContent", - "resourcesSongListDeleteAllTitle", - "resourcesSortByAdded", - "resourcesSortByAlbum", - "resourcesSortByAlbumCount", - "resourcesSortByFrequentlyPlayed", - "resourcesSortByRecentlyPlayed", - "resourcesSortByTitle", - "resourcesSortByUpdated", - "settingsAboutActionsSupport", - "settingsAboutShareLogs", - "settingsAboutChooseLog", - "settingsMusicOptionsScrobbleDescriptionOff", - "settingsNetworkOptionsOfflineMode", - "settingsNetworkOptionsOfflineModeOff", - "settingsNetworkOptionsOfflineModeOn", - "settingsNetworkOptionsStreamFormat", - "settingsNetworkOptionsStreamFormatServerDefault", - "settingsServersFieldsName", - "settingsServersOptionsForcePlaintextPasswordDescriptionOff", - "settingsServersOptionsForcePlaintextPasswordDescriptionOn", - "settingsServersOptionsForcePlaintextPasswordTitle" - ], - - "de": [ - "settingsAboutShareLogs", - "settingsAboutChooseLog" - ], - - "es": [ - "resourcesAlbumCount", - "resourcesArtistCount", - "resourcesFilterAlbum", - "resourcesFilterArtist", - "resourcesFilterOwner", - "resourcesFilterYear", - "resourcesPlaylistCount", - "resourcesSongCount", - "resourcesSongListDeleteAllContent", - "resourcesSongListDeleteAllTitle", - "resourcesSortByAlbum", - "resourcesSortByAlbumCount", - "resourcesSortByTitle", - "resourcesSortByUpdated", - "settingsAboutActionsSupport", - "settingsAboutShareLogs", - "settingsAboutChooseLog", - "settingsNetworkOptionsOfflineMode", - "settingsNetworkOptionsOfflineModeOff", - "settingsNetworkOptionsOfflineModeOn", - "settingsNetworkOptionsStreamFormat", - "settingsNetworkOptionsStreamFormatServerDefault", - "settingsServersFieldsName" - ], - - "fr": [ - "actionsCancel", - "actionsDelete", - "actionsDownload", - "actionsDownloadCancel", - "actionsDownloadDelete", - "actionsOk", - "controlsShuffle", - "resourcesAlbumCount", - "resourcesArtistCount", - "resourcesFilterAlbum", - "resourcesFilterArtist", - "resourcesFilterOwner", - "resourcesFilterYear", - "resourcesPlaylistCount", - "resourcesSongCount", - "resourcesSongListDeleteAllContent", - "resourcesSongListDeleteAllTitle", - "resourcesSortByAlbum", - "resourcesSortByAlbumCount", - "resourcesSortByTitle", - "resourcesSortByUpdated", - "settingsAboutActionsSupport", - "settingsAboutShareLogs", - "settingsAboutChooseLog", - "settingsNetworkOptionsOfflineMode", - "settingsNetworkOptionsOfflineModeOff", - "settingsNetworkOptionsOfflineModeOn", - "settingsNetworkOptionsStreamFormat", - "settingsNetworkOptionsStreamFormatServerDefault", - "settingsServersFieldsName" - ], - - "it": [ - "actionsCancel", - "actionsDelete", - "actionsDownload", - "actionsDownloadCancel", - "actionsDownloadDelete", - "actionsOk", - "controlsShuffle", - "resourcesAlbumCount", - "resourcesArtistCount", - "resourcesFilterAlbum", - "resourcesFilterArtist", - "resourcesFilterOwner", - "resourcesFilterYear", - "resourcesPlaylistCount", - "resourcesSongCount", - "resourcesSongListDeleteAllContent", - "resourcesSongListDeleteAllTitle", - "resourcesSortByAlbum", - "resourcesSortByAlbumCount", - "resourcesSortByTitle", - "resourcesSortByUpdated", - "settingsAboutActionsSupport", - "settingsAboutShareLogs", - "settingsAboutChooseLog", - "settingsNetworkOptionsOfflineMode", - "settingsNetworkOptionsOfflineModeOff", - "settingsNetworkOptionsOfflineModeOn", - "settingsNetworkOptionsStreamFormat", - "settingsNetworkOptionsStreamFormatServerDefault", - "settingsServersFieldsName" - ], - - "ja": [ - "actionsCancel", - "actionsDelete", - "actionsDownload", - "actionsDownloadCancel", - "actionsDownloadDelete", - "actionsOk", - "actionsStar", - "actionsUnstar", - "controlsShuffle", - "messagesNothingHere", - "resourcesAlbumActionsPlay", - "resourcesAlbumActionsView", - "resourcesAlbumCount", - "resourcesAlbumListsSort", - "resourcesArtistActionsView", - "resourcesArtistCount", - "resourcesArtistListsSort", - "resourcesFilterAlbum", - "resourcesFilterArtist", - "resourcesFilterGenre", - "resourcesFilterOwner", - "resourcesFilterYear", - "resourcesPlaylistActionsPlay", - "resourcesPlaylistCount", - "resourcesQueueName", - "resourcesSongCount", - "resourcesSongListDeleteAllContent", - "resourcesSongListDeleteAllTitle", - "resourcesSortByAdded", - "resourcesSortByAlbum", - "resourcesSortByAlbumCount", - "resourcesSortByArtist", - "resourcesSortByName", - "resourcesSortByTitle", - "resourcesSortByUpdated", - "resourcesSortByYear", - "searchHeaderTitle", - "searchMoreResults", - "searchNowPlayingContext", - "settingsAboutActionsLicenses", - "settingsAboutActionsSupport", - "settingsAboutName", - "settingsAboutShareLogs", - "settingsAboutChooseLog", - "settingsAboutVersion", - "settingsMusicOptionsScrobbleDescriptionOff", - "settingsMusicOptionsScrobbleDescriptionOn", - "settingsMusicOptionsScrobbleTitle", - "settingsNetworkOptionsMaxBitrateMobileTitle", - "settingsNetworkOptionsMaxBitrateWifiTitle", - "settingsNetworkOptionsMaxBufferTitle", - "settingsNetworkOptionsMinBufferTitle", - "settingsNetworkOptionsOfflineMode", - "settingsNetworkOptionsOfflineModeOff", - "settingsNetworkOptionsOfflineModeOn", - "settingsNetworkOptionsStreamFormat", - "settingsNetworkOptionsStreamFormatServerDefault", - "settingsNetworkValuesKbps", - "settingsNetworkValuesSeconds", - "settingsNetworkValuesUnlimitedKbps", - "settingsResetActionsClearImageCache", - "settingsServersActionsAdd", - "settingsServersActionsDelete", - "settingsServersActionsEdit", - "settingsServersActionsSave", - "settingsServersActionsTestConnection", - "settingsServersFieldsAddress", - "settingsServersFieldsName", - "settingsServersFieldsPassword", - "settingsServersFieldsUsername", - "settingsServersMessagesConnectionFailed", - "settingsServersMessagesConnectionOk", - "settingsServersOptionsForcePlaintextPasswordDescriptionOff", - "settingsServersOptionsForcePlaintextPasswordDescriptionOn", - "settingsServersOptionsForcePlaintextPasswordTitle" - ], - - "nb": [ - "actionsCancel", - "actionsDelete", - "actionsDownload", - "actionsDownloadCancel", - "actionsDownloadDelete", - "actionsOk", - "controlsShuffle", - "resourcesAlbumCount", - "resourcesArtistCount", - "resourcesFilterAlbum", - "resourcesFilterArtist", - "resourcesFilterOwner", - "resourcesFilterYear", - "resourcesPlaylistCount", - "resourcesSongCount", - "resourcesSongListDeleteAllContent", - "resourcesSongListDeleteAllTitle", - "resourcesSortByAlbum", - "resourcesSortByAlbumCount", - "resourcesSortByTitle", - "resourcesSortByUpdated", - "settingsAboutActionsSupport", - "settingsAboutShareLogs", - "settingsAboutChooseLog", - "settingsNetworkOptionsOfflineMode", - "settingsNetworkOptionsOfflineModeOff", - "settingsNetworkOptionsOfflineModeOn", - "settingsNetworkOptionsStreamFormat", - "settingsNetworkOptionsStreamFormatServerDefault", - "settingsServersFieldsName" - ], - - "pa": [ - "actionsCancel", - "actionsDelete", - "actionsDownload", - "actionsDownloadCancel", - "actionsDownloadDelete", - "actionsOk", - "controlsShuffle", - "resourcesAlbumCount", - "resourcesArtistCount", - "resourcesFilterAlbum", - "resourcesFilterArtist", - "resourcesFilterOwner", - "resourcesFilterYear", - "resourcesPlaylistCount", - "resourcesSongCount", - "resourcesSongListDeleteAllContent", - "resourcesSongListDeleteAllTitle", - "resourcesSortByAlbum", - "resourcesSortByAlbumCount", - "resourcesSortByTitle", - "resourcesSortByUpdated", - "settingsAboutActionsSupport", - "settingsAboutShareLogs", - "settingsAboutChooseLog", - "settingsNetworkOptionsOfflineMode", - "settingsNetworkOptionsOfflineModeOff", - "settingsNetworkOptionsOfflineModeOn", - "settingsNetworkOptionsStreamFormat", - "settingsNetworkOptionsStreamFormatServerDefault", - "settingsServersFieldsName" - ], - - "pl": [ - "actionsCancel", - "actionsDelete", - "actionsDownload", - "actionsDownloadCancel", - "actionsDownloadDelete", - "actionsOk", - "controlsShuffle", - "resourcesAlbumCount", - "resourcesArtistCount", - "resourcesFilterAlbum", - "resourcesFilterArtist", - "resourcesFilterOwner", - "resourcesFilterYear", - "resourcesPlaylistCount", - "resourcesSongCount", - "resourcesSongListDeleteAllContent", - "resourcesSongListDeleteAllTitle", - "resourcesSortByAlbum", - "resourcesSortByAlbumCount", - "resourcesSortByTitle", - "resourcesSortByUpdated", - "settingsAboutActionsSupport", - "settingsAboutShareLogs", - "settingsAboutChooseLog", - "settingsNetworkOptionsOfflineMode", - "settingsNetworkOptionsOfflineModeOff", - "settingsNetworkOptionsOfflineModeOn", - "settingsNetworkOptionsStreamFormat", - "settingsNetworkOptionsStreamFormatServerDefault", - "settingsServersFieldsName" - ], - - "pt": [ - "resourcesAlbumCount", - "resourcesArtistCount", - "resourcesFilterOwner", - "resourcesPlaylistCount", - "resourcesSongCount", - "resourcesSongListDeleteAllContent", - "resourcesSongListDeleteAllTitle", - "resourcesSortByAlbumCount", - "resourcesSortByUpdated", - "settingsAboutShareLogs", - "settingsAboutChooseLog", - "settingsNetworkOptionsStreamFormatServerDefault", - "settingsServersFieldsName" - ], - - "tr": [ - "actionsCancel", - "actionsDelete", - "actionsDownload", - "actionsDownloadCancel", - "actionsDownloadDelete", - "actionsOk", - "controlsShuffle", - "resourcesAlbumCount", - "resourcesArtistCount", - "resourcesFilterAlbum", - "resourcesFilterArtist", - "resourcesFilterOwner", - "resourcesFilterYear", - "resourcesPlaylistCount", - "resourcesSongCount", - "resourcesSongListDeleteAllContent", - "resourcesSongListDeleteAllTitle", - "resourcesSortByAlbum", - "resourcesSortByAlbumCount", - "resourcesSortByTitle", - "resourcesSortByUpdated", - "settingsAboutActionsSupport", - "settingsAboutShareLogs", - "settingsAboutChooseLog", - "settingsNetworkOptionsOfflineMode", - "settingsNetworkOptionsOfflineModeOff", - "settingsNetworkOptionsOfflineModeOn", - "settingsNetworkOptionsStreamFormat", - "settingsNetworkOptionsStreamFormatServerDefault", - "settingsServersFieldsName" - ], - - "vi": [ - "actionsCancel", - "actionsDelete", - "actionsDownload", - "actionsDownloadCancel", - "actionsDownloadDelete", - "actionsOk", - "controlsShuffle", - "resourcesAlbumCount", - "resourcesArtistCount", - "resourcesFilterAlbum", - "resourcesFilterArtist", - "resourcesFilterOwner", - "resourcesFilterYear", - "resourcesPlaylistCount", - "resourcesSongCount", - "resourcesSongListDeleteAllContent", - "resourcesSongListDeleteAllTitle", - "resourcesSortByAlbum", - "resourcesSortByAlbumCount", - "resourcesSortByTitle", - "resourcesSortByUpdated", - "settingsAboutActionsSupport", - "settingsAboutShareLogs", - "settingsAboutChooseLog", - "settingsNetworkOptionsOfflineMode", - "settingsNetworkOptionsOfflineModeOff", - "settingsNetworkOptionsOfflineModeOn", - "settingsNetworkOptionsStreamFormat", - "settingsNetworkOptionsStreamFormatServerDefault", - "settingsServersFieldsName" - ], - - "zh": [ - "controlsShuffle", - "resourcesAlbumCount", - "resourcesArtistCount", - "resourcesPlaylistCount", - "resourcesSongCount", - "settingsAboutShareLogs", - "settingsAboutChooseLog", - "settingsNetworkOptionsOfflineMode", - "settingsNetworkOptionsOfflineModeOff", - "settingsNetworkOptionsOfflineModeOn", - "settingsNetworkOptionsStreamFormat", - "settingsNetworkOptionsStreamFormatServerDefault", - "settingsServersFieldsName" - ] -} diff --git a/analysis_options.yaml b/analysis_options.yaml index 3b059d1..f9b3034 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,19 +1 @@ include: package:flutter_lints/flutter.yaml - -linter: - rules: - prefer_relative_imports: true - -analyzer: - exclude: - - '**.freezed.dart' - - '**.g.dart' - - '**.gr.dart' - plugins: - # broken currently and may not get fixed - # https://github.com/simolus3/drift/issues/2342 - # - drift - - # also broken but only recently reported - # https://github.com/rrousselGit/riverpod/issues/2180 - # - custom_lint diff --git a/android/.gitignore b/android/.gitignore index 6f56801..be3943c 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -5,9 +5,10 @@ gradle-wrapper.jar /gradlew.bat /local.properties GeneratedPluginRegistrant.java +.cxx/ # Remember to never publicly share your keystore. -# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +# See https://flutter.dev/to/reference-keystore key.properties **/*.keystore **/*.jks diff --git a/android/app/build.gradle b/android/app/build.gradle deleted file mode 100644 index aa6b4ec..0000000 --- a/android/app/build.gradle +++ /dev/null @@ -1,88 +0,0 @@ -def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') -if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> - localProperties.load(reader) - } -} - -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') -if (flutterVersionCode == null) { - flutterVersionCode = '1' -} - -def flutterVersionName = localProperties.getProperty('flutter.versionName') -if (flutterVersionName == null) { - flutterVersionName = '1.0' -} - -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - -def keystoreProperties = new Properties() -def keystorePropertiesFile = rootProject.file('key.properties') -if (keystorePropertiesFile.exists()) { - keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) -} - -android { - compileSdkVersion flutter.compileSdkVersion - ndkVersion flutter.ndkVersion - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = '1.8' - } - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } - - defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.subtracks2" - // You can update the following values to match your application needs. - // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. - minSdkVersion 19 - targetSdkVersion flutter.targetSdkVersion - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName - } - - signingConfigs { - release { - keyAlias keystoreProperties['keyAlias'] - keyPassword keystoreProperties['keyPassword'] - storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null - storePassword keystoreProperties['storePassword'] - } - } - - buildTypes { - release { - if (project.hasProperty("signRelease")) { - signingConfig signingConfigs.release - } else { - signingConfig signingConfigs.debug - } - } - } -} - -flutter { - source '../..' -} - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts new file mode 100644 index 0000000..71979fa --- /dev/null +++ b/android/app/build.gradle.kts @@ -0,0 +1,41 @@ +plugins { + id("com.android.application") + id("kotlin-android") + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id("dev.flutter.flutter-gradle-plugin") +} + +android { + namespace = "com.subtracks2" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + + kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() } + + defaultConfig { + // TODO: Specify your own unique Application ID + // (https://developer.android.com/studio/build/application-id.html). + applicationId = "com.subtracks2" + // You can update the following values to match your application needs. + // For more information, see: https://flutter.dev/to/review-gradle-config. + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutter.versionCode + versionName = flutter.versionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig = signingConfigs.getByName("debug") + } + } +} + +flutter { source = "../.." } diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index a4bd2dd..399f698 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + + android:name="io.flutter.embedding.android.NormalTheme" + android:resource="@style/NormalTheme" + /> - - + + - - - - - - - - - - - - - - - - - + android:name="flutterEmbedding" + android:value="2" /> + - - + In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. --> + + + + + + diff --git a/android/app/src/main/ic_launcher-playstore.png b/android/app/src/main/ic_launcher-playstore.png deleted file mode 100644 index eac0bfb..0000000 Binary files a/android/app/src/main/ic_launcher-playstore.png and /dev/null differ diff --git a/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java b/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java deleted file mode 100644 index 752fc18..0000000 --- a/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java +++ /dev/null @@ -1,25 +0,0 @@ -// Generated file. -// -// If you wish to remove Flutter's multidex support, delete this entire file. -// -// Modifications to this file should be done in a copy under a different name -// as this file may be regenerated. - -package io.flutter.app; - -import android.app.Application; -import android.content.Context; -import androidx.annotation.CallSuper; -import androidx.multidex.MultiDex; - -/** - * Extension of {@link android.app.Application}, adding multidex support. - */ -public class FlutterMultiDexApplication extends Application { - @Override - @CallSuper - protected void attachBaseContext(Context base) { - super.attachBaseContext(base); - MultiDex.install(this); - } -} diff --git a/android/app/src/main/kotlin/com/example/subtracks2/MainActivity.kt b/android/app/src/main/kotlin/com/example/subtracks_2/MainActivity.kt similarity index 64% rename from android/app/src/main/kotlin/com/example/subtracks2/MainActivity.kt rename to android/app/src/main/kotlin/com/example/subtracks_2/MainActivity.kt index abfaee9..10045a9 100644 --- a/android/app/src/main/kotlin/com/example/subtracks2/MainActivity.kt +++ b/android/app/src/main/kotlin/com/example/subtracks_2/MainActivity.kt @@ -2,5 +2,4 @@ package com.subtracks2 import io.flutter.embedding.android.FlutterActivity -class MainActivity: FlutterActivity() { -} +class MainActivity : FlutterActivity() diff --git a/android/app/src/main/res/drawable-anydpi-v24/ic_stat_name.xml b/android/app/src/main/res/drawable-anydpi-v24/ic_stat_name.xml deleted file mode 100644 index be08eb4..0000000 --- a/android/app/src/main/res/drawable-anydpi-v24/ic_stat_name.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - diff --git a/android/app/src/main/res/drawable-anydpi/ic_action_name.xml b/android/app/src/main/res/drawable-anydpi/ic_action_name.xml deleted file mode 100644 index c43b2d9..0000000 --- a/android/app/src/main/res/drawable-anydpi/ic_action_name.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - diff --git a/android/app/src/main/res/drawable-hdpi/ic_action_name.png b/android/app/src/main/res/drawable-hdpi/ic_action_name.png deleted file mode 100644 index 64abb59..0000000 Binary files a/android/app/src/main/res/drawable-hdpi/ic_action_name.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-hdpi/ic_stat_name.png b/android/app/src/main/res/drawable-hdpi/ic_stat_name.png deleted file mode 100644 index 86f9858..0000000 Binary files a/android/app/src/main/res/drawable-hdpi/ic_stat_name.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-mdpi/ic_action_name.png b/android/app/src/main/res/drawable-mdpi/ic_action_name.png deleted file mode 100644 index 5a900c1..0000000 Binary files a/android/app/src/main/res/drawable-mdpi/ic_action_name.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-mdpi/ic_stat_name.png b/android/app/src/main/res/drawable-mdpi/ic_stat_name.png deleted file mode 100644 index e14e26b..0000000 Binary files a/android/app/src/main/res/drawable-mdpi/ic_stat_name.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-xhdpi/ic_action_name.png b/android/app/src/main/res/drawable-xhdpi/ic_action_name.png deleted file mode 100644 index 379f75d..0000000 Binary files a/android/app/src/main/res/drawable-xhdpi/ic_action_name.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-xhdpi/ic_stat_name.png b/android/app/src/main/res/drawable-xhdpi/ic_stat_name.png deleted file mode 100644 index d102f7e..0000000 Binary files a/android/app/src/main/res/drawable-xhdpi/ic_stat_name.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_action_name.png b/android/app/src/main/res/drawable-xxhdpi/ic_action_name.png deleted file mode 100644 index 9a7db09..0000000 Binary files a/android/app/src/main/res/drawable-xxhdpi/ic_action_name.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_stat_name.png b/android/app/src/main/res/drawable-xxhdpi/ic_stat_name.png deleted file mode 100644 index 926e3c7..0000000 Binary files a/android/app/src/main/res/drawable-xxhdpi/ic_stat_name.png and /dev/null differ diff --git a/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/android/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 113545b..0000000 --- a/android/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 7353dbd..0000000 --- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 7353dbd..0000000 --- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 61c8e8a..db77bb4 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index 7792ca9..0000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 1b67064..0000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index e510138..17987b7 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index 1b43bb5..0000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 3f91ff3..0000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 8f708b9..09d4391 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index 98f09f4..0000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 7f8b7c8..0000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 2c8f85a..d5f1c8d 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 8a59f8c..0000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 95e66ab..0000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 98ff4bf..4d6372e 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index b55ebb4..0000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index bd4b0a0..0000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/raw/keep.xml b/android/app/src/main/res/raw/keep.xml deleted file mode 100644 index 6ea5669..0000000 --- a/android/app/src/main/res/raw/keep.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/android/app/src/main/res/values/ic_launcher_background.xml b/android/app/src/main/res/values/ic_launcher_background.xml deleted file mode 100644 index 8b8532c..0000000 --- a/android/app/src/main/res/values/ic_launcher_background.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #6A1B9A - \ No newline at end of file diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml index a4bd2dd..399f698 100644 --- a/android/app/src/profile/AndroidManifest.xml +++ b/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,4 @@ - +