diff options
Diffstat (limited to 'src/android/app/src/main/res')
8 files changed, 79 insertions, 4 deletions
diff --git a/src/android/app/src/main/res/layout-w600dp/activity_main.xml b/src/android/app/src/main/res/layout-w600dp/activity_main.xml new file mode 100644 index 000000000..39b61a13e --- /dev/null +++ b/src/android/app/src/main/res/layout-w600dp/activity_main.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/coordinator_main" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <androidx.fragment.app.FragmentContainerView + android:id="@+id/fragment_container" + android:name="androidx.navigation.fragment.NavHostFragment" + android:layout_width="0dp" + android:layout_height="0dp" + app:defaultNavHost="true" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:navGraph="@navigation/home_navigation" + tools:layout="@layout/fragment_games" /> + + <com.google.android.material.navigationrail.NavigationRailView + android:id="@+id/navigation_view" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:visibility="invisible" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:labelVisibilityMode="selected" + app:menu="@menu/menu_navigation" + tools:visibility="visible" /> + + <View + android:id="@+id/status_bar_shade" + android:layout_width="0dp" + android:layout_height="1px" + android:background="@android:color/transparent" + android:clickable="false" + android:focusable="false" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/src/android/app/src/main/res/layout/activity_main.xml b/src/android/app/src/main/res/layout/activity_main.xml index 6ca426b54..214acb041 100644 --- a/src/android/app/src/main/res/layout/activity_main.xml +++ b/src/android/app/src/main/res/layout/activity_main.xml @@ -21,7 +21,7 @@ tools:layout="@layout/fragment_games" /> <com.google.android.material.bottomnavigation.BottomNavigationView - android:id="@+id/navigation_bar" + android:id="@+id/navigation_view" android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="invisible" diff --git a/src/android/app/src/main/res/layout/fragment_home_settings.xml b/src/android/app/src/main/res/layout/fragment_home_settings.xml index e0c609309..82b037010 100644 --- a/src/android/app/src/main/res/layout/fragment_home_settings.xml +++ b/src/android/app/src/main/res/layout/fragment_home_settings.xml @@ -8,6 +8,7 @@ android:clipToPadding="false"> <androidx.appcompat.widget.LinearLayoutCompat + android:id="@+id/linear_layout_settings" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" diff --git a/src/android/app/src/main/res/layout/fragment_search.xml b/src/android/app/src/main/res/layout/fragment_search.xml index 3b1aefdfb..b8d54d947 100644 --- a/src/android/app/src/main/res/layout/fragment_search.xml +++ b/src/android/app/src/main/res/layout/fragment_search.xml @@ -3,9 +3,11 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/constraint_search" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/colorSurface"> + android:background="?attr/colorSurface" + android:clipToPadding="false"> <RelativeLayout android:layout_width="0dp" @@ -52,7 +54,8 @@ android:id="@+id/frame_search" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="20dp" + android:layout_marginTop="12dp" + android:layout_marginHorizontal="20dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> diff --git a/src/android/app/src/main/res/menu-w600dp/menu_navigation.xml b/src/android/app/src/main/res/menu-w600dp/menu_navigation.xml new file mode 100644 index 000000000..073d00cab --- /dev/null +++ b/src/android/app/src/main/res/menu-w600dp/menu_navigation.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + + <item + android:id="@+id/homeSettingsFragment" + android:icon="@drawable/ic_settings" + android:title="@string/home_settings" /> + + <item + android:id="@+id/searchFragment" + android:icon="@drawable/ic_search" + android:title="@string/home_search" /> + + <item + android:id="@+id/gamesFragment" + android:icon="@drawable/ic_controller" + android:title="@string/home_games" /> + +</menu> diff --git a/src/android/app/src/main/res/values-w600dp/dimens.xml b/src/android/app/src/main/res/values-w600dp/dimens.xml new file mode 100644 index 000000000..128319e27 --- /dev/null +++ b/src/android/app/src/main/res/values-w600dp/dimens.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <dimen name="spacing_navigation">0dp</dimen> + <dimen name="spacing_navigation_rail">80dp</dimen> +</resources> diff --git a/src/android/app/src/main/res/values/dimens.xml b/src/android/app/src/main/res/values/dimens.xml index 28a6d25cf..00757e5e8 100644 --- a/src/android/app/src/main/res/values/dimens.xml +++ b/src/android/app/src/main/res/values/dimens.xml @@ -7,6 +7,7 @@ <dimen name="spacing_list">64dp</dimen> <dimen name="spacing_chip">20dp</dimen> <dimen name="spacing_navigation">80dp</dimen> + <dimen name="spacing_navigation_rail">0dp</dimen> <dimen name="spacing_search">128dp</dimen> <dimen name="spacing_refresh_end">72dp</dimen> <dimen name="menu_width">256dp</dimen> diff --git a/src/android/app/src/main/res/values/themes.xml b/src/android/app/src/main/res/values/themes.xml index f32e2f5d0..60388b71e 100644 --- a/src/android/app/src/main/res/values/themes.xml +++ b/src/android/app/src/main/res/values/themes.xml @@ -42,7 +42,7 @@ <item name="sliderStyle">@style/YuzuSlider</item> <item name="materialAlertDialogTheme">@style/YuzuMaterialDialog</item> - <item name="android:windowLayoutInDisplayCutoutMode">default</item> + <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item> <item name="android:enforceStatusBarContrast">false</item> <item name="android:enforceNavigationBarContrast">false</item> |