Merge pull request #711 from CyBear-Jinni/dev

Dev

README.md

@@ -2,7 +2,7 @@
 
 <div align="center">
 
-[![Playstore: install](https://img.shields.io/badge/Playstore-install-brightgreen?logo=googleplay)](https://play.google.com/store/apps/details?id=com.cybear_jinni.smart_home) [![Snapcraft](https://img.shields.io/badge/snap-install-82BEA0?style=flat&logo=data:image/png;base64,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)](https://snapcraft.io/cybear-jinni) [![dart CI](https://github.com/CyBear-Jinni/cbj_app/workflows/Dart%20CI/badge.svg)](https://github.com/CyBear-Jinni/cbj_app/actions?query=workflow%3A%22Dart+CI%22) [![style: lint](https://img.shields.io/badge/lint-1.3.0-blue)](https://pub.dev/packages/lint) [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0) [<img src="https://firstcontributions.github.io/open-source-badges/badges/open-source-v1/open-source.svg" height="20">](https://en.wikipedia.org/wiki/Open_source)
+[![Playstore: install](https://img.shields.io/badge/Playstore-install-brightgreen?logo=googleplay)](https://play.google.com/store/apps/details?id=com.cybearjinni.app) [![Snapcraft](https://img.shields.io/badge/snap-install-82BEA0?style=flat&logo=data:image/png;base64,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)](https://snapcraft.io/cybear-jinni) [![dart CI](https://github.com/CyBear-Jinni/cbj_app/workflows/Dart%20CI/badge.svg)](https://github.com/CyBear-Jinni/cbj_app/actions?query=workflow%3A%22Dart+CI%22) [![style: lint](https://img.shields.io/badge/lint-1.3.0-blue)](https://pub.dev/packages/lint) [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0) [<img src="https://firstcontributions.github.io/open-source-badges/badges/open-source-v1/open-source.svg" height="20">](https://en.wikipedia.org/wiki/Open_source)
 </div>
 
 [<div align="center"><img alt="CyBear Jinni image" height="400" src="https://user-images.githubusercontent.com/74055102/135610796-030761cc-6388-4cf6-b412-5e3e88412b78.png">](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
   <tr>
     <td>
       <p>
-         <a href="https://play.google.com/store/apps/details?id=com.cybear_jinni.smart_home">
+         <a href="https://play.google.com/store/apps/details?id=com.cybearjinni.app">
          <img border="0" align="middle" alt="Android Badge" src="https://user-images.githubusercontent.com/9304740/117003444-8b58a080-aced-11eb-94bc-bfb2505f515d.png" width=200>
          <a href="https://snapcraft.io/cybear-jinni">
          <img border="0" align="middle" alt="Snap Store Badge" src="https://snapcraft.io/static/images/badges/en/snap-store-black.svg" width=200>

android/.gitignore

@@ -8,4 +8,6 @@ app/google-services.json
 
 GeneratedPluginRegistrant.java
 gradle-wrapper.jar
-key.properties
+key.properties
+**/*.keystore
+**/*.jks

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 {}

android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cybear_jinni.smart_home">
+    package="com.cybearjinni.app">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
@@ -21,4 +21,5 @@
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
 </manifest>

android/app/src/main/AndroidManifest.xml

@@ -1,11 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cybear_jinni.smart_home">
-    <!-- io.flutter.app.FlutterApplication is an android.app.Application that
-         calls FlutterMain.ensureInitializationComplete(this); in its onCreate method.
-         In most cases you can leave this as-is, but you if you want to provide
-         additional functionality it is fine to subclass or reimplement
-         FlutterApplication and put your custom class here. -->
-
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.cybearjinni.app">
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
@@ -24,20 +20,19 @@
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
 
     <application
+        android:label="CyBear Jinni"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher"
-        android:label="CyBear Jinni">
+        android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true"
+            android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:showWhenLocked="true"
-            android:turnScreenOn="true"
-            android:exported="true"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
@@ -46,14 +41,6 @@
             <meta-data
                 android:name="io.flutter.embedding.android.NormalTheme"
                 android:resource="@style/NormalTheme" />
-            <!-- Displays an Android View that continues showing the launch screen
-                 Drawable until Flutter paints its first frame, then this splash
-                 screen fades out. A splash screen is useful to avoid any visual
-                 gap between the end of Android's launch screen and the painting of
-                 Flutter's first frame. -->
-            <meta-data
-                android:name="io.flutter.embedding.android.SplashScreenDrawable"
-                android:resource="@drawable/launch_background" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -65,8 +52,5 @@
             android:name="flutterEmbedding"
             android:value="2" />
         <!-- Sample app ID: ca-app-pub-3940256099942544~3347511713 -->
-        <meta-data
-            android:name="com.google.android.gms.ads.APPLICATION_ID"
-            android:value="ca-app-pub-3940256099942544~3347511713" />
     </application>
 </manifest>

android/app/src/main/kotlin/com/cybearjinni/cbj_app/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.cybearjinni.cbj_app
+package com.cybearjinni.app
 
 import io.flutter.embedding.android.FlutterActivity
 

android/app/src/main/res/drawable-v21/launch_background.xml

@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/ic_launcher_background" />
-
-    <!-- You can insert your own image assets here -->
-    <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@drawable/splash_icon" />
-    </item>
+    <item android:drawable="?android:colorBackground" />
 </layer-list>

android/app/src/main/res/values-night/styles.xml

@@ -3,16 +3,16 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
-        <item name="android:windowBackground">@drawable/launch_background</item>
+             the Flutter engine draws its first frame -->
+        <item name="android:windowIsTranslucent">true</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
+
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
-        <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:windowBackground">?android:colorBackground</item>
     </style>
 </resources>

android/app/src/main/res/values/colors.xml

@@ -1,11 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="gray">#D2D2D2</color>
-    <color name="dark_gray">#ff838383</color>
-    <color name="transparent_black">#1A000000</color>
-    <color name="deepPurple">#FF673AB7</color>
-    <color name="indigo">#FF3F51B5</color>
-
-    <color name="splash">#ebe9e9</color>
     <color name="ic_launcher_background">#FFFFFF</color>
 </resources>