Skip to content

Commit 7c44221

Browse files
galadrilgaladril
authored
Merge pull request #547 from domoticz/alpha-development
Alpha development
2 parents 249a009 + 94dc915 commit 7c44221

File tree

138 files changed

+4108
-3181
lines changed

Some content is hidden

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

138 files changed

+4108
-3181
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,5 @@ libs/MemorizingTrustManager/build/
4848

4949

5050
# Android Studio build files
51-
ajcore.*
51+
ajcore.*
52+
*.hprof

‎app/build.gradle

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -161,20 +161,20 @@ dependencies {
161161
implementation fileTree(include: ['*.jar'], dir: 'libs')
162162

163163
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
164-
implementation 'androidx.appcompat:appcompat:1.1.0-beta01'
164+
implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
165165
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
166-
implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha06'
166+
implementation 'androidx.recyclerview:recyclerview:1.1.0-beta03'
167167
implementation 'androidx.cardview:cardview:1.0.0'
168168
implementation 'androidx.biometric:biometric:1.0.0-alpha04'
169-
implementation 'com.google.android.material:material:1.1.0-alpha07'
169+
implementation 'com.google.android.material:material:1.1.0-alpha09'
170170
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
171171
implementation 'androidx.annotation:annotation:1.1.0'
172172

173-
implementation "com.google.firebase:firebase-core:17.0.0"
173+
implementation "com.google.firebase:firebase-core:17.1.0"
174174
implementation "com.google.firebase:firebase-crash:16.2.1"
175-
implementation "com.google.firebase:firebase-perf:18.0.1"
176-
implementation "com.google.firebase:firebase-messaging:19.0.1"
177-
implementation "com.google.firebase:firebase-ads:18.0.0"
175+
implementation "com.google.firebase:firebase-perf:19.0.0"
176+
implementation "com.google.firebase:firebase-messaging:20.0.0"
177+
implementation "com.google.firebase:firebase-ads:18.1.1"
178178
implementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
179179

180180
implementation "com.google.android.gms:play-services-analytics:17.0.0"
@@ -183,7 +183,7 @@ dependencies {
183183
implementation "com.google.android.gms:play-services-gcm:17.0.0"
184184
implementation "com.google.android.gms:play-services-location:17.0.0"
185185
implementation "com.google.android.gms:play-services-places:17.0.0"
186-
implementation "com.google.android.gms:play-services-ads:18.0.0"
186+
implementation "com.google.android.gms:play-services-ads:18.1.1"
187187
implementation 'com.google.android.ads.consent:consent-library:1.0.7'
188188
implementation "com.github.nisrulz:recyclerviewhelper:27.1.1"
189189

@@ -219,7 +219,10 @@ dependencies {
219219

220220
implementation 'com.github.matthiasrobbers:shortbread:1.0.2'
221221
annotationProcessor 'com.github.matthiasrobbers:shortbread-compiler:1.0.2'
222-
implementation 'com.schibstedspain.android:leku:3.3.0'
222+
implementation ('com.schibstedspain.android:leku:6.3.0') {
223+
exclude group: 'com.google.android.gms'
224+
exclude group: 'androidx.appcompat'
225+
}
223226
implementation 'com.github.k0shk0sh:PermissionHelper:1.1.0'
224227
implementation 'com.github.zagum:SpeechRecognitionView:1.0.2'
225228
implementation "com.github.skydoves:colorpickerview:2.0.1"

‎app/src/debug/AndroidManifest.xml

Lines changed: 60 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -89,48 +89,47 @@
8989
<uses-permission android:name="android.permission.CAMERA"/>
9090
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
9191
<uses-permission android:name="android.permission.USE_FINGERPRINT"/>
92-
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
92+
<uses-permission android:name="android.permission.USE_BIOMETRIC"/>
9393
<uses-permission android:name="android.permission.WAKE_LOCK"/>
9494
<uses-permission android:name="com.android.vending.CHECK_LICENSE"/>
9595

96-
<uses-permission
97-
android:name="android.permission.RECEIVE_SMS"
98-
tools:node="remove" />
99-
<uses-permission
100-
android:name="android.permission.READ_SMS"
101-
tools:node="remove" />
102-
<uses-permission
103-
android:name="android.permission.SEND_SMS"
104-
tools:node="remove" />
105-
<uses-permission
106-
android:name="android.permission.WRITE_SMS"
107-
tools:node="remove" />
108-
<uses-permission
109-
android:name="android.permission.RECEIVE_WAP_PUSH"
110-
tools:node="remove" />
111-
<uses-permission
112-
android:name="android.permission.RECEIVE_MMS"
113-
tools:node="remove" />
114-
<uses-permission
115-
android:name="android.permission.READ_CALL_LOG"
116-
tools:node="remove" />
117-
<uses-permission
118-
android:name="android.permission.WRITE_CALL_LOG"
119-
tools:node="remove" />
120-
<uses-permission
121-
android:name="android.permission.PROCESS_OUTGOING_CALLS"
122-
tools:node="remove" />
123-
96+
<uses-permission
97+
android:name="android.permission.RECEIVE_SMS"
98+
tools:node="remove"/>
99+
<uses-permission
100+
android:name="android.permission.READ_SMS"
101+
tools:node="remove"/>
102+
<uses-permission
103+
android:name="android.permission.SEND_SMS"
104+
tools:node="remove"/>
105+
<uses-permission
106+
android:name="android.permission.WRITE_SMS"
107+
tools:node="remove"/>
108+
<uses-permission
109+
android:name="android.permission.RECEIVE_WAP_PUSH"
110+
tools:node="remove"/>
111+
<uses-permission
112+
android:name="android.permission.RECEIVE_MMS"
113+
tools:node="remove"/>
114+
<uses-permission
115+
android:name="android.permission.READ_CALL_LOG"
116+
tools:node="remove"/>
117+
<uses-permission
118+
android:name="android.permission.WRITE_CALL_LOG"
119+
tools:node="remove"/>
120+
<uses-permission
121+
android:name="android.permission.PROCESS_OUTGOING_CALLS"
122+
tools:node="remove"/>
123+
124124
<application
125125
android:name=".app.AppController"
126-
android:allowBackup="true"
127126
android:icon="@mipmap/ic_launcher"
128127
android:label="@string/app_name_domoticz"
129-
android:theme="@style/AppThemeMain"
130128
android:usesCleartextTraffic="true"
129+
android:theme="@style/AppThemeMain"
131130
tools:replace="android:icon, android:label, android:theme, android:name">
132131

133-
<activity android:name=".Service.NFCServiceActivity">
132+
<activity android:name=".Service$NFCServiceActivity">
134133
<intent-filter>
135134
<action android:name="android.intent.action.VIEW"/>
136135

@@ -155,8 +154,8 @@
155154
android:enabled="true"
156155
android:exported="true">
157156
<intent-filter>
158-
<action android:name="android.bluetooth.device.action.ACL_CONNECTED" />
159-
<action android:name="android.bluetooth.device.action.ACL_DISCONNECTED" />
157+
<action android:name="android.bluetooth.device.action.ACL_CONNECTED"/>
158+
<action android:name="android.bluetooth.device.action.ACL_DISCONNECTED"/>
160159
</intent-filter>
161160
</receiver>
162161

@@ -289,6 +288,33 @@
289288

290289
<service android:name=".Widgets.SecurityWidgetProvider$UpdateSecurityWidgetService"/>
291290

291+
<receiver android:name=".Widgets.WidgetProviderSmallTemp">
292+
<intent-filter>
293+
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
294+
</intent-filter>
295+
<meta-data
296+
android:name="android.appwidget.provider"
297+
android:resource="@xml/smalltempwidgetprovider"/>
298+
</receiver>
299+
300+
<activity
301+
android:name=".Widgets.SmallTempWidgetConfigurationActivity"
302+
android:configChanges="orientation|screenSize"
303+
android:label="Domoticz Widget Config">
304+
<intent-filter>
305+
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
306+
</intent-filter>
307+
<intent-filter>
308+
<action android:name="android.intent.action.SEARCH"/>
309+
</intent-filter>
310+
311+
<meta-data
312+
android:name="android.app.searchable"
313+
android:resource="@xml/searchable"/>
314+
</activity>
315+
316+
<service android:name=".Widgets.WidgetProviderSmallTemp$UpdateWidgetService"/>
317+
292318
<receiver android:name=".Service.BootUpReceiver">
293319
<intent-filter>
294320
<action android:name="android.intent.action.BOOT_COMPLETED"/>

‎app/src/main/AndroidManifest.xml

Lines changed: 40 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -87,47 +87,46 @@
8787
<uses-permission android:name="android.permission.NFC"/>
8888
<uses-permission android:name="android.permission.CAMERA"/>
8989
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
90-
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
90+
<uses-permission android:name="android.permission.USE_BIOMETRIC"/>
9191
<uses-permission android:name="android.permission.USE_FINGERPRINT"/>
9292
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
9393
<uses-permission android:name="android.permission.WAKE_LOCK"/>
9494
<uses-permission android:name="com.android.vending.CHECK_LICENSE"/>
9595

9696
<uses-permission
9797
android:name="android.permission.RECEIVE_SMS"
98-
tools:node="remove" />
98+
tools:node="remove"/>
9999
<uses-permission
100100
android:name="android.permission.READ_SMS"
101-
tools:node="remove" />
101+
tools:node="remove"/>
102102
<uses-permission
103103
android:name="android.permission.SEND_SMS"
104-
tools:node="remove" />
104+
tools:node="remove"/>
105105
<uses-permission
106106
android:name="android.permission.WRITE_SMS"
107-
tools:node="remove" />
107+
tools:node="remove"/>
108108
<uses-permission
109109
android:name="android.permission.RECEIVE_WAP_PUSH"
110-
tools:node="remove" />
110+
tools:node="remove"/>
111111
<uses-permission
112112
android:name="android.permission.RECEIVE_MMS"
113-
tools:node="remove" />
113+
tools:node="remove"/>
114114
<uses-permission
115115
android:name="android.permission.READ_CALL_LOG"
116-
tools:node="remove" />
116+
tools:node="remove"/>
117117
<uses-permission
118118
android:name="android.permission.WRITE_CALL_LOG"
119-
tools:node="remove" />
119+
tools:node="remove"/>
120120
<uses-permission
121121
android:name="android.permission.PROCESS_OUTGOING_CALLS"
122-
tools:node="remove" />
122+
tools:node="remove"/>
123123

124124
<application
125125
android:name=".app.AppController"
126-
android:allowBackup="true"
127126
android:icon="@mipmap/ic_launcher"
128127
android:label="@string/app_name_domoticz"
129-
android:theme="@style/AppThemeMain"
130128
android:usesCleartextTraffic="true"
129+
android:theme="@style/AppThemeMain"
131130
tools:replace="android:icon, android:label, android:theme, android:name">
132131

133132
<activity android:name=".Service.NFCServiceActivity">
@@ -153,8 +152,8 @@
153152
android:enabled="true"
154153
android:exported="true">
155154
<intent-filter>
156-
<action android:name="android.bluetooth.device.action.ACL_CONNECTED" />
157-
<action android:name="android.bluetooth.device.action.ACL_DISCONNECTED" />
155+
<action android:name="android.bluetooth.device.action.ACL_CONNECTED"/>
156+
<action android:name="android.bluetooth.device.action.ACL_DISCONNECTED"/>
158157
</intent-filter>
159158
</receiver>
160159

@@ -287,6 +286,33 @@
287286
android:resource="@xml/securitywidgetprovider"/>
288287
</service>
289288

289+
<receiver android:name=".Widgets.WidgetProviderSmallTemp">
290+
<intent-filter>
291+
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
292+
</intent-filter>
293+
<meta-data
294+
android:name="android.appwidget.provider"
295+
android:resource="@xml/smalltempwidgetprovider"/>
296+
</receiver>
297+
298+
<activity
299+
android:name=".Widgets.SmallTempWidgetConfigurationActivity"
300+
android:configChanges="orientation|screenSize"
301+
android:label="Domoticz Widget Config">
302+
<intent-filter>
303+
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
304+
</intent-filter>
305+
<intent-filter>
306+
<action android:name="android.intent.action.SEARCH"/>
307+
</intent-filter>
308+
309+
<meta-data
310+
android:name="android.app.searchable"
311+
android:resource="@xml/searchable"/>
312+
</activity>
313+
314+
<service android:name=".Widgets.WidgetProviderSmallTemp$UpdateWidgetService"/>
315+
290316
<service android:name=".Widgets.SecurityWidgetProvider$UpdateSecurityWidgetService"/>
291317

292318
<receiver android:name=".Service.BootUpReceiver">

‎app/src/main/java/nl/hnogames/domoticz/Adapters/BluetoothAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
124124
holder.switch_idx.setText(context.getString(R.string.connectedSwitch) + ": " + mBluetoothInfo.getSwitchIdx());
125125
} else {
126126
holder.switch_idx.setText(context.getString(R.string.connectedSwitch)
127-
+ ": " + context.getString(R.string.not_available));
127+
+ ": " + context.getString(R.string.not_available));
128128
}
129129

130130
if (!UsefulBits.isEmpty(mBluetoothInfo.getValue()))

‎app/src/main/java/nl/hnogames/domoticz/Adapters/CamerasAdapter.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ private void SaveSorting() {
110110
@Override
111111
public DataObjectHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
112112
View view = LayoutInflater.from(parent.getContext())
113-
.inflate(R.layout.camera_row, parent, false);
113+
.inflate(R.layout.camera_row, parent, false);
114114

115115
if (mSharedPrefs.darkThemeEnabled()) {
116116
if ((view.findViewById(R.id.card_global_wrapper)) != null)
@@ -138,16 +138,16 @@ public void onBindViewHolder(@NonNull DataObjectHolder holder, int position) {
138138

139139
if (holder.camera.getDrawable() == null) {
140140
picasso.load(imageUrl)
141-
.placeholder(R.drawable.placeholder)
142-
//.error(mSharedPrefs.darkThemeEnabled() ? R.drawable.baseline_error_outline_white_24 : R.drawable.baseline_error_outline_black_24)
143-
.into(holder.camera);
141+
.placeholder(R.drawable.placeholder)
142+
//.error(mSharedPrefs.darkThemeEnabled() ? R.drawable.baseline_error_outline_white_24 : R.drawable.baseline_error_outline_black_24)
143+
.into(holder.camera);
144144
} else
145145
picasso.load(imageUrl)
146-
.memoryPolicy(MemoryPolicy.NO_CACHE)
147-
.noFade()
148-
.noPlaceholder()
149-
//.error(mSharedPrefs.darkThemeEnabled() ? R.drawable.baseline_error_outline_white_24 : R.drawable.baseline_error_outline_black_24)
150-
.into(holder.camera);
146+
.memoryPolicy(MemoryPolicy.NO_CACHE)
147+
.noFade()
148+
.noPlaceholder()
149+
//.error(mSharedPrefs.darkThemeEnabled() ? R.drawable.baseline_error_outline_white_24 : R.drawable.baseline_error_outline_black_24)
150+
.into(holder.camera);
151151
} catch (Exception ex) {
152152
Log.i("CameraAdapter", ex.getMessage());
153153
}
@@ -190,7 +190,7 @@ public interface onClickListener {
190190
}
191191

192192
public static class DataObjectHolder extends RecyclerView.ViewHolder
193-
implements View.OnClickListener, RVHViewHolder {
193+
implements View.OnClickListener, RVHViewHolder {
194194
TextView name;
195195
ImageView camera;
196196

0 commit comments

Comments
 (0)