Skip to content

Commit b9433a2

Browse files
committed
material 3 style impl
1 parent 77a4192 commit b9433a2

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
app:layout_constraintLeft_toLeftOf="parent"
1515
app:layout_constraintRight_toRightOf="parent"
1616
app:menu="@menu/bottom_nav_menu"
17-
style="@style/Widget.MaterialComponents.BottomNavigationView"
1817
/>
1918

2019
<fragment

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,16 @@
99
android:layout_height="wrap_content"
1010
android:orientation="vertical">
1111

12-
<androidx.cardview.widget.CardView
13-
style="@style/Card">
12+
<androidx.cardview.widget.CardView style="@style/Card">
1413

1514
<com.google.android.material.textfield.TextInputLayout
1615
android:id="@+id/settings_textInputLayout_api"
1716
android:layout_width="match_parent"
1817
android:layout_height="wrap_content"
1918
app:endIconMode="custom"
2019
android:hint="@string/api_key"
21-
app:endIconDrawable="@drawable/ic_help_black_24dp"
22-
>
20+
android:layout_marginBottom="@dimen/size_2dp"
21+
app:endIconDrawable="@drawable/ic_help_black_24dp">
2322

2423
<com.google.android.material.textfield.TextInputEditText
2524
android:id="@+id/settings_edit_api"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
cardView:layout_constrainedWidth="true"
3535
android:ellipsize="end"
3636
android:lines="1"
37-
android:textSize="@dimen/text_24sp"
37+
android:textSize="@dimen/text_22sp"
3838
/>
3939

4040
<TextView

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<dimen name="text_15sp">15sp</dimen>
2323
<dimen name="text_16sp">16sp</dimen>
2424
<dimen name="text_18sp">18sp</dimen>
25+
<dimen name="text_20sp">20sp</dimen>
26+
<dimen name="text_22sp">22sp</dimen>
2527
<dimen name="text_24sp">24sp</dimen>
2628
<dimen name="text_32sp">32sp</dimen>
2729
<dimen name="text_37sp">37sp</dimen>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<item name="postSplashScreenTheme">@style/AppTheme</item>
88
</style>
99

10-
<style name="AppTheme" parent="Theme.MaterialComponents.NoActionBar">
10+
<style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
1111
<item name="colorPrimary">@color/colorPrimary</item>
1212
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
1313
<item name="colorAccent">@color/colorAccent</item>

0 commit comments

Comments
 (0)