From 987cb7799b5897e6160d50b8f43aa3534b6d72a4 Mon Sep 17 00:00:00 2001 From: SSimco <37044560+SSimco@users.noreply.github.com> Date: Tue, 9 Jul 2024 19:26:26 +0300 Subject: [PATCH] Refactored common layout & update game item text size --- .../info/cemu/Cemu/AudioSettingsFragment.java | 6 +++--- .../cemu/Cemu/ControllerInputsFragment.java | 6 +++--- .../info/cemu/Cemu/GraphicPacksFragment.java | 9 +++------ .../cemu/Cemu/GraphicPacksRootFragment.java | 10 +++++----- .../cemu/Cemu/GraphicsSettingsFragment.java | 6 +++--- .../Cemu/InputOverlaySettingsFragment.java | 6 +++--- .../info/cemu/Cemu/InputSettingsFragment.java | 6 +++--- .../cemu/Cemu/OverlaySettingsFragment.java | 7 ++++--- .../res/layout/fragment_controller_inputs.xml | 18 ------------------ .../main/res/layout/fragment_graphic_packs.xml | 17 ----------------- .../res/layout/fragment_graphic_packs_root.xml | 17 ----------------- .../res/layout/fragment_graphics_settings.xml | 16 ---------------- .../layout/fragment_input_overlay_settings.xml | 16 ---------------- .../res/layout/fragment_input_settings.xml | 16 ---------------- .../res/layout/fragment_overlay_settings.xml | 17 ----------------- ...gs.xml => generic_recycler_view_layout.xml} | 9 +++------ .../app/src/main/res/layout/layout_game.xml | 2 ++ 17 files changed, 32 insertions(+), 152 deletions(-) delete mode 100644 src/android/app/src/main/res/layout/fragment_controller_inputs.xml delete mode 100644 src/android/app/src/main/res/layout/fragment_graphic_packs.xml delete mode 100644 src/android/app/src/main/res/layout/fragment_graphic_packs_root.xml delete mode 100644 src/android/app/src/main/res/layout/fragment_graphics_settings.xml delete mode 100644 src/android/app/src/main/res/layout/fragment_input_overlay_settings.xml delete mode 100644 src/android/app/src/main/res/layout/fragment_input_settings.xml delete mode 100644 src/android/app/src/main/res/layout/fragment_overlay_settings.xml rename src/android/app/src/main/res/layout/{fragment_audio_settings.xml => generic_recycler_view_layout.xml} (66%) diff --git a/src/android/app/src/main/java/info/cemu/Cemu/AudioSettingsFragment.java b/src/android/app/src/main/java/info/cemu/Cemu/AudioSettingsFragment.java index d5da6c13..563c08f7 100644 --- a/src/android/app/src/main/java/info/cemu/Cemu/AudioSettingsFragment.java +++ b/src/android/app/src/main/java/info/cemu/Cemu/AudioSettingsFragment.java @@ -12,13 +12,13 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import info.cemu.Cemu.databinding.FragmentAudioSettingsBinding; +import info.cemu.Cemu.databinding.GenericRecyclerViewLayoutBinding; public class AudioSettingsFragment extends Fragment { @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - FragmentAudioSettingsBinding binding = FragmentAudioSettingsBinding.inflate(inflater, container, false); + var binding = GenericRecyclerViewLayoutBinding.inflate(inflater, container, false); GenericRecyclerViewAdapter genericRecyclerViewAdapter = new GenericRecyclerViewAdapter(); @@ -72,7 +72,7 @@ public class AudioSettingsFragment extends Fragment { value -> (int) value + "%"); genericRecyclerViewAdapter.addRecyclerViewItem(padVolumeSlider); - binding.audioSettingsRecyclerView.setAdapter(genericRecyclerViewAdapter); + binding.recyclerView.setAdapter(genericRecyclerViewAdapter); return binding.getRoot(); } diff --git a/src/android/app/src/main/java/info/cemu/Cemu/ControllerInputsFragment.java b/src/android/app/src/main/java/info/cemu/Cemu/ControllerInputsFragment.java index d7a53292..41a93f32 100644 --- a/src/android/app/src/main/java/info/cemu/Cemu/ControllerInputsFragment.java +++ b/src/android/app/src/main/java/info/cemu/Cemu/ControllerInputsFragment.java @@ -15,7 +15,7 @@ import androidx.fragment.app.Fragment; import java.util.HashMap; import java.util.Map; -import info.cemu.Cemu.databinding.FragmentControllerInputsBinding; +import info.cemu.Cemu.databinding.GenericRecyclerViewLayoutBinding; public class ControllerInputsFragment extends Fragment { public static final String CONTROLLER_INDEX = "ControllerIndex"; @@ -94,8 +94,8 @@ public class ControllerInputsFragment extends Fragment { setControllerInputs(NativeLibrary.getControllerMappings(controllerIndex)); - FragmentControllerInputsBinding binding = FragmentControllerInputsBinding.inflate(inflater, container, false); - binding.controllerInputsRecyclerView.setAdapter(genericRecyclerViewAdapter); + var binding = GenericRecyclerViewLayoutBinding.inflate(inflater, container, false); + binding.recyclerView.setAdapter(genericRecyclerViewAdapter); return binding.getRoot(); } diff --git a/src/android/app/src/main/java/info/cemu/Cemu/GraphicPacksFragment.java b/src/android/app/src/main/java/info/cemu/Cemu/GraphicPacksFragment.java index 2aef5cd9..ba02cdc7 100644 --- a/src/android/app/src/main/java/info/cemu/Cemu/GraphicPacksFragment.java +++ b/src/android/app/src/main/java/info/cemu/Cemu/GraphicPacksFragment.java @@ -13,13 +13,10 @@ import androidx.navigation.NavController; import androidx.navigation.fragment.NavHostFragment; import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; import java.util.Objects; -import java.util.function.Consumer; import java.util.stream.IntStream; -import info.cemu.Cemu.databinding.FragmentGraphicPacksBinding; +import info.cemu.Cemu.databinding.GenericRecyclerViewLayoutBinding; public class GraphicPacksFragment extends Fragment { private final GenericRecyclerViewAdapter genericRecyclerViewAdapter = new GenericRecyclerViewAdapter(); @@ -40,8 +37,8 @@ public class GraphicPacksFragment extends Fragment { @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - FragmentGraphicPacksBinding binding = FragmentGraphicPacksBinding.inflate(inflater, container, false); - binding.graphicPacksRecyclerView.setAdapter(genericRecyclerViewAdapter); + var binding = GenericRecyclerViewLayoutBinding.inflate(inflater, container, false); + binding.recyclerView.setAdapter(genericRecyclerViewAdapter); return binding.getRoot(); } diff --git a/src/android/app/src/main/java/info/cemu/Cemu/GraphicPacksRootFragment.java b/src/android/app/src/main/java/info/cemu/Cemu/GraphicPacksRootFragment.java index 73c1f1f3..efd3dd4a 100644 --- a/src/android/app/src/main/java/info/cemu/Cemu/GraphicPacksRootFragment.java +++ b/src/android/app/src/main/java/info/cemu/Cemu/GraphicPacksRootFragment.java @@ -38,7 +38,7 @@ import java.util.List; import java.util.Objects; import java.util.Optional; -import info.cemu.Cemu.databinding.FragmentGraphicPacksRootBinding; +import info.cemu.Cemu.databinding.GenericRecyclerViewLayoutBinding; import okhttp3.Call; import okhttp3.Callback; import okhttp3.OkHttpClient; @@ -157,8 +157,8 @@ public class GraphicPacksRootFragment extends Fragment { @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - FragmentGraphicPacksRootBinding binding = FragmentGraphicPacksRootBinding.inflate(inflater, container, false); - binding.graphicPacksRootRecyclerView.setAdapter(this.genericRecyclerViewAdapter); + var binding = GenericRecyclerViewLayoutBinding.inflate(inflater, container, false); + binding.recyclerView.setAdapter(this.genericRecyclerViewAdapter); requireActivity().addMenuProvider(new MenuProvider() { @Override public void onCreateMenu(@NonNull Menu menu, @NonNull MenuInflater menuInflater) { @@ -181,13 +181,13 @@ public class GraphicPacksRootFragment extends Fragment { searchMenuItem.setOnActionExpandListener(new MenuItem.OnActionExpandListener() { @Override public boolean onMenuItemActionExpand(@NonNull MenuItem item) { - binding.graphicPacksRootRecyclerView.setAdapter(graphicPacksRecyclerViewAdapter); + binding.recyclerView.setAdapter(graphicPacksRecyclerViewAdapter); return true; } @Override public boolean onMenuItemActionCollapse(@NonNull MenuItem item) { - binding.graphicPacksRootRecyclerView.setAdapter(genericRecyclerViewAdapter); + binding.recyclerView.setAdapter(genericRecyclerViewAdapter); return true; } }); diff --git a/src/android/app/src/main/java/info/cemu/Cemu/GraphicsSettingsFragment.java b/src/android/app/src/main/java/info/cemu/Cemu/GraphicsSettingsFragment.java index 8582997d..e2ded6f4 100644 --- a/src/android/app/src/main/java/info/cemu/Cemu/GraphicsSettingsFragment.java +++ b/src/android/app/src/main/java/info/cemu/Cemu/GraphicsSettingsFragment.java @@ -11,13 +11,13 @@ import androidx.fragment.app.Fragment; import java.util.stream.Collectors; import java.util.stream.Stream; -import info.cemu.Cemu.databinding.FragmentGraphicsSettingsBinding; +import info.cemu.Cemu.databinding.GenericRecyclerViewLayoutBinding; public class GraphicsSettingsFragment extends Fragment { @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - FragmentGraphicsSettingsBinding binding = FragmentGraphicsSettingsBinding.inflate(inflater, container, false); + var binding = GenericRecyclerViewLayoutBinding.inflate(inflater, container, false); GenericRecyclerViewAdapter genericRecyclerViewAdapter = new GenericRecyclerViewAdapter(); @@ -40,7 +40,7 @@ public class GraphicsSettingsFragment extends Fragment { CheckboxRecyclerViewItem accurateBarriersCheckbox = new CheckboxRecyclerViewItem(getString(R.string.accurate_barriers), getString(R.string.accurate_barriers_description), NativeLibrary.getAccurateBarriers(), NativeLibrary::setAccurateBarriers); genericRecyclerViewAdapter.addRecyclerViewItem(accurateBarriersCheckbox); - binding.graphicsSettingsRecyclerView.setAdapter(genericRecyclerViewAdapter); + binding.recyclerView.setAdapter(genericRecyclerViewAdapter); return binding.getRoot(); } } \ No newline at end of file diff --git a/src/android/app/src/main/java/info/cemu/Cemu/InputOverlaySettingsFragment.java b/src/android/app/src/main/java/info/cemu/Cemu/InputOverlaySettingsFragment.java index 33cbe25f..cbfe3ae8 100644 --- a/src/android/app/src/main/java/info/cemu/Cemu/InputOverlaySettingsFragment.java +++ b/src/android/app/src/main/java/info/cemu/Cemu/InputOverlaySettingsFragment.java @@ -15,7 +15,7 @@ import androidx.fragment.app.Fragment; import java.util.stream.Collectors; import java.util.stream.IntStream; -import info.cemu.Cemu.databinding.FragmentInputOverlaySettingsBinding; +import info.cemu.Cemu.databinding.GenericRecyclerViewLayoutBinding; public class InputOverlaySettingsFragment extends Fragment { @@ -35,7 +35,7 @@ public class InputOverlaySettingsFragment extends Fragment { @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - var binding = FragmentInputOverlaySettingsBinding.inflate(inflater, container, false); + var binding = GenericRecyclerViewLayoutBinding.inflate(inflater, container, false); GenericRecyclerViewAdapter genericRecyclerViewAdapter = new GenericRecyclerViewAdapter(); CheckboxRecyclerViewItem inputOverlayCheckbox = new CheckboxRecyclerViewItem( @@ -94,7 +94,7 @@ public class InputOverlaySettingsFragment extends Fragment { ) ); - binding.inputOverlaySettingsRecyclerView.setAdapter(genericRecyclerViewAdapter); + binding.recyclerView.setAdapter(genericRecyclerViewAdapter); return binding.getRoot(); } diff --git a/src/android/app/src/main/java/info/cemu/Cemu/InputSettingsFragment.java b/src/android/app/src/main/java/info/cemu/Cemu/InputSettingsFragment.java index d540e0e2..f60af96b 100644 --- a/src/android/app/src/main/java/info/cemu/Cemu/InputSettingsFragment.java +++ b/src/android/app/src/main/java/info/cemu/Cemu/InputSettingsFragment.java @@ -11,7 +11,7 @@ import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.navigation.fragment.NavHostFragment; -import info.cemu.Cemu.databinding.FragmentInputSettingsBinding; +import info.cemu.Cemu.databinding.GenericRecyclerViewLayoutBinding; public class InputSettingsFragment extends Fragment { @@ -19,7 +19,7 @@ public class InputSettingsFragment extends Fragment { @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - FragmentInputSettingsBinding binding = FragmentInputSettingsBinding.inflate(inflater, container, false); + var binding = GenericRecyclerViewLayoutBinding.inflate(inflater, container, false); GenericRecyclerViewAdapter genericRecyclerViewAdapter = new GenericRecyclerViewAdapter(); genericRecyclerViewAdapter.addRecyclerViewItem(new SimpleButtonRecyclerViewItem(getString(R.string.input_overlay_settings), () -> NavHostFragment.findNavController(InputSettingsFragment.this).navigate(R.id.action_inputSettingsFragment_to_inputOverlaySettingsFragment))); @@ -37,7 +37,7 @@ public class InputSettingsFragment extends Fragment { }); genericRecyclerViewAdapter.addRecyclerViewItem(buttonRecyclerViewItem); } - binding.inputSettingsRecyclerView.setAdapter(genericRecyclerViewAdapter); + binding.recyclerView.setAdapter(genericRecyclerViewAdapter); return binding.getRoot(); } } diff --git a/src/android/app/src/main/java/info/cemu/Cemu/OverlaySettingsFragment.java b/src/android/app/src/main/java/info/cemu/Cemu/OverlaySettingsFragment.java index 5787f21d..d2dabcb5 100644 --- a/src/android/app/src/main/java/info/cemu/Cemu/OverlaySettingsFragment.java +++ b/src/android/app/src/main/java/info/cemu/Cemu/OverlaySettingsFragment.java @@ -12,13 +12,14 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import info.cemu.Cemu.databinding.FragmentOverlaySettingsBinding; +import info.cemu.Cemu.databinding.GenericRecyclerViewLayoutBinding; + public class OverlaySettingsFragment extends Fragment { @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - FragmentOverlaySettingsBinding binding = FragmentOverlaySettingsBinding.inflate(inflater, container, false); + var binding = GenericRecyclerViewLayoutBinding.inflate(inflater, container, false); GenericRecyclerViewAdapter genericRecyclerViewAdapter = new GenericRecyclerViewAdapter(); @@ -67,7 +68,7 @@ public class OverlaySettingsFragment extends Fragment { NativeLibrary::setOverlayVRAMUsageEnabled); genericRecyclerViewAdapter.addRecyclerViewItem(vramUsageCheckbox); - binding.audioSettingsRecyclerView.setAdapter(genericRecyclerViewAdapter); + binding.recyclerView.setAdapter(genericRecyclerViewAdapter); return binding.getRoot(); } diff --git a/src/android/app/src/main/res/layout/fragment_controller_inputs.xml b/src/android/app/src/main/res/layout/fragment_controller_inputs.xml deleted file mode 100644 index 121f790a..00000000 --- a/src/android/app/src/main/res/layout/fragment_controller_inputs.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/android/app/src/main/res/layout/fragment_graphic_packs.xml b/src/android/app/src/main/res/layout/fragment_graphic_packs.xml deleted file mode 100644 index e49c28a9..00000000 --- a/src/android/app/src/main/res/layout/fragment_graphic_packs.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/android/app/src/main/res/layout/fragment_graphic_packs_root.xml b/src/android/app/src/main/res/layout/fragment_graphic_packs_root.xml deleted file mode 100644 index 6a45db3e..00000000 --- a/src/android/app/src/main/res/layout/fragment_graphic_packs_root.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/android/app/src/main/res/layout/fragment_graphics_settings.xml b/src/android/app/src/main/res/layout/fragment_graphics_settings.xml deleted file mode 100644 index 877deeae..00000000 --- a/src/android/app/src/main/res/layout/fragment_graphics_settings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/android/app/src/main/res/layout/fragment_input_overlay_settings.xml b/src/android/app/src/main/res/layout/fragment_input_overlay_settings.xml deleted file mode 100644 index 140d500a..00000000 --- a/src/android/app/src/main/res/layout/fragment_input_overlay_settings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/android/app/src/main/res/layout/fragment_input_settings.xml b/src/android/app/src/main/res/layout/fragment_input_settings.xml deleted file mode 100644 index fe660172..00000000 --- a/src/android/app/src/main/res/layout/fragment_input_settings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/android/app/src/main/res/layout/fragment_overlay_settings.xml b/src/android/app/src/main/res/layout/fragment_overlay_settings.xml deleted file mode 100644 index 6acf8b84..00000000 --- a/src/android/app/src/main/res/layout/fragment_overlay_settings.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/android/app/src/main/res/layout/fragment_audio_settings.xml b/src/android/app/src/main/res/layout/generic_recycler_view_layout.xml similarity index 66% rename from src/android/app/src/main/res/layout/fragment_audio_settings.xml rename to src/android/app/src/main/res/layout/generic_recycler_view_layout.xml index 6acf8b84..178674ca 100644 --- a/src/android/app/src/main/res/layout/fragment_audio_settings.xml +++ b/src/android/app/src/main/res/layout/generic_recycler_view_layout.xml @@ -1,17 +1,14 @@ + android:layout_height="match_parent"> - \ No newline at end of file diff --git a/src/android/app/src/main/res/layout/layout_game.xml b/src/android/app/src/main/res/layout/layout_game.xml index e1125c09..34dfdcef 100644 --- a/src/android/app/src/main/res/layout/layout_game.xml +++ b/src/android/app/src/main/res/layout/layout_game.xml @@ -18,6 +18,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginHorizontal="8dp" + android:ellipsize="end" android:gravity="center_vertical" + android:singleLine="true" android:textSize="24sp" />