-[](https://play.google.com/store/apps/details?id=com.cybear_jinni.smart_home) [](https://snapcraft.io/cybear-jinni) [](https://github.com/CyBear-Jinni/cbj_app/actions?query=workflow%3A%22Dart+CI%22) [](https://pub.dev/packages/lint) [](https://www.gnu.org/licenses/agpl-3.0) [
](https://en.wikipedia.org/wiki/Open_source)
+[](https://play.google.com/store/apps/details?id=com.cybearjinni.app) [](https://snapcraft.io/cybear-jinni) [](https://github.com/CyBear-Jinni/cbj_app/actions?query=workflow%3A%22Dart+CI%22) [](https://pub.dev/packages/lint) [](https://www.gnu.org/licenses/agpl-3.0) [
](https://en.wikipedia.org/wiki/Open_source)
](https://github.com/CyBear-Jinni/CBJ_Smart-Home)
@@ -20,7 +20,7 @@ It is writen with [Flutter](https://flutter.dev) and let you control the CyBear
diff --git a/android/.gitignore b/android/.gitignore
index 7c334f363..e93791d9d 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -8,4 +8,6 @@ app/google-services.json
GeneratedPluginRegistrant.java
gradle-wrapper.jar
-key.properties
\ No newline at end of file
+key.properties
+**/*.keystore
+**/*.jks
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 7159f3688..c51278211 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -21,30 +21,37 @@ 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))
}
-apply plugin: 'com.android.application'
-apply plugin: 'com.google.gms.google-services' // For firestore
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
- compileSdkVersion 34
+ namespace "com.cybearjinni.app"
+ compileSdkVersion flutter.compileSdkVersion
+ ndkVersion flutter.ndkVersion
- sourceSets {
- main.java.srcDirs += 'src/main/kotlin'
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+
+ kotlinOptions {
+ jvmTarget = '1.8'
}
- lintOptions {
- disable 'InvalidPackage'
+ sourceSets {
+ main.java.srcDirs += 'src/main/kotlin'
}
defaultConfig {
- applicationId "com.cybear_jinni.smart_home"
+ applicationId "com.cybearjinni.app"
minSdkVersion 22
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
@@ -62,6 +69,8 @@ android {
}
buildTypes {
+ debug {
+ }
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
@@ -71,9 +80,9 @@ android {
// Includes the default ProGuard rules files that are packaged with
// the Android Gradle plugin. To learn more, go to the section about
// R8 configuration files.
- proguardFiles getDefaultProguardFile(
- 'proguard-android-optimize.txt'),
- 'proguard-rules.pro'
+ // proguardFiles getDefaultProguardFile(
+ // 'proguard-android-optimize.txt'),
+ // 'proguard-rules.pro'
}
}
}
@@ -82,9 +91,4 @@ flutter {
source '../..'
}
-dependencies {
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
-// implementation 'com.android.support:multidex:2.0.1'
-// implementation 'com.google.firebase:firebase-analytics:18.0.3' // For firestore
-}
+dependencies {}
diff --git a/android/app/google-services.json b/android/app/google-services.json
deleted file mode 100644
index 770c54f99..000000000
--- a/android/app/google-services.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- "project_info": {
- "project_number": "907181373877",
- "firebase_url": "https://smarthometest-3295f.firebaseio.com",
- "project_id": "smarthometest-3295f",
- "storage_bucket": "smarthometest-3295f.appspot.com"
- },
- "client": [
- {
- "client_info": {
- "mobilesdk_app_id": "1:907181373877:android:ebff60e28c4a08955d81fc",
- "android_client_info": {
- "package_name": "com.cybear_jinni.smart_home"
- }
- },
- "oauth_client": [
- {
- "client_id": "907181373877-9lbj11i9iv8o1jr1ldejbeogu1o7bjh7.apps.googleusercontent.com",
- "client_type": 3
- }
- ],
- "api_key": [
- {
- "current_key": "AIzaSyBytaZgR_Tjg1UZP63oO1e8y35f4MFPmlA"
- }
- ],
- "services": {
- "appinvite_service": {
- "other_platform_oauth_client": [
- {
- "client_id": "907181373877-9lbj11i9iv8o1jr1ldejbeogu1o7bjh7.apps.googleusercontent.com",
- "client_type": 3
- }
- ]
- }
- }
- }
- ],
- "configuration_version": "1"
-}
\ No newline at end of file
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index f7aaa4af7..0152a8609 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@