From de7e5d16f0d869f1c42e9d2423a18bbe07872ec2 Mon Sep 17 00:00:00 2001 From: Felipe Passos Date: Fri, 20 Sep 2024 16:34:13 -0300 Subject: [PATCH] fix: android --- .DS_Store | Bin 8196 -> 8196 bytes .flutter-plugins-dependencies | 2 +- .idea/libraries/Dart_SDK.xml | 19 ++++ .idea/libraries/KotlinJavaRuntime.xml | 15 +++ .idea/modules.xml | 9 ++ .idea/runConfigurations/main_dart.xml | 6 ++ .idea/workspace.xml | 36 +++++++ .metadata | 25 +---- analysis_options.yaml | 28 ++++++ android.old/.gitignore | 13 +++ {android => android.old}/.idea/.gitignore | 0 {android => android.old}/.idea/compiler.xml | 0 {android => android.old}/.idea/gradle.xml | 0 .../.idea/jarRepositories.xml | 0 {android => android.old}/.idea/kotlinc.xml | 0 {android => android.old}/.idea/misc.xml | 0 {android => android.old}/.idea/vcs.xml | 0 {android => android.old}/app/.DS_Store | Bin android.old/app/build.gradle | 95 ++++++++++++++++++ .../app/release/app-release.aab | Bin android.old/app/src/debug/AndroidManifest.xml | 7 ++ android.old/app/src/main/AndroidManifest.xml | 48 +++++++++ .../tech/bunnie/hub_finder/MainActivity.kt | 0 .../res/drawable-v21/launch_background.xml | 12 +++ .../main/res/drawable/launch_background.xml | 12 +++ .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 1649 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 986 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 1723 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 3158 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 3321 bytes .../app/src/main/res/values-night/styles.xml | 18 ++++ .../app/src/main/res/values/styles.xml | 18 ++++ .../app/src/profile/AndroidManifest.xml | 7 ++ android.old/build.gradle | 37 +++++++ android.old/gradle.properties | 3 + .../gradle/wrapper/gradle-wrapper.properties | 6 ++ android.old/hub_finder_android.iml | 29 ++++++ android.old/settings.gradle | 11 ++ android/.gitignore | 2 +- android/app/build.gradle | 60 +++++------ android/app/src/debug/AndroidManifest.xml | 6 +- android/app/src/main/AndroidManifest.xml | 33 +++--- .../com/berkspar/hub_finder/MainActivity.kt | 5 + .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 1649 -> 544 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 986 -> 442 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 1723 -> 721 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 3158 -> 1031 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 3321 -> 1443 bytes .../app/src/main/res/values-night/styles.xml | 4 +- android/app/src/main/res/values/styles.xml | 12 +-- android/app/src/profile/AndroidManifest.xml | 6 +- android/build.gradle | 23 +---- android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 3 +- android/settings.gradle | 30 ++++-- hub_finder.iml | 17 ++++ 56 files changed, 536 insertions(+), 123 deletions(-) create mode 100644 .idea/libraries/Dart_SDK.xml create mode 100644 .idea/libraries/KotlinJavaRuntime.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/runConfigurations/main_dart.xml create mode 100644 .idea/workspace.xml create mode 100644 analysis_options.yaml create mode 100644 android.old/.gitignore rename {android => android.old}/.idea/.gitignore (100%) rename {android => android.old}/.idea/compiler.xml (100%) rename {android => android.old}/.idea/gradle.xml (100%) rename {android => android.old}/.idea/jarRepositories.xml (100%) rename {android => android.old}/.idea/kotlinc.xml (100%) rename {android => android.old}/.idea/misc.xml (100%) rename {android => android.old}/.idea/vcs.xml (100%) rename {android => android.old}/app/.DS_Store (100%) create mode 100644 android.old/app/build.gradle rename {android => android.old}/app/release/app-release.aab (100%) create mode 100644 android.old/app/src/debug/AndroidManifest.xml create mode 100644 android.old/app/src/main/AndroidManifest.xml rename {android => android.old}/app/src/main/kotlin/tech/bunnie/hub_finder/MainActivity.kt (100%) create mode 100644 android.old/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 android.old/app/src/main/res/drawable/launch_background.xml create mode 100644 android.old/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 android.old/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 android.old/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 android.old/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 android.old/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 android.old/app/src/main/res/values-night/styles.xml create mode 100644 android.old/app/src/main/res/values/styles.xml create mode 100644 android.old/app/src/profile/AndroidManifest.xml create mode 100644 android.old/build.gradle create mode 100644 android.old/gradle.properties create mode 100644 android.old/gradle/wrapper/gradle-wrapper.properties create mode 100644 android.old/hub_finder_android.iml create mode 100644 android.old/settings.gradle create mode 100644 android/app/src/main/kotlin/com/berkspar/hub_finder/MainActivity.kt create mode 100644 hub_finder.iml diff --git a/.DS_Store b/.DS_Store index a69e118cbb86514fb28ea7c7f2cabcb4382c15f1..3e849f1e3ef5230b8d1cee536903de54aa5b1f43 100644 GIT binary patch delta 144 zcmZp1XmOa}mJU^hRb`eq)1w@iwn42cYRK%B!+$xzIY3B>UX`3waNB|vsQP^Nft zgP6qRE24sve+tP?o*^nI$_>_$!cYX1&tynp&;!yrli7s7%JMN}FqASR0Zm8)%H#p% gQh}=Ufb3kLif01yn|})jFmGm;_{Or?QG}ft0FZ4Z761SM delta 48 zcmV-00MGw~K!iY$PXQ#cP`eKSB(n? + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/KotlinJavaRuntime.xml b/.idea/libraries/KotlinJavaRuntime.xml new file mode 100644 index 0000000..2b96ac4 --- /dev/null +++ b/.idea/libraries/KotlinJavaRuntime.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..94aa6bf --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/runConfigurations/main_dart.xml b/.idea/runConfigurations/main_dart.xml new file mode 100644 index 0000000..aab7b5c --- /dev/null +++ b/.idea/runConfigurations/main_dart.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..5b3388c --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.metadata b/.metadata index d22992e..c689480 100644 --- a/.metadata +++ b/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: "db7ef5bf9f59442b0e200a90587e8fa5e0c6336a" + revision: "2663184aa79047d0a33a14a3b607954f8fdd8730" channel: "stable" project_type: app @@ -13,26 +13,11 @@ project_type: app migration: platforms: - platform: root - create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a - base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a + create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730 + base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730 - platform: android - create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a - base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a - - platform: ios - create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a - base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a - - platform: linux - create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a - base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a - - platform: macos - create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a - base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a - - platform: web - create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a - base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a - - platform: windows - create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a - base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a + create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730 + base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730 # User provided section diff --git a/analysis_options.yaml b/analysis_options.yaml new file mode 100644 index 0000000..0d29021 --- /dev/null +++ b/analysis_options.yaml @@ -0,0 +1,28 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at https://dart.dev/lints. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/android.old/.gitignore b/android.old/.gitignore new file mode 100644 index 0000000..6f56801 --- /dev/null +++ b/android.old/.gitignore @@ -0,0 +1,13 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java + +# Remember to never publicly share your keystore. +# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +key.properties +**/*.keystore +**/*.jks diff --git a/android/.idea/.gitignore b/android.old/.idea/.gitignore similarity index 100% rename from android/.idea/.gitignore rename to android.old/.idea/.gitignore diff --git a/android/.idea/compiler.xml b/android.old/.idea/compiler.xml similarity index 100% rename from android/.idea/compiler.xml rename to android.old/.idea/compiler.xml diff --git a/android/.idea/gradle.xml b/android.old/.idea/gradle.xml similarity index 100% rename from android/.idea/gradle.xml rename to android.old/.idea/gradle.xml diff --git a/android/.idea/jarRepositories.xml b/android.old/.idea/jarRepositories.xml similarity index 100% rename from android/.idea/jarRepositories.xml rename to android.old/.idea/jarRepositories.xml diff --git a/android/.idea/kotlinc.xml b/android.old/.idea/kotlinc.xml similarity index 100% rename from android/.idea/kotlinc.xml rename to android.old/.idea/kotlinc.xml diff --git a/android/.idea/misc.xml b/android.old/.idea/misc.xml similarity index 100% rename from android/.idea/misc.xml rename to android.old/.idea/misc.xml diff --git a/android/.idea/vcs.xml b/android.old/.idea/vcs.xml similarity index 100% rename from android/.idea/vcs.xml rename to android.old/.idea/vcs.xml diff --git a/android/app/.DS_Store b/android.old/app/.DS_Store similarity index 100% rename from android/app/.DS_Store rename to android.old/app/.DS_Store diff --git a/android.old/app/build.gradle b/android.old/app/build.gradle new file mode 100644 index 0000000..401cd84 --- /dev/null +++ b/android.old/app/build.gradle @@ -0,0 +1,95 @@ +def localProperties = new Properties() +def localPropertiesFile = rootProject.file('local.properties') +if (localPropertiesFile.exists()) { + localPropertiesFile.withReader('UTF-8') { reader -> + localProperties.load(reader) + } +} + +def keystoreProperties = new Properties() +def keystorePropertiesFile = rootProject.file('key.properties') +if (keystorePropertiesFile.exists()) { + keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) +} + +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' +// START: FlutterFire Configuration +apply plugin: 'com.google.gms.google-services' +apply plugin: 'com.google.firebase.firebase-perf' +apply plugin: 'com.google.firebase.crashlytics' +// END: FlutterFire Configuration +apply plugin: 'kotlin-android' +apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" + +android { + compileSdkVersion 33 + + compileOptions { + coreLibraryDesugaringEnabled true + + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = '1.8' + } + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } + + defaultConfig { + applicationId "tech.bunnie.hub_finder" + minSdkVersion 21 + targetSdkVersion flutter.targetSdkVersion + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName + multiDexEnabled true + } + + signingConfigs { + release { + keyAlias keystoreProperties['keyAlias'] + keyPassword keystoreProperties['keyPassword'] + storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null + storePassword keystoreProperties['storePassword'] + } + } + + buildTypes { + release { + signingConfig signingConfigs.release + } + } +} + +flutter { + source '../..' +} + +dependencies { + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2' + + implementation 'androidx.window:window:1.0.0' + implementation 'androidx.window:window-java:1.0.0' + + implementation 'com.google.android.play:review:2.0.1' + implementation 'com.google.android.play:review-ktx:2.0.1' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" +} diff --git a/android/app/release/app-release.aab b/android.old/app/release/app-release.aab similarity index 100% rename from android/app/release/app-release.aab rename to android.old/app/release/app-release.aab diff --git a/android.old/app/src/debug/AndroidManifest.xml b/android.old/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..2cb931b --- /dev/null +++ b/android.old/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/android.old/app/src/main/AndroidManifest.xml b/android.old/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..2a47a70 --- /dev/null +++ b/android.old/app/src/main/AndroidManifest.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/app/src/main/kotlin/tech/bunnie/hub_finder/MainActivity.kt b/android.old/app/src/main/kotlin/tech/bunnie/hub_finder/MainActivity.kt similarity index 100% rename from android/app/src/main/kotlin/tech/bunnie/hub_finder/MainActivity.kt rename to android.old/app/src/main/kotlin/tech/bunnie/hub_finder/MainActivity.kt diff --git a/android.old/app/src/main/res/drawable-v21/launch_background.xml b/android.old/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/android.old/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/android.old/app/src/main/res/drawable/launch_background.xml b/android.old/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 0000000..304732f --- /dev/null +++ b/android.old/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/android.old/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android.old/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..e2d9ea7d40a727732d87fc16de9d703bd4807846 GIT binary patch literal 1649 zcmV-%29EiOP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00002 zVoOIv0RM-N%)bBt1&m2VK~!ko&6;g!lt&Q9#~5SI%k%8crfs5aO08mSP1GoeDArcW7S;5*i>tB zCYs#+`yu4a>D}$#b1!D+>)gZdc4lX1XNJh(a^;9Od9ysI&TuPtaUc8G%N{<1W_b+v4?$;P=c}44Y|i& zVNIk_@r4;Krpxu*#GR%nLE`1(qRO5@X>p>-ctKS0&#K!I%)nmt@JX?O^W#8c7xQ7h z6AMfLs*@XJ30X1Fh;ecYx0w5k0n}CAVNG;KlVZ*02Gtq)G(`>MS6=y}{RX8(i!(wL z@$cLhPnZByA78RdqI2<7xk%ke1WW+xri=n9RV?O?MB*qY@GV(J=|;wqixQ91k7TdV zNAVO`V2cg@19sKadlN0F~hbj7NH>sH8JI{*0%z$L6jc9bV56SHs_et5B1`$u@6 zJBx^j(w}EfWYsC?g&*~p;NVa{h4=9N|KKn+=~UMp7?X8KtMNs zz=A*)nTdRCMOzqM!>eN(*~QL*fNosCE>xi$Yw#tS@K0DxL!gzE{+wC*5&rGfjSk#E zJ38Tupl6nTxbumI@s(JBOqUVRH5Np~`%F^UWB|#7(JP>CmXK<)1Sx2u$Lk8U$-W89-=%+!0(0e80XQ+gi$hymw6e5frq z41P+JHIa`;Rv(SEXmN;h2fIR=T+&Ok*O~MSGm(YS#*(c)Spy|K@!2Dt z4{HK9JdToQf3143{{)sS;VX}$EUd1J_d*xWE#9HLNeAjtwIsrn@~vFinDo}d$&5*n znlJN)RP%+1QtT4GnKYaZQLgX4rtw>RD=9d)MFovC=_#hkvcx0tZL!*X03+RA&g}^{ zRz-C4AS3KzeeKaPPMatLq!&wp!&;;zYq_L@-z?(BH)OsH8s7g-rE z$}+iy5Aiwn1jYv2_>x+r%pOWESLlsIhCb{s)LTO#V<@qq+b903~!qSaf7zbY(hY za%Ew3WdJfTGB7PMFfB1SR53C-FflqaFe@-HIxsK+P%&5l001R)MObuXVRU6WZEs|0 vW_bWIFfuSLF)%GLI8-q*IxsOhGcYSKFgh?Wa1Dv%00000NkvXXu0mjfUTE>2 literal 0 HcmV?d00001 diff --git a/android.old/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android.old/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..f3a1fa5be823f481d97a6e92c9c988af714a8266 GIT binary patch literal 986 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 wX=Zrn+a literal 0 HcmV?d00001 diff --git a/android.old/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android.old/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..43063c9eb5d1837f6ffbaf10b50ca96ff06d2db5 GIT binary patch literal 3321 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 Dt=SYy literal 0 HcmV?d00001 diff --git a/android.old/app/src/main/res/values-night/styles.xml b/android.old/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..449a9f9 --- /dev/null +++ b/android.old/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/android.old/app/src/main/res/values/styles.xml b/android.old/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..1f83a33 --- /dev/null +++ b/android.old/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/android.old/app/src/profile/AndroidManifest.xml b/android.old/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..2cb931b --- /dev/null +++ b/android.old/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/android.old/build.gradle b/android.old/build.gradle new file mode 100644 index 0000000..fe4cdaf --- /dev/null +++ b/android.old/build.gradle @@ -0,0 +1,37 @@ +buildscript { + ext.kotlin_version = '1.8.21' + + repositories { + google() + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:7.3.1' + // START: FlutterFire Configuration + classpath 'com.google.gms:google-services:4.4.0' + classpath 'com.google.firebase:perf-plugin:1.4.1' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1' + // END: FlutterFire Configuration + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +allprojects { + repositories { + google() + mavenCentral() + } +} + +rootProject.buildDir = '../build' +subprojects { + project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { + project.evaluationDependsOn(':app') +} + +tasks.register("clean", Delete) { + delete rootProject.buildDir +} diff --git a/android.old/gradle.properties b/android.old/gradle.properties new file mode 100644 index 0000000..94adc3a --- /dev/null +++ b/android.old/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true diff --git a/android.old/gradle/wrapper/gradle-wrapper.properties b/android.old/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..cfe88f6 --- /dev/null +++ b/android.old/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri Jun 23 08:50:38 CEST 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip diff --git a/android.old/hub_finder_android.iml b/android.old/hub_finder_android.iml new file mode 100644 index 0000000..1899969 --- /dev/null +++ b/android.old/hub_finder_android.iml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/android.old/settings.gradle b/android.old/settings.gradle new file mode 100644 index 0000000..44e62bc --- /dev/null +++ b/android.old/settings.gradle @@ -0,0 +1,11 @@ +include ':app' + +def localPropertiesFile = new File(rootProject.projectDir, "local.properties") +def properties = new Properties() + +assert localPropertiesFile.exists() +localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + +def flutterSdkPath = properties.getProperty("flutter.sdk") +assert flutterSdkPath != null, "flutter.sdk not set in local.properties" +apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/android/.gitignore b/android/.gitignore index 6f56801..55afd91 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -7,7 +7,7 @@ gradle-wrapper.jar GeneratedPluginRegistrant.java # 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 index 401cd84..7044fa5 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -27,43 +27,40 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -// START: FlutterFire Configuration -apply plugin: 'com.google.gms.google-services' -apply plugin: 'com.google.firebase.firebase-perf' -apply plugin: 'com.google.firebase.crashlytics' -// END: FlutterFire Configuration -apply plugin: 'kotlin-android' +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" + id 'com.google.gms.google-services' + id 'com.google.firebase.firebase-perf' + id 'com.google.firebase.crashlytics' +} + apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 33 + namespace = "tech.bunnie.hub_finder" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion compileOptions { - coreLibraryDesugaringEnabled true - - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = '1.8' - } - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' + jvmTarget = JavaVersion.VERSION_1_8 } defaultConfig { - applicationId "tech.bunnie.hub_finder" - minSdkVersion 21 - targetSdkVersion flutter.targetSdkVersion - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName - multiDexEnabled true + applicationId = "tech.bunnie.hub_finder" + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutter.versionCode + versionName = flutter.versionName } - signingConfigs { + signingConfigs { release { keyAlias keystoreProperties['keyAlias'] keyPassword keystoreProperties['keyPassword'] @@ -71,7 +68,7 @@ android { storePassword keystoreProperties['storePassword'] } } - + buildTypes { release { signingConfig signingConfigs.release @@ -80,16 +77,5 @@ android { } flutter { - source '../..' -} - -dependencies { - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2' - - implementation 'androidx.window:window:1.0.0' - implementation 'androidx.window:window-java:1.0.0' - - implementation 'com.google.android.play:review:2.0.1' - implementation 'com.google.android.play:review-ktx:2.0.1' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + source = "../.." } diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index 2cb931b..399f698 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,6 +1,6 @@ - - diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 2a47a70..3973e02 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,14 +1,13 @@ - - - + - - - - - - - - - - - + + + + + + + diff --git a/android/app/src/main/kotlin/com/berkspar/hub_finder/MainActivity.kt b/android/app/src/main/kotlin/com/berkspar/hub_finder/MainActivity.kt new file mode 100644 index 0000000..cc853ff --- /dev/null +++ b/android/app/src/main/kotlin/com/berkspar/hub_finder/MainActivity.kt @@ -0,0 +1,5 @@ +package com.berkspar.hub_finder + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() 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 e2d9ea7d40a727732d87fc16de9d703bd4807846..db77bb4b7b0906d62b1847e87f15cdcacf6a4f29 100644 GIT binary patch literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U|N3vA*22NaGQG zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#iqdw@AL`7MR}m`rwr|mZgU`8P7SBkL78fFf!WnuYWm$5Z0 zNXhDbCv&49sM544K|?c)WrFfiZvCi9h0O)B3Pgg&ebxsLQ05GG~ AQ2+n{ delta 1643 zcmV-x29)`r1n~@z8Gi%-0095wd&~d;00d`2O+f$vv5yP zfP?@5`Tzg`fam}Kbua(`>RI+y?e7jT@qQ9J+u00Lr5M??VshmXv^000GyNklxJZDfuEu zX{&uh5flk6#1KUhk)lD;mlR`*S`-xv_9awf)m+5bRBLi3n%w>SA>_>I-R<6UFJ|ZK z+{5p7W@l$-hRES^<%l1W_b+v4?$;P=c}44Y|i&VNIk_@r4;Krpxu*#GR%n zLE`1(qRO5@X>p>-ctKS0&#K!I%)nmt@JX?O^W#8c7xQ7h6AMfLs*@XJ30X1Fh;ecY zx0w5k0n}CAVNG;KlVZ*02Gtq)G(`>MS6=y}{RX8(i+?jh6!Gue7f+Y~R3BfmOQLh} zRJlmqNCZp(>ZXhWDOD`yjzr=pDDW*=M(IYzl8X|L(~o4Y&`0qUQIuF?1sl#@rg3la zifm36j)DSTvtN&ZV~^*C#GI@MNXM+)uu)lVQJu-fQBd7n9VU9)#oQ9#FlZJkxmB(V zZLY)dyniI3K=P?Zp8RNnQE768K7lEikA)~SkcF6oF=j|z@)Jr8K3&sgqYfnxAK(Id zVZQw6KrLRwXg$;^Yj#jJDA%jIk#Sze5!?sh$365IiVuJv7qJdG+I&fFBzJ(v%H^iW zKgh!o_|b<;sK?jXX()Sf8eRY`C`FbI>4cp6;D7E~s=6YpZ$K}4aT?_qk4$5C&BCjw z!)*XZk*`g3#j1hpR>)mC|M?BTC9FkulqV_wg@)O+UK25om=j{>%q(4_`%LtiiGb7Xj30&l>wg1*H;^+^zfM zLVo}~*y%9v72!_+bq0r@_mhi=__9v1Fj+uX$Rbyc{{BiDkUwJ*i6#0^CJRVGmJxqC zq=2@P`erBraXqOsLkj2|aqEx*@(_0oDIhPIB=v;=?&Eu`93&-Sughn!AV_m7Jmx@s zWRkWPhD^SGL2gLx&FBiDZwTZg_BsOsntw4rgl-P@gw!@Sna3%R2NfZ73-E0$KyAcl zodVrOHJ*MX|5=K^VgWjD92i4+(XUwYP)d@I8r+KosGj(9r$9hAe!zl27MY2BY(-lb zUBjzm8`;Iqfq-sYz%Epw9Bc3;n($9pO+%oSl>VGq`Vs!^)r}6^Ks!3&i=bzget)?0 ziH7l&Sb$8I5zsXjM8x|{QrKhw$%Et~B3Y_4+8p>}2HLKDLa|@0rc@#tIZju^8-tD* zar#h+Cv`yW?*6x{lyZ-5Gizhqqh`$1d(Z)Qw((PX9{z{{=RbU?EjJ8)N|QB_k4IJ? zjkRcTh;s+KQJ{C|Q)1eKa?B`ErGINb<)9Sb!5g*jG-DGA^zZr}`B6}%(VoFa^|g#i zD8eSxpw3XXqY^XmtjQgAR=yNm(o3_~ne+=Yk%iI5lC3>i10_B2*(03~YXUbsj*@48 zt$MKk1ePq}E03crtgegqLKn_0-l4on2kKF^B*K*Ptz6ld^wz@3j7gE2FMsofRP%+1 zQtT4GnKYaZQLgX4rtw>RD=9d)MFovC=_#hkvcx0tZL!*X03+RA&g}^{Rz-C4AS3Kz zeeKaPPMatf^uWE~C zmk=w*7_hc62dZ@8$wEhQ(IZXagT%)=G001R)MObuXVPte=I%9HWVRU5x zGB7eQEio`HF*sB)GCD9ZIx{dUFfckWFac08SO5S3C3HntbYx+4WjbwdWNBu305UK# pFfB1KEipJ$F)}(ZF*-9aD=;uRFfecpiR1tP002ovPDHLkV1lV*_R9bO 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 f3a1fa5be823f481d97a6e92c9c988af714a8266..17987b79bb8a35cc66c3c1fd44f5a5526c1b78be 100644 GIT binary patch literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q03KywUtLX8Ua?`H+NMzkczFPK3lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l zytQ?X=U+MF$@3 zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+ yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@U=ES4z)+>ez|hdb!0-zw z)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15==?n?k)`f+xyS#2lCiUJbhi+pKuBBFe=K#o^dMF-@x$4!)Wd3NC*=2_)si}Uh zVQ1Vpe9cAw=5RG-2yfv&BDRY&>*g}oC6>F7{K;Hs+^cDH?)ssZH)p@AeSa?gyUzaO z-|zmuTm8=ZxzNwv*f8btE^C`}m-ig<^egf?_kpFqOK)}ODUJ1kN%2oYIr}5HTUM&5 zzw46v*s{OAa?&EE z?|x3SM^4DdZED{4!>tAPw+ahxw>`DxRzKgJV;aXy4140XWCho+Uvy6JLHeuydk5>6 z6ojgOJhk&ug`er~?H-C*{Fz8s}4w)pky6!fp^hcg^Eoo+dG($y7y>jN2V-I(MVwqzSzbh@+BZb34`u3naV)f@#A zo^(iQ^)ysC*u?oT&QqDESHG-bj_O_iy$;$Pg6dzH$}djrd&W~D?`L&GUB7Y3@&o5? z98naPIx>y>yHJFwAj7Sg7anY{5+}|v6yEXF=tcKRhba|@d=ezpFL{W*`(L~~%m1Rt z$wXsDh1ULx4)G3cz1)5m;n-iR57lJoa!tIday|4yK^Rl+E>W4Qao3+uJmpmXpyS^z zwN1Z6611=Nyj0&1u9ioL2-*M`D|M{o* z3u68Tn)WS>mCnt$HbeQK{oCex@i=p?*ow}DJ(sqeSgJg6#rciv18;s_yeTp;p8eda zV7=^Lyt}vW;Pu$QuT^XF?@!rI70x`D^3KT26KR#jZvzRRf6W)JZGUus;y5-5jzEheX zJDe9?eSSpXVt&umnH8J!C8<`)MX5lF!N|bKK-Un6EJ6&8tPBjT tj6Dpr4GgRd3>X6pBT#hY=BH$)RbtTr)lk6O`2?te!PC{xWt~$(6998xurL4s 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 64928278d823c29e20126400d0478d81f5641bde..09d4391482be68e9e4a07fab769b5de337d16eb1 100644 GIT binary patch literal 721 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy!iOI#yLg7ec#$`gxH85~pclTsBt za}(23gHjVyDhp4h+5i=O3-AeX1=1l$e`s#|#^}+&7(N@w0CIr{$Oe+Uk^K-ZP~83C zcc@hG6rikF&NPT(23>y!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R` zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg zoq1^2_p9@|WEo z*X_Uko@K)qYYv~>43eQGMdbiGbo>E~Q& zrYBH{QP^@Sti!`2)uG{irBBq@y*$B zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N zdG@vOZB4v_lF7Plrx+hxo7(fCV&}fHq)$ delta 1718 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 literal 3158 zcmV-c45{;pP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00002 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 wX=Zrn+a 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 43063c9eb5d1837f6ffbaf10b50ca96ff06d2db5..4d6372eebdb28e45604e46eeda8dd24651419bc0 100644 GIT binary patch literal 1443 zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`YV6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY zB_MsH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~Lo9vl;Zfs+W#BydUw zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3 z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w! zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%4Q8~Mad z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt* zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW zu72MW`|?8ht^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf< zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$ zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+ zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f z%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP z(1P?z~7YxD~Rf<(a@_y` literal 3321 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 Dt=SYy diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml index 449a9f9..06952be 100644 --- a/android/app/src/main/res/values-night/styles.xml +++ b/android/app/src/main/res/values-night/styles.xml @@ -3,14 +3,14 @@ - diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml index 2cb931b..399f698 100644 --- a/android/app/src/profile/AndroidManifest.xml +++ b/android/app/src/profile/AndroidManifest.xml @@ -1,6 +1,6 @@ - - diff --git a/android/build.gradle b/android/build.gradle index fe4cdaf..d2ffbff 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,22 +1,3 @@ -buildscript { - ext.kotlin_version = '1.8.21' - - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' - // START: FlutterFire Configuration - classpath 'com.google.gms:google-services:4.4.0' - classpath 'com.google.firebase:perf-plugin:1.4.1' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1' - // END: FlutterFire Configuration - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() @@ -24,12 +5,12 @@ allprojects { } } -rootProject.buildDir = '../build' +rootProject.buildDir = "../build" subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" } subprojects { - project.evaluationDependsOn(':app') + project.evaluationDependsOn(":app") } tasks.register("clean", Delete) { diff --git a/android/gradle.properties b/android/gradle.properties index 94adc3a..2597170 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index cfe88f6..7bb2df6 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Jun 23 08:50:38 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index 44e62bc..b9e43bd 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,11 +1,25 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.8.22" apply false +} + +include ":app" diff --git a/hub_finder.iml b/hub_finder.iml new file mode 100644 index 0000000..f66303d --- /dev/null +++ b/hub_finder.iml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + +