Skip to content

Commit fad7a28

Browse files
galadrilgaladril
authored
Merge pull request #716 from domoticz/beta-development
Beta development
2 parents a9366a6 + fa63315 commit fad7a28

File tree

328 files changed

+4321
-5389
lines changed

Some content is hidden

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

328 files changed

+4321
-5389
lines changed

‎app/build.gradle

+28-28
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22

33
android {
44
namespace 'nl.hnogames.domoticz'
5-
compileSdkVersion 33
5+
compileSdk 34
66

77
def versionPropsFile = file('version.properties')
88
if (versionPropsFile.canRead()) {
@@ -40,8 +40,8 @@ android {
4040
defaultConfig {
4141
versionCode version_Code
4242
versionName "${versionMajor}.${versionMinor}.${versionPatch} (${versionBuild})"
43-
minSdkVersion 23
44-
targetSdkVersion 33
43+
minSdkVersion 24
44+
targetSdkVersion 34
4545
multiDexEnabled true
4646
wearAppUnbundled true
4747
}
@@ -169,53 +169,56 @@ dependencies {
169169
implementation fileTree(include: ['*.jar'], dir: 'libs')
170170
wearApp project(':wear')
171171

172-
implementation 'androidx.core:core:1.10.1'
173-
implementation "androidx.work:work-runtime:2.8.1"
174-
implementation 'androidx.preference:preference:1.2.0'
172+
implementation 'androidx.core:core:1.13.1'
173+
implementation "androidx.work:work-runtime:2.9.0"
174+
implementation 'androidx.preference:preference:1.2.1'
175175
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
176-
implementation 'androidx.appcompat:appcompat:1.6.1'
176+
implementation 'androidx.appcompat:appcompat:1.7.0'
177177
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
178-
implementation 'androidx.recyclerview:recyclerview:1.3.0'
178+
implementation 'androidx.recyclerview:recyclerview:1.3.2'
179179
implementation 'androidx.cardview:cardview:1.0.0'
180180
implementation 'androidx.biometric:biometric:1.1.0'
181-
implementation 'com.google.android.material:material:1.9.0'
181+
implementation 'com.google.android.material:material:1.12.0'
182182
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
183-
implementation 'androidx.annotation:annotation:1.6.0'
184-
implementation "androidx.car.app:app:1.4.0-alpha01"
183+
implementation 'androidx.annotation:annotation:1.8.0'
184+
implementation "androidx.car.app:app:1.4.0"
185185
implementation 'org.reactivestreams:reactive-streams:1.0.3'
186186
implementation 'io.reactivex.rxjava2:rxjava:2.2.10'
187187
implementation 'com.revenuecat.purchases:purchases:7.0.1'
188188

189+
implementation 'androidx.room:room-runtime:2.6.1'
190+
annotationProcessor 'androidx.room:room-compiler:2.6.1'
191+
189192
implementation 'com.google.firebase:firebase-core:21.1.1'
190193
implementation 'com.google.firebase:firebase-iid:21.1.0'
191-
implementation 'com.google.firebase:firebase-analytics:21.3.0'
192-
implementation 'com.google.firebase:firebase-crashlytics:18.4.3'
193-
implementation "com.google.firebase:firebase-messaging:23.2.1"
194-
implementation "com.google.firebase:firebase-ads:22.4.0"
194+
implementation 'com.google.firebase:firebase-analytics:22.0.2'
195+
implementation 'com.google.firebase:firebase-crashlytics:19.0.2'
196+
implementation "com.google.firebase:firebase-messaging:24.0.0"
197+
implementation "com.google.firebase:firebase-ads:23.2.0"
195198

196199
implementation 'com.google.android.ads.consent:consent-library:1.0.8'
197-
implementation "com.google.android.gms:play-services-analytics:18.0.3"
198-
implementation "com.google.android.gms:play-services-wearable:18.0.0"
199-
implementation "com.google.android.gms:play-services-maps:18.1.0"
200+
implementation "com.google.android.gms:play-services-analytics:18.1.0"
201+
implementation "com.google.android.gms:play-services-wearable:18.2.0"
202+
implementation "com.google.android.gms:play-services-maps:19.0.0"
200203
implementation "com.google.android.gms:play-services-gcm:17.0.0"
201-
implementation "com.google.android.gms:play-services-location:21.0.1"
202-
implementation "com.google.android.gms:play-services-places:17.0.0"
203-
implementation "com.google.android.gms:play-services-ads:22.1.0"
204+
implementation "com.google.android.gms:play-services-location:21.3.0"
205+
implementation "com.google.android.gms:play-services-places:17.1.0"
206+
implementation "com.google.android.gms:play-services-ads:23.2.0"
204207
implementation 'com.google.android.ads.consent:consent-library:1.0.8'
205208
implementation "com.github.nisrulz:recyclerviewhelper:27.1.1"
206-
implementation "org.altbeacon:android-beacon-library:2.19"
209+
implementation "org.altbeacon:android-beacon-library:2.20.5"
207210

208211
implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
209212
implementation 'com.afollestad.material-dialogs:commons:0.9.6.0'
210213
implementation('com.github.ihsanbal:LoggingInterceptor:3.0.0') {
211214
exclude group: 'org.json', module: 'json'
212215
}
213216

214-
implementation 'com.google.guava:guava:29.0-android'
217+
implementation 'com.google.guava:guava:31.1-android'
215218
implementation 'com.github.alxrm:animated-clock-icon:1.0.2'
216219
implementation 'androidx.multidex:multidex:2.0.1'
217-
implementation 'com.google.code.gson:gson:2.8.9'
218-
implementation 'com.android.volley:volley:1.1.0'
220+
implementation 'com.google.code.gson:gson:2.10.1'
221+
implementation 'com.android.volley:volley:1.2.1'
219222
implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar'
220223

221224
implementation 'com.github.zurche:plain-pie:v0.2.9'
@@ -237,9 +240,6 @@ dependencies {
237240
}
238241

239242
implementation 'com.github.stfalcon:chatkit:0.3.3'
240-
implementation 'com.github.matthiasrobbers:shortbread:1.4.0'
241-
242-
annotationProcessor 'com.github.matthiasrobbers:shortbread-compiler:1.1.0'
243243
implementation ('com.adevinta.android:leku:9.1.4') {
244244
exclude group: 'com.google.android.gms'
245245
exclude group: 'androidx.appcompat'

‎app/src/free/AndroidManifest.xml

+6-145
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?><!--
2-
~ Copyright (C) 2015 Domoticz - Mark Heinis
3-
~
4-
~ Licensed to the Apache Software Foundation (ASF) under one
5-
~ or more contributor license agreements. See the NOTICE file
6-
~ distributed with this work for additional information
7-
~ regarding copyright ownership. The ASF licenses this file
8-
~ to you under the Apache License, Version 2.0 (the
9-
~ "License"); you may not use this file except in compliance
10-
~ with the License. You may obtain a copy of the License at
11-
~
12-
~ http://www.apache.org/licenses/LICENSE-2.0
13-
~
14-
~ Unless required by applicable law or agreed to in writing,
15-
~ software distributed under the License is distributed on an
16-
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17-
~ KIND, either express or implied. See the License for the
18-
~ specific language governing permissions and limitations
19-
~ under the License.
20-
-->
1+
<?xml version="1.0" encoding="utf-8"?>
212

223
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
234
xmlns:tools="http://schemas.android.com/tools">
24-
255
<uses-permission android:name="com.google.android.gms.permission.AD_ID" />
266
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
277
<uses-permission android:name="nl.hnogames.domoticz.premium.permission.MAPS_RECEIVE" />
@@ -48,9 +28,6 @@
4828
<uses-permission android:name="com.android.vending.BILLING" />
4929
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
5030

51-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
52-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
53-
5431
<supports-screens
5532
android:anyDensity="true"
5633
android:largeScreens="true"
@@ -107,6 +84,10 @@
10784
android:requestLegacyExternalStorage="true"
10885
tools:replace="android:icon, android:label, android:theme, android:name, android:allowBackup">
10986

87+
<meta-data
88+
android:name="com.google.firebase.messaging.default_notification_channel_id"
89+
android:value="@string/app_name_domoticz"/>
90+
11091
<activity android:exported="true"
11192
android:name="nl.hnogames.domoticz.NFCSettingsActivity"
11293
android:label="@string/category_nfc"
@@ -182,6 +163,7 @@
182163

183164
<service
184165
android:name="nl.hnogames.domoticz.service.FCMMessageInstanceService"
166+
android:stopWithTask="false"
185167
android:exported="false">
186168
<intent-filter>
187169
<action android:name="com.google.firebase.MESSAGING_EVENT" />
@@ -209,7 +191,6 @@
209191

210192
<activity android:exported="true"
211193
android:name="nl.hnogames.domoticz.MainActivity"
212-
213194
android:label="@string/app_name_domoticz"
214195
android:launchMode="singleTop"
215196
android:resizeableActivity="true">
@@ -454,126 +435,6 @@
454435
android:value="nl.hnogames.domoticz.GeoSettingsActivity" />
455436
</activity>
456437

457-
<receiver android:exported="true" android:name="nl.hnogames.domoticz.widgets.WidgetProviderLarge">
458-
<intent-filter>
459-
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
460-
</intent-filter>
461-
<meta-data
462-
android:name="android.appwidget.provider"
463-
android:resource="@xml/appwidgetprovider" />
464-
</receiver>
465-
466-
<service
467-
android:exported="true" android:name="nl.hnogames.domoticz.widgets.WidgetIntentService">
468-
<meta-data
469-
android:name="android.appwidget.provider"
470-
android:resource="@xml/appwidgetprovider" />
471-
</service>
472-
473-
<activity android:exported="true"
474-
android:name="nl.hnogames.domoticz.widgets.WidgetConfigurationActivity"
475-
476-
android:label="Domoticz Widget Config"
477-
android:resizeableActivity="true">
478-
<intent-filter>
479-
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
480-
</intent-filter>
481-
<intent-filter>
482-
<action android:name="android.intent.action.SEARCH" />
483-
</intent-filter>
484-
485-
<meta-data
486-
android:name="android.app.searchable"
487-
android:resource="@xml/searchable" />
488-
</activity>
489-
490-
<service
491-
android:exported="true" android:name="nl.hnogames.domoticz.widgets.WidgetProviderLarge$UpdateWidgetService" />
492-
493-
<receiver android:exported="true" android:name="nl.hnogames.domoticz.widgets.WidgetProviderSmall">
494-
<intent-filter>
495-
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
496-
</intent-filter>
497-
<meta-data
498-
android:name="android.appwidget.provider"
499-
android:resource="@xml/smallwidgetprovider" />
500-
</receiver>
501-
502-
<activity android:exported="true"
503-
android:name="nl.hnogames.domoticz.widgets.SmallWidgetConfigurationActivity"
504-
505-
android:label="Domoticz Widget Config"
506-
android:resizeableActivity="true">
507-
<intent-filter>
508-
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
509-
</intent-filter>
510-
<intent-filter>
511-
<action android:name="android.intent.action.SEARCH" />
512-
</intent-filter>
513-
514-
<meta-data
515-
android:name="android.app.searchable"
516-
android:resource="@xml/searchable" />
517-
</activity>
518-
519-
<service
520-
android:exported="true" android:name="nl.hnogames.domoticz.widgets.WidgetProviderSmall$UpdateWidgetService" />
521-
522-
<activity android:exported="true"
523-
android:name="nl.hnogames.domoticz.widgets.SecurityWidgetConfigurationActivity"
524-
525-
android:label="Domoticz Security Panel Widget Config"
526-
android:resizeableActivity="true">
527-
<intent-filter>
528-
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
529-
</intent-filter>
530-
</activity>
531-
532-
<receiver android:exported="true" android:name="nl.hnogames.domoticz.widgets.SecurityWidgetProvider">
533-
<intent-filter>
534-
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
535-
</intent-filter>
536-
<meta-data
537-
android:name="android.appwidget.provider"
538-
android:resource="@xml/securitywidgetprovider" />
539-
</receiver>
540-
541-
<service
542-
android:exported="true" android:name="nl.hnogames.domoticz.widgets.SecurityWidgetIntentService">
543-
<meta-data
544-
android:name="android.appwidget.provider"
545-
android:resource="@xml/securitywidgetprovider" />
546-
</service>
547-
548-
<receiver android:exported="true" android:name="nl.hnogames.domoticz.widgets.WidgetProviderSmallTemp">
549-
<intent-filter>
550-
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
551-
</intent-filter>
552-
<meta-data
553-
android:name="android.appwidget.provider"
554-
android:resource="@xml/smalltempwidgetprovider" />
555-
</receiver>
556-
557-
<activity android:exported="true"
558-
android:name="nl.hnogames.domoticz.widgets.SmallTempWidgetConfigurationActivity"
559-
560-
android:label="Domoticz Widget Config"
561-
android:resizeableActivity="true">
562-
<intent-filter>
563-
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
564-
</intent-filter>
565-
<intent-filter>
566-
<action android:name="android.intent.action.SEARCH" />
567-
</intent-filter>
568-
<meta-data
569-
android:name="android.app.searchable"
570-
android:resource="@xml/searchable" />
571-
</activity>
572-
573-
<service
574-
android:exported="true" android:name="nl.hnogames.domoticz.widgets.WidgetProviderSmallTemp$UpdateWidgetService" />
575-
<service
576-
android:exported="true" android:name="nl.hnogames.domoticz.widgets.SecurityWidgetProvider$UpdateSecurityWidgetService" />
577438
<receiver android:name="org.altbeacon.beacon.startup.StartupBroadcastReceiver" android:exported="true" tools:replace="android:exported">
578439
<intent-filter>
579440
<action android:name="android.intent.action.BOOT_COMPLETED"/>

0 commit comments

Comments
 (0)