add ability to hide cameraui #206

KillerInk · Oct 20, 2022 · 8651f7f · 8651f7f
1 parent 0f6431a
commit 8651f7f
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 0 deletions.
diff --git a/app/src/main/java/freed/cam/ui/EmptyFragment.java b/app/src/main/java/freed/cam/ui/EmptyFragment.java
@@ -0,0 +1,20 @@
+package freed.cam.ui;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.troop.freedcam.R;
+
+public class EmptyFragment extends Fragment
+{
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.emptyfragment, container, false);
+    }
+}
diff --git a/app/src/main/java/freed/cam/ui/themenextgen/adapter/NextGenCameraUiSlidePagerAdapter.java b/app/src/main/java/freed/cam/ui/themenextgen/adapter/NextGenCameraUiSlidePagerAdapter.java
@@ -7,21 +7,30 @@
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 
+import javax.inject.Inject;
+
+import freed.FreedApplication;
+import freed.cam.ui.EmptyFragment;
 import freed.cam.ui.themenextgen.fragment.NextGenCameraSettingFragment;
 import freed.cam.ui.themenextgen.fragment.NextGenCameraUiFragment;
+import freed.settings.SettingKeys;
+import freed.settings.SettingsManager;
 import freed.viewer.screenslide.views.ScreenSlideFragment;
 
 public class NextGenCameraUiSlidePagerAdapter extends FragmentStatePagerAdapter
 {
     private final NextGenCameraSettingFragment settingsMenuFragment = new NextGenCameraSettingFragment();
     private final ScreenSlideFragment screenSlideFragment = new ScreenSlideFragment();
     private final NextGenCameraUiFragment cameraUiFragment = new NextGenCameraUiFragment();
+    private final EmptyFragment emptyFragment = new EmptyFragment();
 
     ScreenSlideFragment.ButtonClick click;
+    SettingsManager settingsManager;
 
     public NextGenCameraUiSlidePagerAdapter(FragmentManager fm, ScreenSlideFragment.ButtonClick click) {
         super(fm);
         this.click = click;
+        settingsManager = FreedApplication.settingsManager();
     }
 
     @Override
@@ -36,6 +45,8 @@ else if (position == 2) {
             return screenSlideFragment;
         }
         else {
+            if (settingsManager.get(SettingKeys.HIDE_CAMERA_UI).get())
+                return emptyFragment;
             return cameraUiFragment;
         }
     }

diff --git a/app/src/main/java/freed/cam/ui/themenextgen/layoutconfig/SettingGroupConfig.java b/app/src/main/java/freed/cam/ui/themenextgen/layoutconfig/SettingGroupConfig.java
@@ -72,6 +72,7 @@ public List<SettingItemConfig> getEtcGroup()
         group.add(new SettingItemConfig(SettingKeys.THEME, R.string.setting_theme_header,R.string.setting_theme_description,false, SettingItemConfig.ViewType.Text));
         group.add(new SettingItemConfig(SettingKeys.PREVIEW_TEMPLATE, R.string.setting_previewtemplate_header,R.string.setting_previewtemplate_description,false, SettingItemConfig.ViewType.Text));
         group.add(new SettingItemConfig(SettingKeys.CAPTURE_TEMPLATE, R.string.setting_capturetemplate_header,R.string.setting_capturetemplate_description,false, SettingItemConfig.ViewType.Text));
+        group.add(new SettingItemConfig(SettingKeys.HIDE_CAMERA_UI, R.string.setting_disablecameraui_header, R.string.setting_disablecameraui_description,true, SettingItemConfig.ViewType.Boolean));
         return group;
     }
 

diff --git a/app/src/main/java/freed/cam/ui/themesample/CameraUiSlidePagerAdapter.java b/app/src/main/java/freed/cam/ui/themesample/CameraUiSlidePagerAdapter.java
@@ -7,21 +7,28 @@
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 
+import freed.FreedApplication;
+import freed.cam.ui.EmptyFragment;
 import freed.cam.ui.themesample.cameraui.CameraUiFragment;
 import freed.cam.ui.themesample.settings.SettingsMenuFragment;
+import freed.settings.SettingKeys;
+import freed.settings.SettingsManager;
 import freed.viewer.screenslide.views.ScreenSlideFragment;
 
 public class CameraUiSlidePagerAdapter extends FragmentStatePagerAdapter
 {
     private final SettingsMenuFragment settingsMenuFragment = new SettingsMenuFragment();
     private final ScreenSlideFragment screenSlideFragment = new ScreenSlideFragment();
     private final CameraUiFragment cameraUiFragment = new CameraUiFragment();
+    private final EmptyFragment emptyFragment = new EmptyFragment();
 
     ScreenSlideFragment.ButtonClick click;
+    SettingsManager settingsManager;
 
     public CameraUiSlidePagerAdapter(FragmentManager fm, ScreenSlideFragment.ButtonClick click) {
         super(fm);
         this.click = click;
+        settingsManager = FreedApplication.settingsManager();
     }
 
     @Override
@@ -36,6 +43,8 @@ else if (position == 2) {
             return screenSlideFragment;
         }
         else {
+            if (settingsManager.get(SettingKeys.HIDE_CAMERA_UI).get())
+                return emptyFragment;
             return cameraUiFragment;
         }
     }

diff --git a/app/src/main/java/freed/cam/ui/themesample/settings/SettingsMenuItemFactory.java b/app/src/main/java/freed/cam/ui/themesample/settings/SettingsMenuItemFactory.java
@@ -269,6 +269,9 @@ public void fillLeftSettingsMenu(CameraWrapperInterface cameraUiWrapper, Context
             etc.addView(booleanSetting);
         }
 
+        SettingsChild_BooleanSetting disablecameraui = new SettingsChild_BooleanSetting(context, apS.getGlobal(SettingKeys.HIDE_CAMERA_UI), R.string.setting_disablecameraui_header, R.string.setting_disablecameraui_description);
+        etc.addView(disablecameraui);
+
         if (cameraUiWrapper instanceof Camera2)
         {
             SettingsChildDumpCamera2VendorKeys dumpCamera2VendorKeys = new SettingsChildDumpCamera2VendorKeys(context,R.string.setting_dump_vendor_keys_header,R.string.setting_dump_vendor_keys_description,(Camera2) cameraUiWrapper);

diff --git a/app/src/main/java/freed/settings/SettingKeys.java b/app/src/main/java/freed/settings/SettingKeys.java
@@ -177,6 +177,7 @@ public class SettingKeys{
     public final static ApiKey<SettingMode> CAPTURE_TEMPLATE = new ApiKey(SettingMode.class, R.string.aps_capture_template_mode);
     public final static ApiKey<GlobalBooleanSettingMode> SUPPORT_POST_RAW_SENSITIVITY_BOOST = new ApiKey(GlobalBooleanSettingMode.class, R.string.aps_support_postrawsensitivityboost);
     public final static ApiKey<SettingMode> AE_METERING = new ApiKey(SettingMode.class, R.string.aps_support_aemetering);
+    public final static ApiKey<GlobalBooleanSettingMode> HIDE_CAMERA_UI = new ApiKey(GlobalBooleanSettingMode.class, R.string.aps_support_hidecameraui);
 
     /**
      *

diff --git a/app/src/main/res/layout/emptyfragment.xml b/app/src/main/res/layout/emptyfragment.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/appsettings_keys.xml b/app/src/main/res/values/appsettings_keys.xml
@@ -142,6 +142,7 @@
     <string name="aps_preview_template_mode" translatable="false">preview_template_mode</string>
     <string name="aps_capture_template_mode" translatable="false">capture_template_mode</string>
     <string name="aps_support_postrawsensitivityboost" translatable="false">support_postrawsensitivityboost</string>
+    <string name="aps_support_hidecameraui" translatable="false">hidecameraui</string>
     <string name="aps_support_aemetering" translatable="false">aemetering</string>
 
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -324,6 +324,8 @@
 
     <string name="setting_checkforupdate_description">When enabled it checks if a new version is available on Github</string>
     <string name="setting_checkforupdate_header">Check for new updates</string>
+    <string name="setting_disablecameraui_description">If enabled, all camera Ui items are hidden, close freedcam and remove it from tasks to apply changes</string>
+    <string name="setting_disablecameraui_header">Disable Camera ui</string>
 
     <string name="setting_dump_vendor_keys_description">Dump vendor keys</string>
     <string name="setting_dump_vendor_keys_header">Dump vendor keys</string>