Skip to content

Commit d386399

Browse files
galadrilgaladril
authored
Merge pull request #683 from domoticz/beta-development
Beta development
2 parents fab7016 + 2aad652 commit d386399

File tree

270 files changed

+1284
-1078
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

270 files changed

+1284
-1078
lines changed

‎app/build.gradle

Lines changed: 15 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -79,30 +79,6 @@ android {
7979

8080
flavorDimensions "tier"
8181
productFlavors {
82-
dev {
83-
applicationId 'nl.hnogames.domoticz.premium'
84-
85-
resValue "string", "APK_VALIDATE_DEBUG", "$System.env.APK_VALIDATE_DEBUG"
86-
resValue "string", "APK_VALIDATE_PROD", "$System.env.APK_VALIDATE_PROD"
87-
resValue "string", "APK_LICENSE_PREMIUM", "$System.env.APK_LICENSE_PREMIUM"
88-
89-
resValue "string", "ADMOB_COMP_KEY", "$System.env.ADMOB_COMP_KEY"
90-
resValue "string", "ADMOB_APP_KEY", "$System.env.ADMOBAPPKEY"
91-
resValue "string", "ADMOB_ADS_KEY", "$System.env.ADMOBADSKEY"
92-
93-
resValue "string", "analiticsapikey", "$System.env.GOOGLE_ANALITICS_ID"
94-
resValue "string", "google_maps_key", "$System.env.GOOGLEAPIKEY"
95-
resValue "string", "revenuecat_apikey", "$System.env.REVENUECATKEY"
96-
resValue "string", "app_name_domoticz", 'Domoticz'
97-
buildConfigField "boolean", "LITE_VERSION", "false"
98-
buildConfigField "boolean", "PAID_OOTT", "false"
99-
dimension "tier"
100-
101-
minSdkVersion 23
102-
versionNameSuffix "-dev"
103-
resConfigs 'en', 'xxhdpi'
104-
}
105-
10682
free {
10783
applicationId 'nl.hnogames.domoticz'
10884
resValue "string", "APK_VALIDATE_DEBUG", "$System.env.APK_VALIDATE_DEBUG"
@@ -167,6 +143,8 @@ android {
167143
it.name.startsWith('dex')
168144
}
169145
}
146+
147+
namespace 'nl.hnogames.domoticz'
170148
}
171149

172150
repositories {
@@ -188,39 +166,40 @@ allprojects {
188166
//noinspection GroovyAssignabilityCheck
189167
dependencies {
190168
implementation fileTree(include: ['*.jar'], dir: 'libs')
169+
wearApp project(':wear')
191170

192171
implementation 'androidx.core:core:1.9.0'
193-
implementation "androidx.work:work-runtime:2.8.0-rc01"
172+
implementation "androidx.work:work-runtime:2.8.0"
194173
implementation 'androidx.preference:preference:1.2.0'
195174
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
196-
implementation 'androidx.appcompat:appcompat:1.4.2'
175+
implementation 'androidx.appcompat:appcompat:1.6.1'
197176
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
198177
implementation 'androidx.recyclerview:recyclerview:1.2.1'
199178
implementation 'androidx.cardview:cardview:1.0.0'
200179
implementation 'androidx.biometric:biometric:1.1.0'
201-
implementation 'com.google.android.material:material:1.6.1'
180+
implementation 'com.google.android.material:material:1.8.0'
202181
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
203-
implementation 'androidx.annotation:annotation:1.3.0'
204-
implementation 'com.google.android.libraries.car:car-app:1.0.0-beta.1'
182+
implementation 'androidx.annotation:annotation:1.5.0'
183+
implementation "androidx.car.app:app:1.3.0-rc01"
205184
implementation 'org.reactivestreams:reactive-streams:1.0.3'
206185
implementation 'io.reactivex.rxjava2:rxjava:2.2.10'
207186
implementation 'com.revenuecat.purchases:purchases:5.6.3'
208187

209-
implementation 'com.google.firebase:firebase-core:19.0.1'
188+
implementation 'com.google.firebase:firebase-core:21.1.1'
210189
implementation 'com.google.firebase:firebase-iid:21.1.0'
211190
implementation 'com.google.firebase:firebase-analytics:19.0.1'
212191
implementation 'com.google.firebase:firebase-crashlytics:18.2.1'
213192
implementation "com.google.firebase:firebase-messaging:22.0.0"
214193
implementation "com.google.firebase:firebase-ads:19.8.0"
215194

216195
implementation 'com.google.android.ads.consent:consent-library:1.0.8'
217-
implementation "com.google.android.gms:play-services-analytics:17.0.1"
218-
implementation "com.google.android.gms:play-services-wearable:17.1.0"
219-
implementation "com.google.android.gms:play-services-maps:18.0.2"
196+
implementation "com.google.android.gms:play-services-analytics:18.0.2"
197+
implementation "com.google.android.gms:play-services-wearable:18.0.0"
198+
implementation "com.google.android.gms:play-services-maps:18.1.0"
220199
implementation "com.google.android.gms:play-services-gcm:17.0.0"
221-
implementation "com.google.android.gms:play-services-location:18.0.0"
200+
implementation "com.google.android.gms:play-services-location:21.0.1"
222201
implementation "com.google.android.gms:play-services-places:17.0.0"
223-
implementation "com.google.android.gms:play-services-ads:19.8.0"
202+
implementation "com.google.android.gms:play-services-ads:21.5.0"
224203
implementation 'com.google.android.ads.consent:consent-library:1.0.8'
225204
implementation "com.github.nisrulz:recyclerviewhelper:27.1.1"
226205
implementation "org.altbeacon:android-beacon-library:2.19"
@@ -231,6 +210,7 @@ dependencies {
231210
exclude group: 'org.json', module: 'json'
232211
}
233212

213+
implementation 'com.google.guava:guava:29.0-android'
234214
implementation 'com.github.alxrm:animated-clock-icon:1.0.2'
235215
implementation 'androidx.multidex:multidex:2.0.1'
236216
implementation 'com.google.code.gson:gson:2.8.6'

‎app/src/dev/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
-->
2121

2222
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
23-
xmlns:tools="http://schemas.android.com/tools"
24-
package="nl.hnogames.domoticz">
23+
xmlns:tools="http://schemas.android.com/tools">
2524

2625
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
2726
<uses-permission android:name="nl.hnogames.domoticz.premium.permission.MAPS_RECEIVE" />

‎app/src/free/AndroidManifest.xml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
-->
2121

2222
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
23-
xmlns:tools="http://schemas.android.com/tools"
24-
package="nl.hnogames.domoticz">
23+
xmlns:tools="http://schemas.android.com/tools">
2524

25+
<uses-permission android:name="com.google.android.gms.permission.AD_ID" />
2626
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
2727
<uses-permission android:name="nl.hnogames.domoticz.premium.permission.MAPS_RECEIVE" />
2828
<uses-permission android:name="android.permission.VIBRATE" />
@@ -47,9 +47,7 @@
4747
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
4848
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
4949
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
50-
<uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
5150
<uses-permission android:name="com.android.vending.BILLING" />
52-
<uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
5351
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
5452

5553
<supports-screens
@@ -156,12 +154,12 @@
156154
</intent-filter>
157155
</receiver>
158156

159-
<service android:exported="true" android:name="nl.hnogames.domoticz.service.WearMessageListenerService">
157+
<service
158+
android:enabled="true"
159+
android:exported="true"
160+
android:name="nl.hnogames.domoticz.service.WearMessageListenerService">
160161
<intent-filter>
161-
<action android:name="com.google.android.gms.wearable.DATA_CHANGED" />
162162
<action android:name="com.google.android.gms.wearable.MESSAGE_RECEIVED" />
163-
<action android:name="com.google.android.gms.wearable.CAPABILITY_CHANGED" />
164-
<action android:name="com.google.android.gms.wearable.CHANNEL_EVENT" />
165163

166164
<data
167165
android:host="*"

‎app/src/main/AndroidManifest.xml

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
-->
2121

2222
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
23-
xmlns:tools="http://schemas.android.com/tools"
24-
package="nl.hnogames.domoticz">
23+
xmlns:tools="http://schemas.android.com/tools">
2524

2625
<supports-screens
2726
android:anyDensity="true"
@@ -110,13 +109,12 @@
110109
</intent-filter>
111110
</receiver>
112111

113-
<service android:exported="true"
112+
<service
113+
android:enabled="true"
114+
android:exported="true"
114115
android:name="nl.hnogames.domoticz.service.WearMessageListenerService">
115116
<intent-filter>
116-
<action android:name="com.google.android.gms.wearable.DATA_CHANGED" />
117117
<action android:name="com.google.android.gms.wearable.MESSAGE_RECEIVED" />
118-
<action android:name="com.google.android.gms.wearable.CAPABILITY_CHANGED" />
119-
<action android:name="com.google.android.gms.wearable.CHANNEL_EVENT" />
120118

121119
<data
122120
android:host="*"
@@ -436,7 +434,8 @@
436434
<activity
437435
android:exported="true" android:name="nl.hnogames.domoticz.NotificationHistoryActivity" />
438436

439-
<activity android:exported="true"
437+
<activity
438+
android:exported="true"
440439
android:name="com.adevinta.leku.LocationPickerActivity"
441440
android:label="@string/title_add_location"
442441
android:parentActivityName="nl.hnogames.domoticz.GeoSettingsActivity"
@@ -581,5 +580,22 @@
581580
android:name="org.apache.http.legacy"
582581
android:required="false" />
583582

583+
<meta-data android:name="com.google.android.gms.car.application"
584+
android:resource="@xml/automotive_app_desc"/>
585+
586+
<meta-data
587+
android:name="androidx.car.app.minCarApiLevel"
588+
android:value="1"/>
589+
590+
<service
591+
android:name="nl.hnogames.domoticz.service.AutoService"
592+
android:exported="true"
593+
android:label="@string/app_name_domoticz"
594+
android:icon="@mipmap/ic_launcher">
595+
<intent-filter>
596+
<action android:name="androidx.car.app.CarAppService" />
597+
<category android:name="androidx.car.app.category.IOT"/>
598+
</intent-filter>
599+
</service>
584600
</application>
585601
</manifest>

‎app/src/main/java/nl/hnogames/domoticz/BeaconSettingsActivity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
import android.widget.AdapterView;
3434
import android.widget.ListView;
3535

36+
import androidx.annotation.NonNull;
37+
import androidx.appcompat.widget.Toolbar;
38+
import androidx.coordinatorlayout.widget.CoordinatorLayout;
39+
3640
import com.afollestad.materialdialogs.DialogAction;
3741
import com.afollestad.materialdialogs.MaterialDialog;
3842
import com.fastaccess.permission.base.PermissionHelper;
@@ -43,10 +47,6 @@
4347
import java.util.ArrayList;
4448
import java.util.Arrays;
4549

46-
import androidx.annotation.NonNull;
47-
import androidx.appcompat.widget.Toolbar;
48-
import androidx.coordinatorlayout.widget.CoordinatorLayout;
49-
5050
import nl.hnogames.domoticz.adapters.BeaconAdapter;
5151
import nl.hnogames.domoticz.app.AppCompatPermissionsActivity;
5252
import nl.hnogames.domoticz.app.AppController;

‎app/src/main/java/nl/hnogames/domoticz/BluetoothSettingsActivity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
import android.view.MenuItem;
3333
import android.widget.ListView;
3434

35+
import androidx.annotation.NonNull;
36+
import androidx.appcompat.widget.Toolbar;
37+
import androidx.coordinatorlayout.widget.CoordinatorLayout;
38+
3539
import com.afollestad.materialdialogs.MaterialDialog;
3640
import com.fastaccess.permission.base.PermissionHelper;
3741
import com.ftinc.scoop.Scoop;
@@ -44,10 +48,6 @@
4448
import java.util.List;
4549
import java.util.Set;
4650

47-
import androidx.annotation.NonNull;
48-
import androidx.appcompat.widget.Toolbar;
49-
import androidx.coordinatorlayout.widget.CoordinatorLayout;
50-
5151
import nl.hnogames.domoticz.app.AppCompatPermissionsActivity;
5252
import nl.hnogames.domoticz.containers.BluetoothInfo;
5353
import nl.hnogames.domoticz.helpers.StaticHelper;

‎app/src/main/java/nl/hnogames/domoticz/CameraActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
import android.view.Menu;
2626
import android.view.MenuItem;
2727

28+
import androidx.appcompat.widget.Toolbar;
29+
2830
import com.ftinc.scoop.Scoop;
2931

3032
import java.util.Timer;
3133
import java.util.TimerTask;
3234

33-
import androidx.appcompat.widget.Toolbar;
34-
3535
import nl.hnogames.domoticz.app.AppCompatAssistActivity;
3636
import nl.hnogames.domoticz.fragments.Camera;
3737

‎app/src/main/java/nl/hnogames/domoticz/EventsActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323

2424
import android.os.Bundle;
2525

26-
import com.ftinc.scoop.Scoop;
27-
2826
import androidx.appcompat.widget.Toolbar;
2927

28+
import com.ftinc.scoop.Scoop;
29+
3030
import nl.hnogames.domoticz.app.AppCompatPermissionsActivity;
3131
import nl.hnogames.domoticz.fragments.Events;
3232
import nl.hnogames.domoticz.utils.SharedPrefUtil;

‎app/src/main/java/nl/hnogames/domoticz/GeoSettingsActivity.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
import android.view.MenuItem;
3232
import android.widget.ListView;
3333

34+
import androidx.annotation.NonNull;
35+
import androidx.appcompat.app.AlertDialog;
36+
import androidx.appcompat.widget.Toolbar;
37+
import androidx.coordinatorlayout.widget.CoordinatorLayout;
38+
3439
import com.adevinta.leku.LocationPickerActivity;
3540
import com.afollestad.materialdialogs.MaterialDialog;
3641
import com.fastaccess.permission.base.PermissionHelper;
@@ -45,11 +50,6 @@
4550
import java.util.Arrays;
4651
import java.util.Random;
4752

48-
import androidx.annotation.NonNull;
49-
import androidx.appcompat.app.AlertDialog;
50-
import androidx.appcompat.widget.Toolbar;
51-
import androidx.coordinatorlayout.widget.CoordinatorLayout;
52-
5353
import nl.hnogames.domoticz.adapters.LocationAdapter;
5454
import nl.hnogames.domoticz.app.AppCompatAssistActivity;
5555
import nl.hnogames.domoticz.containers.LocationInfo;

‎app/src/main/java/nl/hnogames/domoticz/GraphActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
import android.os.Bundle;
2525
import android.view.MenuItem;
2626

27-
import com.ftinc.scoop.Scoop;
28-
2927
import androidx.appcompat.widget.Toolbar;
3028

29+
import com.ftinc.scoop.Scoop;
30+
3131
import nl.hnogames.domoticz.app.AppCompatAssistActivity;
3232
import nl.hnogames.domoticz.fragments.Graph;
3333
import nl.hnogames.domoticz.utils.SharedPrefUtil;

‎app/src/main/java/nl/hnogames/domoticz/LogsActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323

2424
import android.os.Bundle;
2525

26-
import com.ftinc.scoop.Scoop;
27-
2826
import androidx.appcompat.widget.Toolbar;
2927

28+
import com.ftinc.scoop.Scoop;
29+
3030
import nl.hnogames.domoticz.app.AppCompatPermissionsActivity;
3131
import nl.hnogames.domoticz.fragments.Logs;
3232
import nl.hnogames.domoticz.utils.SharedPrefUtil;

0 commit comments

Comments
 (0)