Removed 2 old dashboard features

galadril · galadril · commit af679d587ca2 · 2022-05-14T20:48:00.000+02:00
diff --git a/app/src/main/java/nl/hnogames/domoticz/EventsActivity.java b/app/src/main/java/nl/hnogames/domoticz/EventsActivity.java
@@ -28,7 +28,6 @@
 import androidx.appcompat.widget.Toolbar;
 import nl.hnogames.domoticz.app.AppCompatPermissionsActivity;
 import nl.hnogames.domoticz.fragments.Events;
-import nl.hnogames.domoticz.fragments.NotificationHistory;
 import nl.hnogames.domoticz.utils.SharedPrefUtil;
 import nl.hnogames.domoticz.utils.UsefulBits;
 
diff --git a/app/src/main/java/nl/hnogames/domoticz/LogsActivity.java b/app/src/main/java/nl/hnogames/domoticz/LogsActivity.java
@@ -28,7 +28,6 @@
 import androidx.appcompat.widget.Toolbar;
 import nl.hnogames.domoticz.app.AppCompatPermissionsActivity;
 import nl.hnogames.domoticz.fragments.Logs;
-import nl.hnogames.domoticz.fragments.NotificationHistory;
 import nl.hnogames.domoticz.utils.SharedPrefUtil;
 import nl.hnogames.domoticz.utils.UsefulBits;
 
diff --git a/app/src/main/java/nl/hnogames/domoticz/UserVariablesActivity.java b/app/src/main/java/nl/hnogames/domoticz/UserVariablesActivity.java
@@ -27,7 +27,6 @@
 
 import androidx.appcompat.widget.Toolbar;
 import nl.hnogames.domoticz.app.AppCompatPermissionsActivity;
-import nl.hnogames.domoticz.fragments.NotificationHistory;
 import nl.hnogames.domoticz.fragments.UserVariables;
 import nl.hnogames.domoticz.utils.SharedPrefUtil;
 import nl.hnogames.domoticz.utils.UsefulBits;
diff --git a/app/src/main/java/nl/hnogames/domoticz/WifiSettingsActivity.java b/app/src/main/java/nl/hnogames/domoticz/WifiSettingsActivity.java
@@ -74,7 +74,6 @@ public class WifiSettingsActivity extends AppCompatPermissionsActivity implement
     private WifiAdapter adapter;
     private Toolbar toolbar;
     private SwitchMaterial notificationSwitch;
-    ;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/nl/hnogames/domoticz/adapters/DashboardAdapter.java b/app/src/main/java/nl/hnogames/domoticz/adapters/DashboardAdapter.java
@@ -551,8 +551,7 @@ private void setDefaultRowData(DevicesInfo mDeviceInfo,
                         animation.setDuration(2000);
                         holder.pieView.startAnimation(animation);
                     }
-                    if (!mSharedPrefs.showExtraData())
-                        holder.switch_battery_level.setVisibility(View.GONE);
+                    holder.switch_battery_level.setVisibility(View.GONE);
                 } else
                     holder.pieView.setVisibility(View.GONE);
 
@@ -1862,29 +1861,15 @@ public void setButtons(DataObjectHolder holder, int button) {
         if (holder.spSelector != null) {
             holder.spSelector.setVisibility(View.GONE);
         }
-        if (!mSharedPrefs.showExtraData()) {
-            holder.signal_level.setVisibility(View.GONE);
-            holder.switch_battery_level.setVisibility(View.GONE);
-        } else {
-            holder.signal_level.setVisibility(View.VISIBLE);
-            holder.switch_battery_level.setVisibility(View.VISIBLE);
-        }
+        holder.signal_level.setVisibility(View.GONE);
+        holder.switch_battery_level.setVisibility(View.GONE);
         holder.switch_name.setVisibility(View.VISIBLE);
 
-        if (!mSharedPrefs.showExtraData()) {
-            holder.infoIcon.setVisibility(View.GONE);
-            if (!showAsList) {
-                ViewGroup.MarginLayoutParams p = (ViewGroup.MarginLayoutParams) holder.iconRow.getLayoutParams();
-                p.topMargin = 20;
-            }
-        } else {
-            holder.infoIcon.setVisibility(View.VISIBLE);
-            if (showAsList) {
-                ViewGroup.MarginLayoutParams p = (ViewGroup.MarginLayoutParams) holder.iconRow.getLayoutParams();
-                p.leftMargin = -15;
-            }
+        holder.infoIcon.setVisibility(View.GONE);
+        if (!showAsList) {
+            ViewGroup.MarginLayoutParams p = (ViewGroup.MarginLayoutParams) holder.iconRow.getLayoutParams();
+            p.topMargin = 20;
         }
-
         switch (button) {
             case Buttons.CLOCK:
                 if (holder.contentWrapper != null)
@@ -2095,8 +2080,7 @@ public void setButtons(DataObjectHolder holder, int button) {
             default:
                 if (holder.contentWrapper != null)
                     holder.contentWrapper.setVisibility(View.VISIBLE);
-                if (!mSharedPrefs.showExtraData())
-                    holder.signal_level.setVisibility(View.GONE);
+                holder.signal_level.setVisibility(View.GONE);
                 holder.switch_battery_level.setVisibility(View.VISIBLE);
                 if (holder.adview != null)
                     holder.adview.setVisibility(View.GONE);
diff --git a/app/src/main/java/nl/hnogames/domoticz/adapters/SceneAdapter.java b/app/src/main/java/nl/hnogames/domoticz/adapters/SceneAdapter.java
@@ -283,7 +283,7 @@ public void unLiked(LikeButton likeButton) {
                     holder.buttonLog.setOnClickListener(v -> handleLogButtonClick(v.getId()));
                 }
             } else throw new NullPointerException("Scene type not supported in the adapter for:\n"
-                    + mSceneInfo.toString());
+                    + mSceneInfo);
             holder.itemView.setOnClickListener(v -> listener.onItemClicked(v, position));
         }
     }
diff --git a/app/src/main/java/nl/hnogames/domoticz/adapters/SwitchesAdapter.java b/app/src/main/java/nl/hnogames/domoticz/adapters/SwitchesAdapter.java
@@ -244,7 +244,7 @@ public void unLiked(LikeButton likeButton) {
                 holder.buttonTimer.setId(extendedStatusInfo.getIdx());
                 holder.buttonTimer.setOnClickListener(v -> handleTimerButtonClick(v.getId()));
                 if (!UsefulBits.isEmpty(extendedStatusInfo.getTimers())) {
-                    if (extendedStatusInfo.getTimers().toLowerCase().equals("false"))
+                    if (extendedStatusInfo.getTimers().equalsIgnoreCase("false"))
                         holder.buttonTimer.setVisibility(View.GONE);
                 }
 
@@ -1863,8 +1863,6 @@ public void setButtons(DataObjectHolder holder, int button) {
             default:
                 if (holder.contentWrapper != null)
                     holder.contentWrapper.setVisibility(View.VISIBLE);
-                if (!mSharedPrefs.showExtraData())
-                    holder.signal_level.setVisibility(View.GONE);
                 holder.switch_battery_level.setVisibility(View.VISIBLE);
                 if (holder.adview != null)
                     holder.adview.setVisibility(View.GONE);
diff --git a/app/src/main/java/nl/hnogames/domoticz/app/DomoticzCardFragment.java b/app/src/main/java/nl/hnogames/domoticz/app/DomoticzCardFragment.java
@@ -138,7 +138,7 @@ public void onAttachFragment(Fragment fragment) {
             listener = (DomoticzFragmentListener) fragment;
         } catch (ClassCastException e) {
             throw new ClassCastException(
-                    fragment.toString() + " must implement DomoticzFragmentListener");
+                    fragment + " must implement DomoticzFragmentListener");
         }
     }
 
diff --git a/app/src/main/java/nl/hnogames/domoticz/app/DomoticzDashboardFragment.java b/app/src/main/java/nl/hnogames/domoticz/app/DomoticzDashboardFragment.java
@@ -217,37 +217,23 @@ public void setGridViewLayout() {
             }
 
             gridView.setHasFixedSize(true);
-            if (!mSharedPrefs.showDashboardAsList()) {
-                if (isTablet) {
-                    if (isPortrait) {
-                        StaggeredGridLayoutManager mLayoutManager = new StaggeredGridLayoutManager(1, StaggeredGridLayoutManager.VERTICAL);
-                        gridView.setLayoutManager(mLayoutManager);
-                    } else {
-                        StaggeredGridLayoutManager mLayoutManager = new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
-                        gridView.setLayoutManager(mLayoutManager);
-                    }
+
+            if (isTablet) {
+                StaggeredGridLayoutManager mLayoutManager;
+                if (isPortrait) {
+                    mLayoutManager = new StaggeredGridLayoutManager(3, StaggeredGridLayoutManager.VERTICAL);
                 } else {
-                    StaggeredGridLayoutManager mLayoutManager = new StaggeredGridLayoutManager(1, StaggeredGridLayoutManager.VERTICAL);
-                    gridView.setLayoutManager(mLayoutManager);
+                    mLayoutManager = new StaggeredGridLayoutManager(4, StaggeredGridLayoutManager.VERTICAL);
                 }
+                gridView.setLayoutManager(mLayoutManager);
             } else {
-                if (isTablet) {
-                    if (isPortrait) {
-                        StaggeredGridLayoutManager mLayoutManager = new StaggeredGridLayoutManager(3, StaggeredGridLayoutManager.VERTICAL);
-                        gridView.setLayoutManager(mLayoutManager);
-                    } else {
-                        StaggeredGridLayoutManager mLayoutManager = new StaggeredGridLayoutManager(4, StaggeredGridLayoutManager.VERTICAL);
-                        gridView.setLayoutManager(mLayoutManager);
-                    }
+                StaggeredGridLayoutManager mLayoutManager;
+                if (isPortrait) {
+                    mLayoutManager = new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
                 } else {
-                    if (isPortrait) {
-                        StaggeredGridLayoutManager mLayoutManager = new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
-                        gridView.setLayoutManager(mLayoutManager);
-                    } else {
-                        StaggeredGridLayoutManager mLayoutManager = new StaggeredGridLayoutManager(3, StaggeredGridLayoutManager.VERTICAL);
-                        gridView.setLayoutManager(mLayoutManager);
-                    }
+                    mLayoutManager = new StaggeredGridLayoutManager(3, StaggeredGridLayoutManager.VERTICAL);
                 }
+                gridView.setLayoutManager(mLayoutManager);
             }
             gridView.setItemAnimator(new SlideInUpAnimator(new OvershootInterpolator(1f)));
         } catch (Exception ignored) {
@@ -290,7 +276,7 @@ public void onAttachFragment(Fragment fragment) {
             listener = (DomoticzFragmentListener) fragment;
         } catch (ClassCastException e) {
             throw new ClassCastException(
-                    fragment.toString() + " must implement DomoticzFragmentListener");
+                    fragment + " must implement DomoticzFragmentListener");
         }
     }
 
diff --git a/app/src/main/java/nl/hnogames/domoticz/app/DomoticzRecyclerFragment.java b/app/src/main/java/nl/hnogames/domoticz/app/DomoticzRecyclerFragment.java
@@ -273,7 +273,7 @@ public void onAttachFragment(Fragment fragment) {
             listener = (DomoticzFragmentListener) fragment;
         } catch (ClassCastException e) {
             throw new ClassCastException(
-                    fragment.toString() + " must implement DomoticzFragmentListener");
+                    fragment + " must implement DomoticzFragmentListener");
         }
     }
 
diff --git a/app/src/main/java/nl/hnogames/domoticz/fragments/Dashboard.java b/app/src/main/java/nl/hnogames/domoticz/fragments/Dashboard.java
@@ -331,7 +331,7 @@ private void createListView(ArrayList<DevicesInfo> switches, SunRiseInfo sunrise
                 final switchesClickListener listener = this;
                 if (adapter == null) {
                     if (this.planID <= 0) {
-                        adapter = new DashboardAdapter(mContext, getServerUtil(), switches, listener, !mSharedPrefs.showDashboardAsList(), sunrise);
+                        adapter = new DashboardAdapter(mContext, getServerUtil(), switches, listener, false, sunrise);
                     } else {
                         gridView.setHasFixedSize(true);
                         GridLayoutManager mLayoutManager = new GridLayoutManager(getActivity(), 1);
@@ -1266,23 +1266,21 @@ public void onError(Exception error) {
     private void changeAdapterData(DevicesInfo clickedSwitch) {
         // Only when not showing the extra data on dashboard
         // When extra data is on, more info has to be changed other than the status
-        if (!mSharedPrefs.showExtraData()) {
-            try {
-                // Let's find out where the clicked switch is in the list
-                int index = extendedStatusSwitches.indexOf(clickedSwitch);
+        try {
+            // Let's find out where the clicked switch is in the list
+            int index = extendedStatusSwitches.indexOf(clickedSwitch);
 
-                // Add it back into the array list
-                extendedStatusSwitches.set(index, clickedSwitch);
+            // Add it back into the array list
+            extendedStatusSwitches.set(index, clickedSwitch);
 
-                // Clear the data in the adapter and add all switches back in
-                adapter.data.clear();
-                adapter.data.addAll(extendedStatusSwitches);
+            // Clear the data in the adapter and add all switches back in
+            adapter.data.clear();
+            adapter.data.addAll(extendedStatusSwitches);
 
-                // Notify the adapter the data has changed
-                adapter.notifyDataSetChanged();
-            } catch (Exception ex) {
-            }
-        } else processDashboard();
+            // Notify the adapter the data has changed
+            adapter.notifyDataSetChanged();
+        } catch (Exception ex) {
+        }
     }
 
     @Override
diff --git a/app/src/main/java/nl/hnogames/domoticz/preference/PreferenceFragment.java b/app/src/main/java/nl/hnogames/domoticz/preference/PreferenceFragment.java
@@ -239,8 +239,6 @@ private void setPreferences() {
         SwitchPreference customSortLockProperty = findPreference("lockSortCustom");
 
         // Dashboard settings
-        SwitchPreference extradataProperty = findPreference("extradata");
-        SwitchPreference dashboardAsListProperty = findPreference("dashboardAsList");
         SwitchPreference ClockPreference = findPreference("dashboardShowClock");
 
         // Notification settings
@@ -345,10 +343,8 @@ private void setPreferences() {
         sorting_category.setVisible(customSortProperty.isVisible() || customSortLockProperty.isVisible());
 
         // Dashboard settings
-        extradataProperty.setVisible(UsefulBits.isEmpty(filter) || extradataProperty.getTitle().toString().toLowerCase().contains(filter) || (extradataProperty.getSummary() != null && extradataProperty.getSummary().toString().toLowerCase().contains(filter)));
-        dashboardAsListProperty.setVisible(UsefulBits.isEmpty(filter) || dashboardAsListProperty.getTitle().toString().toLowerCase().contains(filter) || (dashboardAsListProperty.getSummary() != null && dashboardAsListProperty.getSummary().toString().toLowerCase().contains(filter)));
         ClockPreference.setVisible(UsefulBits.isEmpty(filter) || ClockPreference.getTitle().toString().toLowerCase().contains(filter) || (ClockPreference.getSummary() != null && ClockPreference.getSummary().toString().toLowerCase().contains(filter)));
-        dashboard_category.setVisible(extradataProperty.isVisible() || dashboardAsListProperty.isVisible() || ClockPreference.isVisible());
+        dashboard_category.setVisible(ClockPreference.isVisible());
 
         // Notification settings
         openNotificationSettings.setVisible(UsefulBits.isEmpty(filter) || openNotificationSettings.getTitle().toString().toLowerCase().contains(filter) || (openNotificationSettings.getSummary() != null && openNotificationSettings.getSummary().toString().toLowerCase().contains(filter)));
diff --git a/app/src/main/java/nl/hnogames/domoticz/service/FCMMessageInstanceService.java b/app/src/main/java/nl/hnogames/domoticz/service/FCMMessageInstanceService.java
@@ -29,7 +29,7 @@ public void onMessageReceived(RemoteMessage remoteMessage) {
             return;
 
         Map data = remoteMessage.getData();
-        Log.d("GCM", "Message Received: " + data.toString());
+        Log.d("GCM", "Message Received: " + data);
 
         if (data.containsKey("message")) {
             String message = decode(data.containsKey("message") ? data.get("message").toString() : "");
diff --git a/app/src/main/java/nl/hnogames/domoticz/service/WifiReceiver.java b/app/src/main/java/nl/hnogames/domoticz/service/WifiReceiver.java
@@ -31,8 +31,8 @@
 public class WifiReceiver extends Worker {
     private static final String TAG = "WifiReceiver";
     public static String workTag = "wifiscanner";
-    private WorkerParameters params;
-    private Context context;
+    private final WorkerParameters params;
+    private final Context context;
 
     public WifiReceiver(@NonNull Context context, @NonNull WorkerParameters params) {
         super(context, params);
diff --git a/app/src/main/java/nl/hnogames/domoticz/service/WifiReceiverManager.java b/app/src/main/java/nl/hnogames/domoticz/service/WifiReceiverManager.java
@@ -13,8 +13,8 @@
 public class WifiReceiverManager extends Worker {
     private static final String TAG = "WifiReceiverManager";
     public static String workTag = "checkwifi";
-    private WorkerParameters params;
-    private Context context;
+    private final WorkerParameters params;
+    private final Context context;
 
     public WifiReceiverManager(@NonNull Context context, @NonNull WorkerParameters params) {
         super(context, params);
diff --git a/app/src/main/java/nl/hnogames/domoticz/utils/SharedPrefUtil.java b/app/src/main/java/nl/hnogames/domoticz/utils/SharedPrefUtil.java
@@ -88,7 +88,6 @@ public class SharedPrefUtil {
     private static final String PREF_DISPLAY_LANGUAGE = "displayLanguage";
     private static final String PREF_SAVED_LANGUAGE = "savedLanguage";
     private static final String PREF_SAVED_LANGUAGE_DATE = "savedLanguageDate";
-    private static final String PREF_EXTRA_DATA = "extradata";
     private static final String PREF_STARTUP_SCREEN = "startup_nav";
     private static final String PREF_TASK_SCHEDULED = "task_scheduled";
     private static final String PREF_NAVIGATION_ITEMS = "show_nav_items";
@@ -137,7 +136,6 @@ public class SharedPrefUtil {
     @SuppressWarnings("FieldCanBeLocal")
     private final String PREF_SWITCH_BUTTONS = "switchButtons";
     @SuppressWarnings("FieldCanBeLocal")
-    private final String PREF_DASHBOARD_LIST = "dashboardAsList";
     private final Context mContext;
     private final SharedPreferences prefs;
     private final SharedPreferences.Editor editor;
@@ -151,10 +149,6 @@ public SharedPrefUtil(Context mContext) {
         gson = new Gson();
     }
 
-    public boolean showDashboardAsList() {
-        return prefs.getBoolean(PREF_DASHBOARD_LIST, true);
-    }
-
     public boolean addClockToDashboard() {
         return prefs.getBoolean(PREF_DASHBOARD_CLOCK, false);
     }
@@ -899,10 +893,6 @@ public void setAdvancedSettingsEnabled(boolean enabled) {
         editor.putBoolean(PREF_ADVANCED_SETTINGS_ENABLED, enabled).apply();
     }
 
-    public boolean showExtraData() {
-        return prefs.getBoolean(PREF_EXTRA_DATA, true);
-    }
-
     public boolean showCustomWear() {
         return prefs.getBoolean(PREF_CUSTOM_WEAR, false);
     }
diff --git a/app/src/main/java/nl/hnogames/domoticz/welcome/WelcomePage2.java b/app/src/main/java/nl/hnogames/domoticz/welcome/WelcomePage2.java
@@ -46,7 +46,7 @@
 
 public class WelcomePage2 extends Fragment implements OnPermissionCallback {
     private PermissionFragmentHelper permissionFragmentHelper;
-    private int IMPORT_SETTINGS = 555;
+    private final int IMPORT_SETTINGS = 555;
 
     public static WelcomePage2 newInstance() {
         return new WelcomePage2();
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -115,18 +115,6 @@
         android:icon="@drawable/baseline_view_carousel_black_24"
         android:key="dashboard_category"
         android:title="@string/title_dashboard">
-        <SwitchPreference
-            android:defaultValue="true"
-            android:key="extradata"
-            android:summaryOff="@string/show_extra_data_off"
-            android:summaryOn="@string/show_extra_data_on"
-            android:title="@string/extra_data_title" />
-        <SwitchPreference
-            android:defaultValue="true"
-            android:key="dashboardAsList"
-            android:summaryOff="@string/show_dashboard_list_on"
-            android:summaryOn="@string/show_dashboard_list_off"
-            android:title="@string/dashboard_list_title" />
         <SwitchPreference
             android:defaultValue="false"
             android:key="dashboardShowClock"
diff --git a/app/version.properties b/app/version.properties
@@ -1,4 +1,4 @@
-#Sat May 14 20:36:51 CEST 2022
-VERSION_BUILD=8619
+#Sat May 14 20:47:07 CEST 2022
+VERSION_BUILD=8626
 VERSION_CODE=620
 VERSION_PATCH=320
diff --git a/domoticzapi/version.properties b/domoticzapi/version.properties
@@ -1,4 +1,4 @@
-#Sat May 14 20:36:51 CEST 2022
+#Sat May 14 20:47:07 CEST 2022
 VERSION_BUILD=3675
 VERSION_CODE=254
 VERSION_PATCH=254

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ public void unLiked(LikeButton likeButton) {`
`283`	`283`	`holder.buttonLog.setOnClickListener(v -> handleLogButtonClick(v.getId()));`
`284`	`284`	`}`
`285`	`285`	`} else throw new NullPointerException("Scene type not supported in the adapter for:\n"`
`286`		`- + mSceneInfo.toString());`
	`286`	`+ + mSceneInfo);`
`287`	`287`	`holder.itemView.setOnClickListener(v -> listener.onItemClicked(v, position));`
`288`	`288`	`}`
`289`	`289`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public void onAttachFragment(Fragment fragment) {`
`138`	`138`	`listener = (DomoticzFragmentListener) fragment;`
`139`	`139`	`} catch (ClassCastException e) {`
`140`	`140`	`throw new ClassCastException(`
`141`		`- fragment.toString() + " must implement DomoticzFragmentListener");`
	`141`	`+ fragment + " must implement DomoticzFragmentListener");`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`
Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ public void onAttachFragment(Fragment fragment) {`
`273`	`273`	`listener = (DomoticzFragmentListener) fragment;`
`274`	`274`	`} catch (ClassCastException e) {`
`275`	`275`	`throw new ClassCastException(`
`276`		`- fragment.toString() + " must implement DomoticzFragmentListener");`
	`276`	`+ fragment + " must implement DomoticzFragmentListener");`
`277`	`277`	`}`
`278`	`278`	`}`
`279`	`279`