Updates before release -> v1.2.9

maxieds · Oct 20, 2020 · 9df6b5e · 9df6b5e
1 parent 43693aa
commit 9df6b5e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/src/main/java/com/maxieds/chameleonminilivedebugger/LiveLoggerActivity.java b/app/src/main/java/com/maxieds/chameleonminilivedebugger/LiveLoggerActivity.java
@@ -86,7 +86,7 @@ public static LiveLoggerActivity getLiveLoggerInstance() {
      private static View liveLoggerActivityMainContentView = null;
 
      public static View getContentView(@IdRes int viewResId) {
-          View mainContentView = LiveLoggerActivity.getLiveLoggerInstance().findViewById(android.R.id.content);
+          View mainContentView = liveLoggerActivityMainContentView;
           if(mainContentView == null || mainContentView.findViewById(viewResId) == null) {
                mainContentView = LiveLoggerActivity.getLiveLoggerInstance().findViewById(android.R.id.content).getRootView();
                if (mainContentView == null || mainContentView.findViewById(viewResId) == null) {
@@ -98,9 +98,9 @@ public static View getContentView(@IdRes int viewResId) {
                               if (mainContentView == null || mainContentView.findViewById(viewResId) == null) {
                                    mainContentView = LiveLoggerActivity.getInstance().findViewById(viewResId);
                                    if (mainContentView == null) {
-                                        mainContentView = liveLoggerActivityMainContentView;
+                                        mainContentView = LiveLoggerActivity.getLiveLoggerInstance().findViewById(android.R.id.content);;
                                         if (mainContentView != null) {
-                                             Log.i(TAG, "liveLoggerActivityMainContentView");
+                                             Log.i(TAG, "findViewById(android.R.id.content)");
                                              return mainContentView.findViewById(viewResId);
                                         } else {
                                              return null;
@@ -119,7 +119,7 @@ public static View getContentView(@IdRes int viewResId) {
                     return mainContentView.findViewById(viewResId);
                }
           }
-          Log.i(TAG, "findViewById(android.R.id.content)");
+          Log.i(TAG, "liveLoggerActivityMainContentView");
           return mainContentView.findViewById(viewResId);
      }
 

diff --git a/app/src/main/java/com/maxieds/chameleonminilivedebugger/TabFragment.java b/app/src/main/java/com/maxieds/chameleonminilivedebugger/TabFragment.java
@@ -325,7 +325,7 @@ public boolean changeMenuItemDisplay(int mitemIdx) {
                         "Register View"
                 },
                 new int[] {
-                        R.layout.scripting_tab_load_import,
+                        R.layout.tab_under_construction, // R.layout.scripting_tab_load_import,
                         R.layout.tab_under_construction,
                         R.layout.tab_under_construction