Merge pull request #683 from domoticz/beta-development

Beta development
domoticz · Mar 10, 2023 · d386399 · d386399
2 parents fab7016 + 2aad652
commit d386399
Show file tree

Hide file tree

Showing 270 changed files with 1,284 additions and 1,078 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -79,30 +79,6 @@ android {
 
     flavorDimensions "tier"
     productFlavors {
-        dev {
-            applicationId 'nl.hnogames.domoticz.premium'
-
-            resValue "string", "APK_VALIDATE_DEBUG", "$System.env.APK_VALIDATE_DEBUG"
-            resValue "string", "APK_VALIDATE_PROD", "$System.env.APK_VALIDATE_PROD"
-            resValue "string", "APK_LICENSE_PREMIUM", "$System.env.APK_LICENSE_PREMIUM"
-
-            resValue "string", "ADMOB_COMP_KEY", "$System.env.ADMOB_COMP_KEY"
-            resValue "string", "ADMOB_APP_KEY", "$System.env.ADMOBAPPKEY"
-            resValue "string", "ADMOB_ADS_KEY", "$System.env.ADMOBADSKEY"
-
-            resValue "string", "analiticsapikey", "$System.env.GOOGLE_ANALITICS_ID"
-            resValue "string", "google_maps_key", "$System.env.GOOGLEAPIKEY"
-            resValue "string", "revenuecat_apikey", "$System.env.REVENUECATKEY"
-            resValue "string", "app_name_domoticz", 'Domoticz'
-            buildConfigField "boolean", "LITE_VERSION", "false"
-            buildConfigField "boolean", "PAID_OOTT", "false"
-            dimension "tier"
-
-            minSdkVersion 23
-            versionNameSuffix "-dev"
-            resConfigs 'en', 'xxhdpi'
-        }
-
         free {
             applicationId 'nl.hnogames.domoticz'
             resValue "string", "APK_VALIDATE_DEBUG", "$System.env.APK_VALIDATE_DEBUG"
@@ -167,6 +143,8 @@ android {
             it.name.startsWith('dex')
         }
     }
+
+    namespace 'nl.hnogames.domoticz'
 }
 
 repositories {
@@ -188,39 +166,40 @@ allprojects {
 //noinspection GroovyAssignabilityCheck
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
+    wearApp project(':wear')
 
     implementation 'androidx.core:core:1.9.0'
-    implementation "androidx.work:work-runtime:2.8.0-rc01"
+    implementation "androidx.work:work-runtime:2.8.0"
     implementation 'androidx.preference:preference:1.2.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.biometric:biometric:1.1.0'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.annotation:annotation:1.3.0'
-    implementation 'com.google.android.libraries.car:car-app:1.0.0-beta.1'
+    implementation 'androidx.annotation:annotation:1.5.0'
+    implementation "androidx.car.app:app:1.3.0-rc01"
     implementation 'org.reactivestreams:reactive-streams:1.0.3'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.10'
     implementation 'com.revenuecat.purchases:purchases:5.6.3'
 
-    implementation 'com.google.firebase:firebase-core:19.0.1'
+    implementation 'com.google.firebase:firebase-core:21.1.1'
     implementation 'com.google.firebase:firebase-iid:21.1.0'
     implementation 'com.google.firebase:firebase-analytics:19.0.1'
     implementation 'com.google.firebase:firebase-crashlytics:18.2.1'
     implementation "com.google.firebase:firebase-messaging:22.0.0"
     implementation "com.google.firebase:firebase-ads:19.8.0"
 
     implementation 'com.google.android.ads.consent:consent-library:1.0.8'
-    implementation "com.google.android.gms:play-services-analytics:17.0.1"
-    implementation "com.google.android.gms:play-services-wearable:17.1.0"
-    implementation "com.google.android.gms:play-services-maps:18.0.2"
+    implementation "com.google.android.gms:play-services-analytics:18.0.2"
+    implementation "com.google.android.gms:play-services-wearable:18.0.0"
+    implementation "com.google.android.gms:play-services-maps:18.1.0"
     implementation "com.google.android.gms:play-services-gcm:17.0.0"
-    implementation "com.google.android.gms:play-services-location:18.0.0"
+    implementation "com.google.android.gms:play-services-location:21.0.1"
     implementation "com.google.android.gms:play-services-places:17.0.0"
-    implementation "com.google.android.gms:play-services-ads:19.8.0"
+    implementation "com.google.android.gms:play-services-ads:21.5.0"
     implementation 'com.google.android.ads.consent:consent-library:1.0.8'
     implementation "com.github.nisrulz:recyclerviewhelper:27.1.1"
     implementation "org.altbeacon:android-beacon-library:2.19"
@@ -231,6 +210,7 @@ dependencies {
         exclude group: 'org.json', module: 'json'
     }
 
+    implementation 'com.google.guava:guava:29.0-android'
     implementation 'com.github.alxrm:animated-clock-icon:1.0.2'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'com.google.code.gson:gson:2.8.6'

diff --git a/app/src/dev/AndroidManifest.xml b/app/src/dev/AndroidManifest.xml
@@ -20,8 +20,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="nl.hnogames.domoticz">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="nl.hnogames.domoticz.premium.permission.MAPS_RECEIVE" />

diff --git a/app/src/free/AndroidManifest.xml b/app/src/free/AndroidManifest.xml
@@ -20,9 +20,9 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="nl.hnogames.domoticz">
+    xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="nl.hnogames.domoticz.premium.permission.MAPS_RECEIVE" />
     <uses-permission android:name="android.permission.VIBRATE" />
@@ -47,9 +47,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
-    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
     <uses-permission android:name="com.android.vending.BILLING" />
-    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <supports-screens
@@ -156,12 +154,12 @@
             </intent-filter>
         </receiver>
 
-        <service android:exported="true" android:name="nl.hnogames.domoticz.service.WearMessageListenerService">
+        <service
+            android:enabled="true"
+            android:exported="true"
+            android:name="nl.hnogames.domoticz.service.WearMessageListenerService">
             <intent-filter>
-                <action android:name="com.google.android.gms.wearable.DATA_CHANGED" />
                 <action android:name="com.google.android.gms.wearable.MESSAGE_RECEIVED" />
-                <action android:name="com.google.android.gms.wearable.CAPABILITY_CHANGED" />
-                <action android:name="com.google.android.gms.wearable.CHANNEL_EVENT" />
 
                 <data
                     android:host="*"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -20,8 +20,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="nl.hnogames.domoticz">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <supports-screens
         android:anyDensity="true"
@@ -110,13 +109,12 @@
             </intent-filter>
         </receiver>
 
-        <service android:exported="true"
+        <service
+            android:enabled="true"
+            android:exported="true"
             android:name="nl.hnogames.domoticz.service.WearMessageListenerService">
             <intent-filter>
-                <action android:name="com.google.android.gms.wearable.DATA_CHANGED" />
                 <action android:name="com.google.android.gms.wearable.MESSAGE_RECEIVED" />
-                <action android:name="com.google.android.gms.wearable.CAPABILITY_CHANGED" />
-                <action android:name="com.google.android.gms.wearable.CHANNEL_EVENT" />
 
                 <data
                     android:host="*"
@@ -436,7 +434,8 @@
         <activity
             android:exported="true" android:name="nl.hnogames.domoticz.NotificationHistoryActivity" />
 
-        <activity android:exported="true"
+        <activity
+            android:exported="true"
             android:name="com.adevinta.leku.LocationPickerActivity"
             android:label="@string/title_add_location"
             android:parentActivityName="nl.hnogames.domoticz.GeoSettingsActivity"
@@ -581,5 +580,22 @@
             android:name="org.apache.http.legacy"
             android:required="false" />
 
+        <meta-data android:name="com.google.android.gms.car.application"
+            android:resource="@xml/automotive_app_desc"/>
+
+        <meta-data
+            android:name="androidx.car.app.minCarApiLevel"
+            android:value="1"/>
+
+        <service
+            android:name="nl.hnogames.domoticz.service.AutoService"
+            android:exported="true"
+            android:label="@string/app_name_domoticz"
+            android:icon="@mipmap/ic_launcher">
+            <intent-filter>
+                <action android:name="androidx.car.app.CarAppService" />
+                <category android:name="androidx.car.app.category.IOT"/>
+            </intent-filter>
+        </service>
     </application>
 </manifest>
diff --git a/app/src/main/java/nl/hnogames/domoticz/BeaconSettingsActivity.java b/app/src/main/java/nl/hnogames/domoticz/BeaconSettingsActivity.java
@@ -33,6 +33,10 @@
 import android.widget.AdapterView;
 import android.widget.ListView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.fastaccess.permission.base.PermissionHelper;
@@ -43,10 +47,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.Toolbar;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
-
 import nl.hnogames.domoticz.adapters.BeaconAdapter;
 import nl.hnogames.domoticz.app.AppCompatPermissionsActivity;
 import nl.hnogames.domoticz.app.AppController;

diff --git a/app/src/main/java/nl/hnogames/domoticz/BluetoothSettingsActivity.java b/app/src/main/java/nl/hnogames/domoticz/BluetoothSettingsActivity.java
@@ -32,6 +32,10 @@
 import android.view.MenuItem;
 import android.widget.ListView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.fastaccess.permission.base.PermissionHelper;
 import com.ftinc.scoop.Scoop;
@@ -44,10 +48,6 @@
 import java.util.List;
 import java.util.Set;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.Toolbar;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
-
 import nl.hnogames.domoticz.app.AppCompatPermissionsActivity;
 import nl.hnogames.domoticz.containers.BluetoothInfo;
 import nl.hnogames.domoticz.helpers.StaticHelper;

diff --git a/app/src/main/java/nl/hnogames/domoticz/CameraActivity.java b/app/src/main/java/nl/hnogames/domoticz/CameraActivity.java
@@ -25,13 +25,13 @@
 import android.view.Menu;
 import android.view.MenuItem;
 
+import androidx.appcompat.widget.Toolbar;
+
 import com.ftinc.scoop.Scoop;
 
 import java.util.Timer;
 import java.util.TimerTask;
 
-import androidx.appcompat.widget.Toolbar;
-
 import nl.hnogames.domoticz.app.AppCompatAssistActivity;
 import nl.hnogames.domoticz.fragments.Camera;
 

diff --git a/app/src/main/java/nl/hnogames/domoticz/EventsActivity.java b/app/src/main/java/nl/hnogames/domoticz/EventsActivity.java
@@ -23,10 +23,10 @@
 
 import android.os.Bundle;
 
-import com.ftinc.scoop.Scoop;
-
 import androidx.appcompat.widget.Toolbar;
 
+import com.ftinc.scoop.Scoop;
+
 import nl.hnogames.domoticz.app.AppCompatPermissionsActivity;
 import nl.hnogames.domoticz.fragments.Events;
 import nl.hnogames.domoticz.utils.SharedPrefUtil;

diff --git a/app/src/main/java/nl/hnogames/domoticz/GeoSettingsActivity.java b/app/src/main/java/nl/hnogames/domoticz/GeoSettingsActivity.java
@@ -31,6 +31,11 @@
 import android.view.MenuItem;
 import android.widget.ListView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
 import com.adevinta.leku.LocationPickerActivity;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.fastaccess.permission.base.PermissionHelper;
@@ -45,11 +50,6 @@
 import java.util.Arrays;
 import java.util.Random;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
-
 import nl.hnogames.domoticz.adapters.LocationAdapter;
 import nl.hnogames.domoticz.app.AppCompatAssistActivity;
 import nl.hnogames.domoticz.containers.LocationInfo;

diff --git a/app/src/main/java/nl/hnogames/domoticz/GraphActivity.java b/app/src/main/java/nl/hnogames/domoticz/GraphActivity.java
@@ -24,10 +24,10 @@
 import android.os.Bundle;
 import android.view.MenuItem;
 
-import com.ftinc.scoop.Scoop;
-
 import androidx.appcompat.widget.Toolbar;
 
+import com.ftinc.scoop.Scoop;
+
 import nl.hnogames.domoticz.app.AppCompatAssistActivity;
 import nl.hnogames.domoticz.fragments.Graph;
 import nl.hnogames.domoticz.utils.SharedPrefUtil;

diff --git a/app/src/main/java/nl/hnogames/domoticz/LogsActivity.java b/app/src/main/java/nl/hnogames/domoticz/LogsActivity.java
@@ -23,10 +23,10 @@
 
 import android.os.Bundle;
 
-import com.ftinc.scoop.Scoop;
-
 import androidx.appcompat.widget.Toolbar;
 
+import com.ftinc.scoop.Scoop;
+
 import nl.hnogames.domoticz.app.AppCompatPermissionsActivity;
 import nl.hnogames.domoticz.fragments.Logs;
 import nl.hnogames.domoticz.utils.SharedPrefUtil;