From 74ea66efc580e7d957489dda366d450b5cc26afb Mon Sep 17 00:00:00 2001 From: Gabriel Machado <97042217+GabrielBRDeveloper@users.noreply.github.com> Date: Fri, 2 Feb 2024 18:11:59 -0400 Subject: [PATCH 01/32] Pandroid: Fix Navigation bar. (#398) * fix navbar transparent * too mutch fixes - Fix Ui Render in android 7. - Fix Navigation bar in android 7 - Rename developer option to advanced option. - Fix crash because setTitle in action bar - New style for switch button * bonk --------- Co-authored-by: gabriel --- .../panda3ds/pandroid/app/GameActivity.java | 4 ++ .../app/base/BasePreferenceFragment.java | 6 ++- .../pandroid/app/main/SettingsFragment.java | 4 +- ...ferences.java => AdvancedPreferences.java} | 6 +-- .../preferences/AppearancePreferences.java | 2 +- .../ControllerMapperPreferences.java | 4 +- .../app/preferences/InputMapPreferences.java | 2 +- .../src/main/res/drawable/color_surface.xml | 8 ++++ .../src/main/res/drawable/switch_thumb.xml | 37 +++++++++++++++++++ .../src/main/res/drawable/switch_track.xml | 19 ++++++++++ .../main/res/layout-land/activity_main.xml | 6 ++- .../main/res/layout/activity_input_map.xml | 3 +- .../app/src/main/res/layout/activity_main.xml | 6 ++- .../main/res/layout/activity_preference.xml | 3 +- .../src/main/res/layout/fragment_search.xml | 8 ++-- .../src/main/res/values-pt-rBR/strings.xml | 4 +- .../app/src/main/res/values-v27/themes.xml | 16 ++++++++ .../app/src/main/res/values-v29/themes.xml | 7 ++++ .../app/src/main/res/values/strings.xml | 4 +- .../app/src/main/res/values/themes.xml | 32 ++++++++++------ ...eferences.xml => advanced_preferences.xml} | 1 + .../src/main/res/xml/start_preferences.xml | 6 +-- 22 files changed, 150 insertions(+), 38 deletions(-) rename src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/{DeveloperPreferences.java => AdvancedPreferences.java} (90%) create mode 100644 src/pandroid/app/src/main/res/drawable/color_surface.xml create mode 100644 src/pandroid/app/src/main/res/drawable/switch_thumb.xml create mode 100644 src/pandroid/app/src/main/res/drawable/switch_track.xml create mode 100644 src/pandroid/app/src/main/res/values-v27/themes.xml create mode 100644 src/pandroid/app/src/main/res/values-v29/themes.xml rename src/pandroid/app/src/main/res/xml/{developer_preferences.xml => advanced_preferences.xml} (94%) diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java index f7050e99..946ef883 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/GameActivity.java @@ -1,6 +1,7 @@ package com.panda3ds.pandroid.app; import android.content.Intent; +import android.os.Build; import android.os.Bundle; import android.view.KeyEvent; import android.view.MotionEvent; @@ -72,6 +73,9 @@ public class GameActivity extends BaseActivity { InputHandler.reset(); InputHandler.setMotionDeadZone(InputMap.getDeadZone()); InputHandler.setEventListener(inputListener); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) { + getTheme().applyStyle(R.style.GameActivityNavigationBar, true); + } } @Override diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BasePreferenceFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BasePreferenceFragment.java index 9482df1d..4f5c5761 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BasePreferenceFragment.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/base/BasePreferenceFragment.java @@ -3,6 +3,7 @@ package com.panda3ds.pandroid.app.base; import android.annotation.SuppressLint; import androidx.annotation.StringRes; +import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; @@ -22,6 +23,9 @@ public abstract class BasePreferenceFragment extends PreferenceFragmentCompat { } protected void setActivityTitle(@StringRes int titleId) { - ((AppCompatActivity) requireActivity()).getSupportActionBar().setTitle(titleId); + ActionBar header = ((AppCompatActivity) requireActivity()).getSupportActionBar(); + if (header != null) { + header.setTitle(titleId); + } } } diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SettingsFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SettingsFragment.java index bfe33a2b..4ac73661 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SettingsFragment.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/main/SettingsFragment.java @@ -8,7 +8,7 @@ import com.panda3ds.pandroid.R; import com.panda3ds.pandroid.app.PreferenceActivity; import com.panda3ds.pandroid.app.base.BasePreferenceFragment; import com.panda3ds.pandroid.app.preferences.AppearancePreferences; -import com.panda3ds.pandroid.app.preferences.DeveloperPreferences; +import com.panda3ds.pandroid.app.preferences.AdvancedPreferences; import com.panda3ds.pandroid.app.preferences.InputPreferences; public class SettingsFragment extends BasePreferenceFragment { @@ -17,6 +17,6 @@ public class SettingsFragment extends BasePreferenceFragment { setPreferencesFromResource(R.xml.start_preferences, rootKey); setItemClick("input", (item) -> PreferenceActivity.launch(requireContext(), InputPreferences.class)); setItemClick("appearance", (item)-> PreferenceActivity.launch(requireContext(), AppearancePreferences.class)); - setItemClick("developer", (item)-> PreferenceActivity.launch(requireContext(), DeveloperPreferences.class)); + setItemClick("advanced", (item)-> PreferenceActivity.launch(requireContext(), AdvancedPreferences.class)); } } diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/DeveloperPreferences.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/AdvancedPreferences.java similarity index 90% rename from src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/DeveloperPreferences.java rename to src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/AdvancedPreferences.java index f131f0a0..fea8aef0 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/DeveloperPreferences.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/AdvancedPreferences.java @@ -13,11 +13,11 @@ import com.panda3ds.pandroid.app.base.BasePreferenceFragment; import com.panda3ds.pandroid.app.services.LoggerService; import com.panda3ds.pandroid.data.config.GlobalConfig; -public class DeveloperPreferences extends BasePreferenceFragment { +public class AdvancedPreferences extends BasePreferenceFragment { @Override public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) { - setPreferencesFromResource(R.xml.developer_preferences, rootKey); - setActivityTitle(R.string.developer_options); + setPreferencesFromResource(R.xml.advanced_preferences, rootKey); + setActivityTitle(R.string.advanced_options); setItemClick("performanceMonitor", pref -> GlobalConfig.set(GlobalConfig.KEY_SHOW_PERFORMANCE_OVERLAY, ((SwitchPreference) pref).isChecked())); setItemClick("shaderJit", pref -> GlobalConfig.set(GlobalConfig.KEY_SHADER_JIT, ((SwitchPreference) pref).isChecked())); diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/AppearancePreferences.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/AppearancePreferences.java index dea4e261..04c89d9a 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/AppearancePreferences.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/AppearancePreferences.java @@ -15,7 +15,7 @@ public class AppearancePreferences extends BasePreferenceFragment { public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) { setPreferencesFromResource(R.xml.appearance_preference, rootKey); - ((BaseActivity) requireActivity()).getSupportActionBar().setTitle(R.string.appearance); + setActivityTitle(R.string.appearance); SingleSelectionPreferences themePreference = findPreference("theme"); themePreference.setSelectedItem(GlobalConfig.get(GlobalConfig.KEY_APP_THEME)); diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/ControllerMapperPreferences.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/ControllerMapperPreferences.java index e59adfbe..f643c88f 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/ControllerMapperPreferences.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/ControllerMapperPreferences.java @@ -37,7 +37,9 @@ public class ControllerMapperPreferences extends Fragment { currentProfile = ControllerProfileManager.get(getArguments().getString("profile")).clone(); - ((BaseActivity) requireActivity()).getSupportActionBar().hide(); + if (((BaseActivity)requireActivity()).getSupportActionBar() != null) { + ((BaseActivity) requireActivity()).getSupportActionBar().hide(); + } mapper = view.findViewById(R.id.mapper); mapper.initialize(this::onLocationChanged, currentProfile); diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java index b4d148b9..10fa10f9 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/preferences/InputMapPreferences.java @@ -27,7 +27,7 @@ public class InputMapPreferences extends BasePreferenceFragment implements Activ public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) { setPreferencesFromResource(R.xml.input_map_preferences, rootKey); - ((BaseActivity) requireActivity()).getSupportActionBar().setTitle(R.string.controller_mapping); + setActivityTitle(R.string.controller_mapping); for (KeyName key : KeyName.values()) { if (key == KeyName.NULL) { diff --git a/src/pandroid/app/src/main/res/drawable/color_surface.xml b/src/pandroid/app/src/main/res/drawable/color_surface.xml new file mode 100644 index 00000000..b8655b87 --- /dev/null +++ b/src/pandroid/app/src/main/res/drawable/color_surface.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/pandroid/app/src/main/res/drawable/switch_thumb.xml b/src/pandroid/app/src/main/res/drawable/switch_thumb.xml new file mode 100644 index 00000000..02f1ab02 --- /dev/null +++ b/src/pandroid/app/src/main/res/drawable/switch_thumb.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/pandroid/app/src/main/res/drawable/switch_track.xml b/src/pandroid/app/src/main/res/drawable/switch_track.xml new file mode 100644 index 00000000..b665789c --- /dev/null +++ b/src/pandroid/app/src/main/res/drawable/switch_track.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/pandroid/app/src/main/res/layout-land/activity_main.xml b/src/pandroid/app/src/main/res/layout-land/activity_main.xml index fa4cfbca..9741809d 100644 --- a/src/pandroid/app/src/main/res/layout-land/activity_main.xml +++ b/src/pandroid/app/src/main/res/layout-land/activity_main.xml @@ -5,7 +5,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".app.MainActivity"> + tools:context=".app.MainActivity" + android:background="?colorSurface"> + style="@style/ThemedNavigationBottom" + android:background="@drawable/color_surface"/> \ No newline at end of file diff --git a/src/pandroid/app/src/main/res/layout/activity_input_map.xml b/src/pandroid/app/src/main/res/layout/activity_input_map.xml index cbacc64e..79249e62 100644 --- a/src/pandroid/app/src/main/res/layout/activity_input_map.xml +++ b/src/pandroid/app/src/main/res/layout/activity_input_map.xml @@ -4,7 +4,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:gravity="center"> + android:gravity="center" + android:background="?colorSurface"> + tools:context=".app.MainActivity" + android:background="?colorSurface"> + style="@style/ThemedNavigationBottom" + android:background="@drawable/color_surface"/> \ No newline at end of file diff --git a/src/pandroid/app/src/main/res/layout/activity_preference.xml b/src/pandroid/app/src/main/res/layout/activity_preference.xml index 54b3d364..401c3d86 100644 --- a/src/pandroid/app/src/main/res/layout/activity_preference.xml +++ b/src/pandroid/app/src/main/res/layout/activity_preference.xml @@ -3,7 +3,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" - android:orientation="vertical"> + android:orientation="vertical" + android:background="?colorSurface"> + android:layout_height="match_parent"> + android:layout_height="match_parent" + android:paddingStart="15dp" + android:paddingEnd="15dp"/> diff --git a/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml b/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml index 1198d66b..eeeb842b 100644 --- a/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml +++ b/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml @@ -45,8 +45,8 @@ Abrir arquivo Criar novo Executando \"%s\" ... - Opções de desenvolvedor - Depuração, mostrar fps, etc. + Opções avançada. + Depuração, mostrar fps, etc. Monitor de desempenho Mostrar um overlay com fps, memoria, etc. Depuração diff --git a/src/pandroid/app/src/main/res/values-v27/themes.xml b/src/pandroid/app/src/main/res/values-v27/themes.xml new file mode 100644 index 00000000..8e960864 --- /dev/null +++ b/src/pandroid/app/src/main/res/values-v27/themes.xml @@ -0,0 +1,16 @@ + + + + + + + + - + diff --git a/src/pandroid/app/src/main/res/xml/developer_preferences.xml b/src/pandroid/app/src/main/res/xml/advanced_preferences.xml similarity index 94% rename from src/pandroid/app/src/main/res/xml/developer_preferences.xml rename to src/pandroid/app/src/main/res/xml/advanced_preferences.xml index 96ce8906..ce77a6e4 100644 --- a/src/pandroid/app/src/main/res/xml/developer_preferences.xml +++ b/src/pandroid/app/src/main/res/xml/advanced_preferences.xml @@ -12,6 +12,7 @@ android:key="loggerService" app:iconSpaceReserved="false" app:title="@string/pref_logger_service_title" + app:defaultValue="true" android:summary="@string/pref_logger_service_summary"/> \ No newline at end of file From b256c89e23b663800dbba4c5cf05545813650a93 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Sat, 3 Feb 2024 00:14:43 +0200 Subject: [PATCH 02/32] [APT] Make logs slightly less cluttered for better debugging --- src/core/services/apt.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/services/apt.cpp b/src/core/services/apt.cpp index 404a0e59..ddeb18de 100644 --- a/src/core/services/apt.cpp +++ b/src/core/services/apt.cpp @@ -84,7 +84,7 @@ void APTService::appletUtility(u32 messagePointer) { u32 outputSize = mem.read32(messagePointer + 12); u32 inputPointer = mem.read32(messagePointer + 20); - log("APT::AppletUtility(utility = %d, input size = %x, output size = %x, inputPointer = %08X) (Stubbed)\n", utility, inputSize, outputSize, + log("APT::AppletUtility(utility = %d, input size = %x, output size = %x, inputPointer = %08X)\n", utility, inputSize, outputSize, inputPointer); std::vector out(outputSize); @@ -218,7 +218,7 @@ void APTService::initialize(u32 messagePointer) { } void APTService::inquireNotification(u32 messagePointer) { - log("APT::InquireNotification (STUBBED TO RETURN NONE)\n"); + log("APT::InquireNotification\n"); mem.write32(messagePointer, IPC::responseHeader(0xB, 2, 0)); mem.write32(messagePointer + 4, Result::Success); From 3b4960194ffc4539ed2343728d722dc25a51a970 Mon Sep 17 00:00:00 2001 From: Ishan09811 <156402647+Ishan09811@users.noreply.github.com> Date: Thu, 8 Feb 2024 21:08:47 +0530 Subject: [PATCH 03/32] Material UI (#394) * used material ui in ``holder_game`` + added click effect * add click effect to use in ``holder_game`` * use material ui in ``dialog_lua_scripts`` * add required imports to use material ui in ``dialog_lua_scripts`` * use material ui in ``holder_lua_script`` * use material ui in ``fragment_game_drawer`` * use material ui in ``fragment_games`` * add appbar with app name + Material EditText * fix drawarlayout * remove line divider from ``NavigationView`` --- .../pandroid/app/game/DrawerFragment.java | 16 +- .../pandroid/app/game/LuaDialogFragment.java | 3 +- .../rounded_selectable_item_background.xml | 9 + .../app/src/main/res/layout/activity_main.xml | 10 +- .../main/res/layout/dialog_lua_scripts.xml | 19 +-- .../main/res/layout/fragment_game_drawer.xml | 154 +++++++++--------- .../src/main/res/layout/fragment_games.xml | 21 ++- .../src/main/res/layout/fragment_search.xml | 9 +- .../app/src/main/res/layout/holder_game.xml | 24 ++- .../src/main/res/layout/holder_lua_script.xml | 60 ++++--- .../res/layout/preference_simple_about.xml | 3 +- .../src/main/res/menu/game_drawer_actions.xml | 11 -- .../src/main/res/menu/game_drawer_others.xml | 7 - .../main/res/menu/game_drawer_settings.xml | 35 ++++ .../app/src/main/res/values/themes.xml | 4 + 15 files changed, 227 insertions(+), 158 deletions(-) create mode 100644 src/pandroid/app/src/main/res/drawable/rounded_selectable_item_background.xml delete mode 100644 src/pandroid/app/src/main/res/menu/game_drawer_actions.xml delete mode 100644 src/pandroid/app/src/main/res/menu/game_drawer_others.xml create mode 100644 src/pandroid/app/src/main/res/menu/game_drawer_settings.xml diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java index bd402b52..3506e054 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java @@ -12,6 +12,8 @@ import androidx.annotation.Nullable; import androidx.appcompat.widget.AppCompatTextView; import androidx.drawerlayout.widget.DrawerLayout; import androidx.fragment.app.Fragment; +import android.content.pm.ActivityInfo; +import android.content.res.Configuration; import com.google.android.material.navigation.NavigationView; import com.panda3ds.pandroid.AlberDriver; @@ -47,7 +49,6 @@ public class DrawerFragment extends Fragment implements DrawerLayout.DrawerListe ((AppCompatTextView)view.findViewById(R.id.game_publisher)).setText(game.getPublisher()); ((NavigationView)view.findViewById(R.id.action_navigation)).setNavigationItemSelectedListener(this); - ((NavigationView)view.findViewById(R.id.others_navigation)).setNavigationItemSelectedListener(this); } @Override @@ -80,6 +81,17 @@ public class DrawerFragment extends Fragment implements DrawerLayout.DrawerListe } } + private void changeScreenOrientation() { + int currentOrientation = getResources().getConfiguration().orientation; + + // Change the orientation + if (currentOrientation == Configuration.ORIENTATION_LANDSCAPE) { + requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); + } else { + requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); + } +} + @Override public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {} @@ -106,6 +118,8 @@ public class DrawerFragment extends Fragment implements DrawerLayout.DrawerListe requireActivity().finish(); } else if (id == R.id.lua_script){ new LuaDialogFragment().show(getParentFragmentManager(), null); + } else if (id == R.id.change_orientation) { + changeScreenOrientation(); } return false; diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/LuaDialogFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/LuaDialogFragment.java index 1db9f9c7..e7da87bf 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/LuaDialogFragment.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/LuaDialogFragment.java @@ -12,6 +12,7 @@ import androidx.activity.result.contract.ActivityResultContracts; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; +import com.google.android.material.button.MaterialButton; import com.panda3ds.pandroid.AlberDriver; import com.panda3ds.pandroid.R; @@ -182,4 +183,4 @@ public class LuaDialogFragment extends BottomDialogFragment { return FileUtils.getLastModified(absolutePath()); } } -} \ No newline at end of file +} diff --git a/src/pandroid/app/src/main/res/drawable/rounded_selectable_item_background.xml b/src/pandroid/app/src/main/res/drawable/rounded_selectable_item_background.xml new file mode 100644 index 00000000..fad2fe96 --- /dev/null +++ b/src/pandroid/app/src/main/res/drawable/rounded_selectable_item_background.xml @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/src/pandroid/app/src/main/res/layout/activity_main.xml b/src/pandroid/app/src/main/res/layout/activity_main.xml index 27da16a9..c0d0efd7 100644 --- a/src/pandroid/app/src/main/res/layout/activity_main.xml +++ b/src/pandroid/app/src/main/res/layout/activity_main.xml @@ -8,6 +8,14 @@ tools:context=".app.MainActivity" android:background="?colorSurface"> + + - \ No newline at end of file + diff --git a/src/pandroid/app/src/main/res/layout/dialog_lua_scripts.xml b/src/pandroid/app/src/main/res/layout/dialog_lua_scripts.xml index 69a9d0a4..b0484879 100644 --- a/src/pandroid/app/src/main/res/layout/dialog_lua_scripts.xml +++ b/src/pandroid/app/src/main/res/layout/dialog_lua_scripts.xml @@ -1,9 +1,9 @@ - @@ -12,7 +12,6 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - + - \ No newline at end of file + diff --git a/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml b/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml index fa81a503..c4a698ea 100644 --- a/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml +++ b/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml @@ -1,105 +1,97 @@ - - - + + android:layout_height="match_parent" + android:orientation="vertical"> - - - - - - - + + android:paddingLeft="10dp" + android:paddingRight="10dp" + android:minHeight="190dp" + android:background="?colorSurfaceVariant"> - + + + + + + + android:layout_marginBottom="20dp"> - + - + - + - + + + + + + android:orientation="vertical" + android:gravity="start" + android:layout_marginTop="195dp"> - + app:menu="@menu/game_drawer_settings" + android:background="?colorSurface" + android:theme="@style/Widget.App.NavigationView" + app:subheaderTextAppearance="@style/TextAppearanceGameDrawerSubTitle"/> - + - - - - - - - - - - - \ No newline at end of file + diff --git a/src/pandroid/app/src/main/res/layout/fragment_games.xml b/src/pandroid/app/src/main/res/layout/fragment_games.xml index ee69fdc8..0538aeb6 100644 --- a/src/pandroid/app/src/main/res/layout/fragment_games.xml +++ b/src/pandroid/app/src/main/res/layout/fragment_games.xml @@ -1,6 +1,9 @@ - + android:gravity="center" + app:rippleColor="?colorOnSurfaceVariant" + app:backgroundTint="?colorPrimary" + tools:ignore="PrivateResource"/> - \ No newline at end of file + diff --git a/src/pandroid/app/src/main/res/layout/fragment_search.xml b/src/pandroid/app/src/main/res/layout/fragment_search.xml index 367b0f1d..3d987ff9 100644 --- a/src/pandroid/app/src/main/res/layout/fragment_search.xml +++ b/src/pandroid/app/src/main/res/layout/fragment_search.xml @@ -9,16 +9,17 @@ + android:paddingHorizontal="20dp" + android:background="?colorSurfaceVariant"> - @@ -46,4 +47,4 @@ - \ No newline at end of file + diff --git a/src/pandroid/app/src/main/res/layout/holder_game.xml b/src/pandroid/app/src/main/res/layout/holder_game.xml index b2d46d1b..fd14573f 100644 --- a/src/pandroid/app/src/main/res/layout/holder_game.xml +++ b/src/pandroid/app/src/main/res/layout/holder_game.xml @@ -4,13 +4,17 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" + android:foreground="@drawable/rounded_selectable_item_background" + android:focusable="true" android:orientation="vertical" android:padding="15dp"> - + android:layout_margin="10dp" + app:shapeAppearance="?attr/shapeAppearanceCornerLarge"> - + - \ No newline at end of file + diff --git a/src/pandroid/app/src/main/res/layout/holder_lua_script.xml b/src/pandroid/app/src/main/res/layout/holder_lua_script.xml index a1865c3f..071d3c8c 100644 --- a/src/pandroid/app/src/main/res/layout/holder_lua_script.xml +++ b/src/pandroid/app/src/main/res/layout/holder_lua_script.xml @@ -1,43 +1,50 @@ - + app:cardBackgroundColor="?attr/colorSurfaceVariant" + app:cardCornerRadius="8dp" + android:layout_gravity="center" + android:layout_margin="10dp"> - - - + android:orientation="vertical" + android:gravity="center" + android:padding="10dp"> - + + - + + + - - \ No newline at end of file + diff --git a/src/pandroid/app/src/main/res/layout/preference_simple_about.xml b/src/pandroid/app/src/main/res/layout/preference_simple_about.xml index 9364de36..cf6370b9 100644 --- a/src/pandroid/app/src/main/res/layout/preference_simple_about.xml +++ b/src/pandroid/app/src/main/res/layout/preference_simple_about.xml @@ -2,6 +2,7 @@ @@ -26,4 +27,4 @@ android:alpha="0.5" android:textColor="?colorOnSurface"/> - \ No newline at end of file + diff --git a/src/pandroid/app/src/main/res/menu/game_drawer_actions.xml b/src/pandroid/app/src/main/res/menu/game_drawer_actions.xml deleted file mode 100644 index 9fd3264a..00000000 --- a/src/pandroid/app/src/main/res/menu/game_drawer_actions.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pandroid/app/src/main/res/menu/game_drawer_others.xml b/src/pandroid/app/src/main/res/menu/game_drawer_others.xml deleted file mode 100644 index b6dd4897..00000000 --- a/src/pandroid/app/src/main/res/menu/game_drawer_others.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/pandroid/app/src/main/res/menu/game_drawer_settings.xml b/src/pandroid/app/src/main/res/menu/game_drawer_settings.xml new file mode 100644 index 00000000..12fa6d47 --- /dev/null +++ b/src/pandroid/app/src/main/res/menu/game_drawer_settings.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + diff --git a/src/pandroid/app/src/main/res/values/themes.xml b/src/pandroid/app/src/main/res/values/themes.xml index 422299a4..79ecdd60 100644 --- a/src/pandroid/app/src/main/res/values/themes.xml +++ b/src/pandroid/app/src/main/res/values/themes.xml @@ -42,6 +42,10 @@ + +