Code cleanup in fragment handling

fesch · Nov 24, 2019 · ab7106e · ab7106e
1 parent 23a7b9d
commit ab7106e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 546 deletions.
diff --git a/app/src/main/java/lu/fisch/canze/changelog.txt b/app/src/main/java/lu/fisch/canze/changelog.txt
@@ -1,3 +1,4 @@
+2019-11-24 [Jeroen] Code cleanup in fragment handling
 2019-11-24 [Jeroen] Updated .gitignore to exclude some .idea and backup stuff
 2019-11-23 [Jeroen] Full refactor of Tyre to Tire
 2019-11-23 [Jeroen] Several fixes Tyres, changelog

diff --git a/app/src/main/java/lu/fisch/canze/fragments/ExperimentalFragment.java b/app/src/main/java/lu/fisch/canze/fragments/ExperimentalFragment.java
@@ -24,22 +24,21 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
 import lu.fisch.canze.BuildConfig;
 import lu.fisch.canze.R;
 import lu.fisch.canze.activities.DashActivity;
 import lu.fisch.canze.activities.FieldTestActivity;
 import lu.fisch.canze.activities.MainActivity;
-import lu.fisch.canze.activities.SpeedcontrolActivity;
 import lu.fisch.canze.activities.ResearchActivity;
+import lu.fisch.canze.activities.SpeedcontrolActivity;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -58,7 +57,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
 
         activateButton(view, R.id.buttonDash, DashActivity.class);
         activateButton(view, R.id.buttonSpeed, SpeedcontrolActivity.class);
-        activateButton(view, R.id.buttonFieldTest, FieldTestActivity.class, false);
+        activateButton(view, R.id.buttonFieldTest, FieldTestActivity.class, true);
         activateButton(view, R.id.buttonResearch, ResearchActivity.class);
 
         return view;
@@ -82,13 +81,13 @@ public void onClick(View v) {
     }
 
     private void activateButton(View view, int buttonId, final Class<?> activityClass, boolean onlyDebug) {
-        if (!onlyDebug){// || BuildConfig.BRANCH != "master") {
-            activateButton(view, buttonId, activityClass);
-        } else {
-            // if on master and onlydebug is true, remove text and image
+        if (BuildConfig.BRANCH.equals("master") & onlyDebug) {
+            // if on master and onlyDebug is true, remove text and image
             Button button = view.findViewById(buttonId);
             button.setText("");
             button.setCompoundDrawables(null, null,null, null);
+        } else {
+            activateButton(view, buttonId, activityClass);
         }
     }
 

diff --git a/app/src/main/java/lu/fisch/canze/fragments/MainFragment.java b/app/src/main/java/lu/fisch/canze/fragments/MainFragment.java
@@ -57,8 +57,8 @@
 
 public class MainFragment extends Fragment {
 
-    static boolean firstRun = true;
-    static String msg = "";
+    private static boolean firstRun = true;
+    private static String msg = "";
 
     public MainFragment() {
         // Required empty public constructor