Removed tooltip bar for now, will come back to it later

oxters168 · Aug 12, 2023 · a7d0db0 · a7d0db0
1 parent f30daca
commit a7d0db0
Show file tree

Hide file tree

Showing 3 changed files with 132 additions and 6 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/app/src/main/java/com/OxGames/OxShell/PagedActivity.java b/app/src/main/java/com/OxGames/OxShell/PagedActivity.java
@@ -287,7 +287,8 @@ protected void onResume() {
         settingsDrawer.onResume();
         dynamicInput.onResume();
         prompt.onResume();
-        tooltipBarView.onResume();
+        if (tooltipBarView != null)
+            tooltipBarView.onResume();
         //settingsDrawer.setShown(isContextDrawerOpen());
         //settingsDrawer.setX(settingsDrawerWidth);
         setActionBarHidden(true);
@@ -304,9 +305,11 @@ protected void onResume() {
     }
 
     private void onKeyCombosChanged(String tag) {
-        tooltipBarView.setShownInputType(InputType.Touch);
-        tooltipBarView.refreshInputs();
-        //tooltipBarView.refreshViews();
+        if (tooltipBarView != null) {
+            tooltipBarView.setShownInputType(InputType.Touch);
+            tooltipBarView.refreshInputs();
+            //tooltipBarView.refreshViews();
+        }
     }
 
     @Override
@@ -357,7 +360,8 @@ protected void onPause() {
         settingsDrawer.onPause();
         dynamicInput.onPause();
         prompt.onPause();
-        tooltipBarView.onPause();
+        if (tooltipBarView != null)
+            tooltipBarView.onPause();
         //tagFromPause = InputHandler.getActiveTag();
         super.onPause();
     }
@@ -507,7 +511,7 @@ private void prepareOtherViews() {
         dynamicInput.setShown(dynamicInput.isOverlayShown());
         initPromptView();
         prompt.setShown(prompt.isPromptShown());
-        initTooltipBarView();
+        // initTooltipBarView();
         // TODO: set tooltip bar shown based on settings
         initDebugView();
         debugView.setShown(debugView.isDebugShown());