Merge pull request #539 from domoticz/alpha-development

Alpha development
domoticz · Jul 31, 2019 · 249a009 · 249a009
2 parents 650e918 + 6bd6b7a
commit 249a009
Show file tree

Hide file tree

Showing 337 changed files with 5,322 additions and 5,403 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -170,20 +170,20 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.annotation:annotation:1.1.0'
 
-    implementation "com.google.firebase:firebase-core:16.0.9"
+    implementation "com.google.firebase:firebase-core:17.0.0"
     implementation "com.google.firebase:firebase-crash:16.2.1"
-    implementation "com.google.firebase:firebase-perf:17.0.2"
-    implementation "com.google.firebase:firebase-messaging:18.0.0"
-    implementation "com.google.firebase:firebase-ads:17.2.1"
+    implementation "com.google.firebase:firebase-perf:18.0.1"
+    implementation "com.google.firebase:firebase-messaging:19.0.1"
+    implementation "com.google.firebase:firebase-ads:18.0.0"
     implementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
 
-    implementation "com.google.android.gms:play-services-analytics:16.0.8"
-    implementation "com.google.android.gms:play-services-wearable:16.0.1"
-    implementation "com.google.android.gms:play-services-maps:16.1.0"
-    implementation "com.google.android.gms:play-services-gcm:16.1.0"
-    implementation "com.google.android.gms:play-services-location:16.0.0"
-    implementation "com.google.android.gms:play-services-places:16.1.0"
-    implementation "com.google.android.gms:play-services-ads:17.2.1"
+    implementation "com.google.android.gms:play-services-analytics:17.0.0"
+    implementation "com.google.android.gms:play-services-wearable:17.0.0"
+    implementation "com.google.android.gms:play-services-maps:17.0.0"
+    implementation "com.google.android.gms:play-services-gcm:17.0.0"
+    implementation "com.google.android.gms:play-services-location:17.0.0"
+    implementation "com.google.android.gms:play-services-places:17.0.0"
+    implementation "com.google.android.gms:play-services-ads:18.0.0"
     implementation 'com.google.android.ads.consent:consent-library:1.0.7'
     implementation "com.github.nisrulz:recyclerviewhelper:27.1.1"
 

diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/BluetoothAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/BluetoothAdapter.java
@@ -124,7 +124,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
             holder.switch_idx.setText(context.getString(R.string.connectedSwitch) + ": " + mBluetoothInfo.getSwitchIdx());
         } else {
             holder.switch_idx.setText(context.getString(R.string.connectedSwitch)
-                + ": " + context.getString(R.string.not_available));
+                    + ": " + context.getString(R.string.not_available));
         }
 
         if (!UsefulBits.isEmpty(mBluetoothInfo.getValue()))

diff --git a/app/src/main/java/nl/hnogames/domoticz/Adapters/CamerasAdapter.java b/app/src/main/java/nl/hnogames/domoticz/Adapters/CamerasAdapter.java
@@ -110,7 +110,7 @@ private void SaveSorting() {
     @Override
     public DataObjectHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         View view = LayoutInflater.from(parent.getContext())
-            .inflate(R.layout.camera_row, parent, false);
+                .inflate(R.layout.camera_row, parent, false);
 
         if (mSharedPrefs.darkThemeEnabled()) {
             if ((view.findViewById(R.id.card_global_wrapper)) != null)
@@ -138,16 +138,16 @@ public void onBindViewHolder(@NonNull DataObjectHolder holder, int position) {
 
                 if (holder.camera.getDrawable() == null) {
                     picasso.load(imageUrl)
-                        .placeholder(R.drawable.placeholder)
-                        //.error(mSharedPrefs.darkThemeEnabled() ? R.drawable.baseline_error_outline_white_24 : R.drawable.baseline_error_outline_black_24)
-                        .into(holder.camera);
+                            .placeholder(R.drawable.placeholder)
+                            //.error(mSharedPrefs.darkThemeEnabled() ? R.drawable.baseline_error_outline_white_24 : R.drawable.baseline_error_outline_black_24)
+                            .into(holder.camera);
                 } else
                     picasso.load(imageUrl)
-                        .memoryPolicy(MemoryPolicy.NO_CACHE)
-                        .noFade()
-                        .noPlaceholder()
-                        //.error(mSharedPrefs.darkThemeEnabled() ? R.drawable.baseline_error_outline_white_24 : R.drawable.baseline_error_outline_black_24)
-                        .into(holder.camera);
+                            .memoryPolicy(MemoryPolicy.NO_CACHE)
+                            .noFade()
+                            .noPlaceholder()
+                            //.error(mSharedPrefs.darkThemeEnabled() ? R.drawable.baseline_error_outline_white_24 : R.drawable.baseline_error_outline_black_24)
+                            .into(holder.camera);
             } catch (Exception ex) {
                 Log.i("CameraAdapter", ex.getMessage());
             }
@@ -190,7 +190,7 @@ public interface onClickListener {
     }
 
     public static class DataObjectHolder extends RecyclerView.ViewHolder
-        implements View.OnClickListener, RVHViewHolder {
+            implements View.OnClickListener, RVHViewHolder {
         TextView name;
         ImageView camera;