Fixed settings not saving

Author: K3vinb5

app/src/main/java/kevin/carrismobile/fragments/SettingsFragment.java

@@ -56,19 +56,26 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         mapTilerSwitch = v.findViewById(R.id.mapTilerSwitch);
         resetButton = v.findViewById(R.id.resetPreferences);
         mPrefs = getActivity().getSharedPreferences("SettingsFragment", MODE_PRIVATE);
-        if (loadObject("key_topo", String.class) == null){
-            storeObject(new Gson().toJson("1"), "key_topo");
-            openTopoSwitch.setChecked(true);
+        String selectedSwitch = (String)loadObject("key_settings", String.class);
+        if (loadObject("key_settings", String.class) == null){
+            storeObject(new Gson().toJson("topo"), "key_settings");
+            openTopoSwitch.performClick();
         }else{
-            String topo_switched = (String)loadObject("key_topo", String.class);
-            String thunderForest_switched = (String)loadObject("key_tunderForest", String.class);
-            String bingMaps_switched = (String)loadObject("key_bingMaps", String.class);
-            if (topo_switched != null && topo_switched.equals("1")){
-                openTopoSwitch.performClick();
-            }else if(thunderForest_switched != null && thunderForest_switched.equals("1")){
-                thunderForestSwitch.performClick();
-            }else if(bingMaps_switched != null && bingMaps_switched.equals("1")){
-                bingMapsSwitch.performClick();
+            switch (selectedSwitch) {
+                case "topo":
+                    openTopoSwitch.performClick();
+                    break;
+                case "thunderForest":
+                    thunderForestSwitch.performClick();
+                    break;
+                case "bingMaps":
+                    bingMapsSwitch.performClick();
+                    break;
+                case "mapTiler":
+                    mapTilerSwitch.performClick();
+                    break;
+                default:
+                    openTopoSwitch.performClick();
             }
         }
         setOpenTopoSwitchOnClickListener();
@@ -114,7 +121,7 @@ public void onClick(View view) {
                 map1.invalidate();
                 map2.invalidate();
                 map3.invalidate();
-                storeObject(new Gson().toJson("1"), "key_topo");
+                storeObject(new Gson().toJson("topo"), "key_settings");
             }
         });
     }
@@ -151,7 +158,7 @@ public void onClick(View view) {
                 map1.invalidate();
                 map2.invalidate();
                 map3.invalidate();
-                storeObject(new Gson().toJson("1"), "key_bingMaps");
+                storeObject(new Gson().toJson("bingMaps"), "key_settings");
             }
         });
     }
@@ -187,7 +194,7 @@ public void onClick(View view) {
                 map1.invalidate();
                 map2.invalidate();
                 map3.invalidate();
-                storeObject(new Gson().toJson("1"), "key_thunderForest");
+                storeObject(new Gson().toJson("thunderForest"), "key_settings");
             }
         });
     }
@@ -235,7 +242,7 @@ public void onClick(View view) {
                 map1.invalidate();
                 map2.invalidate();
                 map3.invalidate();
-                storeObject(new Gson().toJson("1"), "key_mapTiler");
+                storeObject(new Gson().toJson("mapTiler"), "key_settings");
             }
         });
     }

app/src/main/res/layout/realtime_fragment.xml

@@ -71,7 +71,7 @@
         android:layout_width="wrap_content"
         android:layout_height="40dp"
         android:layout_marginStart="10dp"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="5dp"
         android:backgroundTint="@color/lightYellow"
         android:text="Anterior"
         android:textColor="@color/black"
@@ -82,13 +82,13 @@
         android:id="@+id/nextButton"
         android:layout_width="wrap_content"
         android:layout_height="40dp"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="5dp"
         android:layout_marginEnd="10dp"
         android:backgroundTint="@color/lightYellow"
         android:text="Seguinte"
         android:textColor="@color/black"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/button2" />
+        app:layout_constraintTop_toBottomOf="@+id/editText2" />
 
     <TextView
         android:id="@+id/textViewRealTimeFragment"