Skip to content

Commit bd543ce

Browse files
galadrilgaladril
authored
Merge pull request #662 from domoticz/alpha-development
Alpha development
2 parents 1a91740 + 440604f commit bd543ce

File tree

68 files changed

+2549
-804
lines changed

Some content is hidden

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

68 files changed

+2549
-804
lines changed

‎README.md

+12
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,23 @@ Toggle switches with your Android Wear device!
128128
All Android Wear devices are supported.
129129
![wear](https://cloud.githubusercontent.com/assets/14561640/11994714/ae6705ba-aa43-11e5-8e0c-5586607cdc6d.png)
130130

131+
132+
131133
# Android Auto
132134
-----
133135
Toggle switches directly in Android Auto
134136
![android-auto](https://user-images.githubusercontent.com/48728684/100537622-38545c00-322a-11eb-8f36-1fe481f1d3b0.png)
135137

138+
139+
140+
# Donation
141+
142+
If you like to support the Domoticz apps, you could always buy me a cup of coffee!
143+
(Thanks!)
144+
[![PayPal donate button](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.me/markheinis)
145+
146+
147+
136148
# Credits
137149
-----
138150
**freepik / elegantthemes** for icon

‎app/build.gradle

+5-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ android {
1616
value = 1
1717
println "Build Version: +1"
1818
}
19+
if ('bundleRelease' in runTasks || 'aR' in runTasks || ':app:compilePaidReleaseSources' in runTasks || ':app:generatePaidReleaseSources' in runTasks || ':app:bundlePaidRelease' in runTasks || ':app:compileoottReleaseSources' in runTasks || ':app:generateoottReleaseSources' in runTasks || ':app:bundleoottRelease' in runTasks) {
20+
value = 1
21+
println "Build Version: +1"
22+
}
23+
1924
println "****************************"
2025

2126
def versionMajor = 0
@@ -239,7 +244,6 @@ dependencies {
239244
implementation 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'
240245
implementation 'me.dm7.barcodescanner:zxing:1.9.8'
241246
implementation 'com.github.jd-alexander:LikeButton:0.2.3'
242-
implementation 'jp.wasabeef:recyclerview-animators:2.3.0'
243247
implementation 'com.github.javiersantos:PiracyChecker:1.1'
244248
implementation 'com.mikepenz:google-material-typeface:2.2.0.3.original@aar'
245249
implementation 'com.alexvasilkov:gesture-views:2.6.0'

‎app/src/free/AndroidManifest.xml

+20-20
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@
199199

200200
<activity android:exported="true"
201201
android:name="nl.hnogames.domoticz.MainActivity"
202-
android:configChanges="keyboardHidden|orientation|screenSize"
202+
203203
android:label="@string/app_name_domoticz"
204204
android:launchMode="singleTop"
205205
android:resizeableActivity="true">
@@ -240,7 +240,7 @@
240240
<activity
241241
android:exported="true"
242242
android:name="nl.hnogames.domoticz.SettingsActivity"
243-
android:configChanges="keyboardHidden|orientation|screenSize"
243+
244244
android:label="@string/settingsActivity_name"
245245
android:parentActivityName="nl.hnogames.domoticz.MainActivity"
246246
android:resizeableActivity="true">
@@ -251,7 +251,7 @@
251251

252252
<activity android:exported="true"
253253
android:name="nl.hnogames.domoticz.NotificationSettingsActivity"
254-
android:configChanges="keyboardHidden|orientation|screenSize"
254+
255255
android:label="@string/notification_screen_title"
256256
android:parentActivityName="nl.hnogames.domoticz.SettingsActivity"
257257
android:resizeableActivity="true">
@@ -267,7 +267,7 @@
267267
<activity
268268
android:exported="true"
269269
android:name="nl.hnogames.domoticz.CameraActivity"
270-
android:configChanges="keyboardHidden|orientation|screenSize"
270+
271271
android:label="@string/cameraActivity_name"
272272
android:parentActivityName="nl.hnogames.domoticz.MainActivity"
273273
android:resizeableActivity="true">
@@ -279,7 +279,7 @@
279279
<activity
280280
android:exported="true"
281281
android:name="nl.hnogames.domoticz.GraphActivity"
282-
android:configChanges="keyboardHidden|orientation|screenSize"
282+
283283
android:label="@string/wizard_graph"
284284
android:parentActivityName="nl.hnogames.domoticz.MainActivity"
285285
android:resizeableActivity="true">
@@ -291,7 +291,7 @@
291291
<activity
292292
android:exported="true"
293293
android:name="nl.hnogames.domoticz.TempGraphsActivity"
294-
android:configChanges="keyboardHidden|orientation|screenSize"
294+
295295
android:label="@string/wizard_graph"
296296
android:parentActivityName="nl.hnogames.domoticz.MainActivity"
297297
android:resizeableActivity="true">
@@ -303,7 +303,7 @@
303303
<activity
304304
android:exported="true"
305305
android:name="nl.hnogames.domoticz.PlanActivity"
306-
android:configChanges="keyboardHidden|orientation|screenSize"
306+
307307
android:label="@string/cameraActivity_name"
308308
android:parentActivityName="nl.hnogames.domoticz.PlanActivity"
309309
android:resizeableActivity="true">
@@ -315,7 +315,7 @@
315315
<activity
316316
android:exported="true"
317317
android:name="nl.hnogames.domoticz.ServerSettingsActivity"
318-
android:configChanges="keyboardHidden|orientation|screenSize"
318+
319319
android:label="@string/title_activity_server_settings"
320320
android:parentActivityName="nl.hnogames.domoticz.SettingsActivity"
321321
android:resizeableActivity="true">
@@ -327,7 +327,7 @@
327327
<activity
328328
android:exported="true"
329329
android:name="nl.hnogames.domoticz.GeoSettingsActivity"
330-
android:configChanges="keyboardHidden|orientation|screenSize"
330+
331331
android:label="@string/title_activity_server_settings"
332332
android:parentActivityName="nl.hnogames.domoticz.SettingsActivity"
333333
android:resizeableActivity="true">
@@ -338,7 +338,7 @@
338338

339339
<activity android:exported="true"
340340
android:name="nl.hnogames.domoticz.NFCSettingsActivity"
341-
android:configChanges="keyboardHidden|orientation|screenSize"
341+
342342
android:label="@string/category_nfc"
343343
android:parentActivityName="nl.hnogames.domoticz.SettingsActivity"
344344
android:resizeableActivity="true">
@@ -351,7 +351,7 @@
351351
<activity
352352
android:exported="true"
353353
android:name="nl.hnogames.domoticz.BluetoothSettingsActivity"
354-
android:configChanges="keyboardHidden|orientation|screenSize"
354+
355355
android:label="@string/category_bluetooth"
356356
android:parentActivityName="nl.hnogames.domoticz.SettingsActivity">
357357
<meta-data
@@ -362,7 +362,7 @@
362362
<activity
363363
android:exported="true"
364364
android:name="nl.hnogames.domoticz.BeaconSettingsActivity"
365-
android:configChanges="keyboardHidden|orientation|screenSize"
365+
366366
android:label="@string/category_bluetooth"
367367
android:parentActivityName="nl.hnogames.domoticz.SettingsActivity">
368368
<meta-data
@@ -373,15 +373,15 @@
373373
<activity
374374
android:exported="true"
375375
android:name="nl.hnogames.domoticz.SpeechSettingsActivity"
376-
android:configChanges="keyboardHidden|orientation|screenSize"
376+
377377
android:label="@string/category_Speech"
378378
android:parentActivityName="nl.hnogames.domoticz.SettingsActivity"
379379
android:resizeableActivity="true" />
380380

381381
<activity
382382
android:exported="true"
383383
android:name="nl.hnogames.domoticz.QRCodeSettingsActivity"
384-
android:configChanges="keyboardHidden|orientation|screenSize"
384+
385385
android:label="@string/category_QRCode"
386386
android:parentActivityName="nl.hnogames.domoticz.SettingsActivity"
387387
android:resizeableActivity="true" />
@@ -395,7 +395,7 @@
395395
<activity
396396
android:exported="true"
397397
android:name="nl.hnogames.domoticz.ServerListSettingsActivity"
398-
android:configChanges="keyboardHidden|orientation|screenSize"
398+
399399
android:label="@string/title_activity_server_settings"
400400
android:parentActivityName="nl.hnogames.domoticz.SettingsActivity"
401401
android:resizeableActivity="true">
@@ -407,7 +407,7 @@
407407
<activity
408408
android:exported="true"
409409
android:name="nl.hnogames.domoticz.welcome.WelcomeViewActivity"
410-
android:configChanges="keyboardHidden|orientation|screenSize"
410+
411411
android:label="@string/welcome_title_activity_welcome"
412412
android:resizeableActivity="true" />
413413

@@ -475,7 +475,7 @@
475475

476476
<activity android:exported="true"
477477
android:name="nl.hnogames.domoticz.widgets.WidgetConfigurationActivity"
478-
android:configChanges="keyboardHidden|orientation|screenSize"
478+
479479
android:label="Domoticz Widget Config"
480480
android:resizeableActivity="true">
481481
<intent-filter>
@@ -504,7 +504,7 @@
504504

505505
<activity android:exported="true"
506506
android:name="nl.hnogames.domoticz.widgets.SmallWidgetConfigurationActivity"
507-
android:configChanges="keyboardHidden|orientation|screenSize"
507+
508508
android:label="Domoticz Widget Config"
509509
android:resizeableActivity="true">
510510
<intent-filter>
@@ -524,7 +524,7 @@
524524

525525
<activity android:exported="true"
526526
android:name="nl.hnogames.domoticz.widgets.SecurityWidgetConfigurationActivity"
527-
android:configChanges="keyboardHidden|orientation|screenSize"
527+
528528
android:label="Domoticz Security Panel Widget Config"
529529
android:resizeableActivity="true">
530530
<intent-filter>
@@ -559,7 +559,7 @@
559559

560560
<activity android:exported="true"
561561
android:name="nl.hnogames.domoticz.widgets.SmallTempWidgetConfigurationActivity"
562-
android:configChanges="keyboardHidden|orientation|screenSize"
562+
563563
android:label="Domoticz Widget Config"
564564
android:resizeableActivity="true">
565565
<intent-filter>

0 commit comments

Comments
 (0)