Skip to content

[Catalog] UIs are not broken #4579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Catalog] UIs are not broken #4579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 72 additions & 67 deletions catalog/java/io/material/catalog/navigationdrawer/res/layout/cat_navigationdrawer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,103 +16,108 @@
-->

<androidx.drawerlayout.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">

<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/linear_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:fitsSystemWindows="true">

<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/linear_layout"
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_height="wrap_content"
android:fitsSystemWindows="true">

<com.google.android.material.appbar.AppBarLayout
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
style="?attr/catalogToolbarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true">

<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
style="?attr/catalogToolbarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:navigationIcon="@drawable/ic_drawer_menu_24px"
app:title="@string/cat_navigationdrawer_title"/>
app:navigationIcon="@drawable/ic_drawer_menu_24px"
app:title="@string/cat_navigationdrawer_title"/>
</com.google.android.material.appbar.AppBarLayout>

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:padding="64dp"
android:orientation="vertical">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">

<TextView
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/cat_navigationdrawer_instructions"
android:textAppearance="?attr/textAppearanceBodyLarge" />

<Button
android:id="@+id/show_end_drawer_gravity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="@string/cat_navigationdrawer_show_end_drawer" />
android:padding="64dp"
android:orientation="vertical">

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:labelFor="@+id/bold_text_switch"
android:text="@string/cat_navigationdrawer_label_active_bold" />
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/bold_text_switch"
android:gravity="center"
android:text="@string/cat_navigationdrawer_instructions"
android:textAppearance="?attr/textAppearanceBodyLarge" />

<Button
android:id="@+id/show_end_drawer_gravity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:layout_marginStart="12dp" />
</LinearLayout>
android:layout_marginTop="32dp"
android:text="@string/cat_navigationdrawer_show_end_drawer" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:labelFor="@+id/auto_close_switch"
android:text="@string/cat_navigationdrawer_label_auto_close" />
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/auto_close_switch"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:labelFor="@+id/bold_text_switch"
android:text="@string/cat_navigationdrawer_label_active_bold" />
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/bold_text_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:layout_marginStart="12dp" />
</LinearLayout>

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:layout_marginStart="12dp" />
</LinearLayout>
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:labelFor="@+id/auto_close_switch"
android:text="@string/cat_navigationdrawer_label_auto_close" />
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/auto_close_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:layout_marginStart="12dp" />
</LinearLayout>

</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

<com.google.android.material.navigation.NavigationView
android:id="@+id/navigation_view_start"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
app:headerLayout="@layout/cat_navigationdrawer_header"
app:itemTextAppearanceActiveBoldEnabled="true"
app:menu="@menu/cat_navigationdrawer_menu"/>
android:id="@+id/navigation_view_start"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
app:headerLayout="@layout/cat_navigationdrawer_header"
app:itemTextAppearanceActiveBoldEnabled="true"
app:menu="@menu/cat_navigationdrawer_menu"/>

<com.google.android.material.navigation.NavigationView
android:id="@+id/navigation_view_end"
Expand Down
73 changes: 39 additions & 34 deletions catalog/java/io/material/catalog/navigationdrawer/res/layout/cat_navigationdrawer_custom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,57 +16,62 @@
-->

<androidx.drawerlayout.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">

<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/linear_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:fitsSystemWindows="true">

<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/linear_layout"
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_height="wrap_content"
android:fitsSystemWindows="true">

<com.google.android.material.appbar.AppBarLayout
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
style="?attr/catalogToolbarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true">

<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
style="?attr/catalogToolbarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:navigationIcon="@drawable/ic_drawer_menu_24px"
app:title="@string/cat_navigationdrawer_title"/>
app:navigationIcon="@drawable/ic_drawer_menu_24px"
app:title="@string/cat_navigationdrawer_title"/>
</com.google.android.material.appbar.AppBarLayout>

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:padding="64dp"
android:orientation="vertical">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">

<TextView
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/cat_navigationdrawer_instructions"
android:textAppearance="?attr/textAppearanceBodyLarge" />
android:padding="64dp"
android:orientation="vertical">

<Button
android:id="@+id/show_end_drawer_gravity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="@string/cat_navigationdrawer_show_end_drawer" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/cat_navigationdrawer_instructions"
android:textAppearance="?attr/textAppearanceBodyLarge" />

<Button
android:id="@+id/show_end_drawer_gravity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="@string/cat_navigationdrawer_show_end_drawer" />

</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

<RelativeLayout
Expand Down