Skip to content

Commit acbe82a

Browse files
committed
Fix crashes
1 parent ad7c4ed commit acbe82a

8 files changed

Lines changed: 14 additions & 17 deletions

File tree

app/src/main/res/layout/activity_wrapper.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
android:layout_height="match_parent"
6262
android:layout_gravity="start"
6363
android:theme="@style/NavigationTheme"
64-
app:menu="@menu/drawer_nav" />
64+
app:menu="@menu/drawer_nav"
65+
android:fitsSystemWindows="false"/>
6566

6667
</androidx.drawerlayout.widget.DrawerLayout>

app/src/main/res/layout/fragment_calendar.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010

1111
<com.google.android.material.appbar.AppBarLayout
1212
android:layout_width="match_parent"
13-
android:layout_height="wrap_content"
14-
android:theme="@style/AppTheme.AppBarOverlay">
13+
android:layout_height="wrap_content">
1514

1615
<androidx.appcompat.widget.Toolbar
1716
android:id="@+id/toolbar"

app/src/main/res/layout/fragment_dailytext.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010

1111
<com.google.android.material.appbar.AppBarLayout
1212
android:layout_width="match_parent"
13-
android:layout_height="wrap_content"
14-
android:theme="@style/AppTheme.AppBarOverlay">
13+
android:layout_height="wrap_content">
1514

1615
<androidx.appcompat.widget.Toolbar
1716
android:id="@+id/toolbar"

app/src/main/res/layout/fragment_sample_presentations.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010

1111
<com.google.android.material.appbar.AppBarLayout
1212
android:layout_width="match_parent"
13-
android:layout_height="wrap_content"
14-
android:theme="@style/AppTheme.AppBarOverlay">
13+
android:layout_height="wrap_content">
1514

1615
<androidx.appcompat.widget.Toolbar
1716
android:id="@+id/toolbar"

app/src/main/res/layout/nav_rail_header.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
<ImageButton
2525
android:id="@+id/nav_button"
26-
style="?attr/borderlessButtonStyle"
2726
android:layout_width="@dimen/mtrl_min_touch_target_size"
2827
android:layout_height="@dimen/mtrl_min_touch_target_size"
2928
android:layout_gravity="start"

app/src/main/res/layout/report_item.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
android:layout_marginBottom="4dp"
2020
android:paddingTop="8dp"
2121
app:cardBackgroundColor="@color/report_card_color"
22-
app:cardCornerRadius="16dp"
22+
app:cardCornerRadius="32dp"
2323
app:cardElevation="4dp">
2424

2525
<LinearLayout

app/src/main/res/layout/report_item_tiny.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
android:layout_marginRight="8dp"
1717
android:layout_marginBottom="4dp"
1818
app:cardBackgroundColor="@color/report_card_color"
19-
app:cardCornerRadius="8dp"
19+
app:cardCornerRadius="16dp"
2020
app:cardElevation="4dp">
2121

2222
<LinearLayout

app/src/main/res/values/styles.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33

4-
<style name="AppTheme" parent="Theme.Material3.Light">
4+
<style name="AppTheme" parent="Theme.Material3Expressive.Light">
55
<!-- Customize your theme here.-->
66
<item name="windowActionBar">false</item>
77
<item name="windowNoTitle">true</item>
@@ -16,14 +16,14 @@
1616
<item name="colorOnSecondary">@color/ColorOnSecondary</item>
1717
</style>
1818

19-
<style name="NavigationTheme" parent="Theme.Material3.Dark" />
19+
<style name="NavigationTheme" parent="Theme.Material3Expressive.Dark" />
2020

2121
<style name="ToolbarWithCloseButton" parent="DrawerTheme">
2222
<!--item name="navigationContentDescription">@string/toolbar_navigation_close_description</item-->
2323
<item name="navigationIcon">@drawable/ic_baseline_close_24</item>
2424
</style>
2525

26-
<style name="DialogStyleBasic" parent="Theme.Material3.Dark.Dialog">
26+
<style name="DialogStyleBasic" parent="Theme.Material3Expressive.Dark.Dialog">
2727
<item name="android:windowBackground">@drawable/bg_tablet_dialog</item>
2828
<item name="colorPrimary">@color/ColorPrimary</item>
2929
<item name="colorPrimaryDark">@color/ColorPrimaryDark</item>
@@ -47,17 +47,17 @@
4747
<!-- MaterialDesign Alert Dialog Center Icon and Title -->
4848
<style name="MaterialAlertDialogCenterStyle">
4949
<item name="materialAlertDialogTitlePanelStyle">
50-
@style/MaterialAlertDialog.Material3.Title.Panel.CenterStacked
50+
@style/MaterialAlertDialog.Material3Expressive.Title.Panel.CenterStacked
5151
</item>
5252
<item name="materialAlertDialogTitleIconStyle">
5353
@style/MaterialAlertDialogCenterTitleIconStyle
5454
</item>
5555
<item name="materialAlertDialogTitleTextStyle">
56-
@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked
56+
@style/MaterialAlertDialog.Material3Expressive.Title.Text.CenterStacked
5757
</item>
5858
</style>
5959

60-
<style name="MaterialAlertDialogCenterTitleIconStyle" parent="MaterialAlertDialog.Material3.Title.Icon.CenterStacked">
60+
<style name="MaterialAlertDialogCenterTitleIconStyle" parent="MaterialAlertDialog.Material3Expressive.Title.Text.CenterStacked">
6161
<item name="tint">@color/ColorSecondary</item>
6262
</style>
6363

@@ -79,6 +79,6 @@
7979
<item name="android:textColorSecondary">@android:color/white</item>
8080
</style>
8181

82-
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
82+
<!--style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" /-->
8383

8484
</resources>

0 commit comments

Comments
 (0)