Skip to content
This repository was archived by the owner on Nov 21, 2024. It is now read-only.

Commit f460c6d

Browse files
nickbutchernickbutcher
committed
Update to MDC 1.1.0-alpha08
Remove custom ?attr/colorPrimarySurface. Inherit from `.PrimarySurface` styles. Update source compatibility. Fix theme overlays. Change-Id: Iab0b9897a20c2007ea9031115e7fe922a4ac73a6
1 parent 81f3818 commit f460c6d

File tree

11 files changed

+33
-49
lines changed

11 files changed

+33
-49
lines changed

‎app/build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,18 @@ android {
3737
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
3838
}
3939
}
40+
compileOptions {
41+
sourceCompatibility JavaVersion.VERSION_1_8
42+
targetCompatibility JavaVersion.VERSION_1_8
43+
}
4044
}
4145

4246
dependencies {
4347
implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
4448
implementation 'androidx.fragment:fragment:1.2.0-alpha01'
4549
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
4650
implementation 'androidx.core:core-ktx:1.0.2'
47-
implementation 'com.google.android.material:material:1.1.0-alpha07'
51+
implementation 'com.google.android.material:material:1.1.0-alpha08'
4852
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
4953

5054
implementation "androidx.navigation:navigation-runtime-ktx:$nav_version"

‎app/src/main/java/com/materialstudies/owl/util/BindingAdapters.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ fun ImageView.bindSrcUrl(url: String, circleCrop: Boolean, placeholder: Drawable
4040
* use elevation as the design calls for no shadow.
4141
*/
4242
@BindingAdapter("elevationOverlay")
43-
fun View.bindElevationOverlap(previousElevation: Float, elevation: Float) {
43+
fun View.bindElevationOverlay(previousElevation: Float, elevation: Float) {
4444
if (previousElevation == elevation) return
45-
val color = ElevationOverlayProvider(context).getSurfaceColorWithOverlayIfNeeded(elevation)
45+
val color = ElevationOverlayProvider(context)
46+
.compositeOverlayWithThemeSurfaceColorIfNeeded(elevation)
4647
setBackgroundColor(color)
4748
}
4849

‎app/src/main/res/layout/fragment_featured.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
android:layout_height="wrap_content"
3333
app:liftOnScroll="true"
3434
app:liftOnScrollTargetViewId="@id/featured_grid"
35-
android:theme="@style/ThemeOverlay.MaterialComponents.Dark">
35+
android:theme="@style/ThemeOverlay.Owl.Blue.Dark">
3636

3737
<androidx.appcompat.widget.Toolbar
3838
android:layout_width="match_parent"

‎app/src/main/res/layout/fragment_lessons_sheet.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
android:layout_width="match_parent"
2828
android:layout_height="match_parent"
2929
android:theme="@style/Owl.Pink"
30-
tools:context=".ui.lessons.LessonsSheetFragment">
30+
tools:context=".ui.lessons.LessonsSheetFragment"
31+
tools:targetApi="o">
3132

3233
<androidx.constraintlayout.widget.ConstraintLayout
3334
android:id="@+id/lessons_sheet"
@@ -61,7 +62,7 @@
6162
android:minHeight="?attr/actionBarSize"
6263
android:lines="1"
6364
android:alpha="0"
64-
android:textAppearance="?attr/textAppearanceBody1"
65+
android:textAppearance="?attr/textAppearanceSubtitle1"
6566
android:text="@{course.name}"/>
6667

6768
<ImageView

‎app/src/main/res/layout/fragment_my_courses.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
android:layout_height="wrap_content"
3131
app:liftOnScroll="true"
3232
app:liftOnScrollTargetViewId="@id/list"
33-
android:theme="@style/ThemeOverlay.MaterialComponents.Dark">
33+
android:theme="@style/ThemeOverlay.Owl.Blue.Dark">
3434

3535
<androidx.appcompat.widget.Toolbar
3636
android:layout_width="match_parent"

‎app/src/main/res/layout/fragment_search.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,16 @@
2121
android:layout_width="match_parent"
2222
android:layout_height="match_parent"
2323
android:background="?attr/colorPrimarySurface"
24-
android:theme="@style/ThemeOverlay.MaterialComponents.Dark"
24+
android:theme="@style/Owl.Blue"
2525
app:paddingTopSystemWindowInsets="@{true}"
2626
tools:context=".ui.search.SearchFragment">
2727

2828
<com.google.android.material.appbar.AppBarLayout
2929
android:layout_width="match_parent"
3030
android:layout_height="wrap_content"
3131
app:liftOnScroll="true"
32-
app:liftOnScrollTargetViewId="@id/search_results">
32+
app:liftOnScrollTargetViewId="@id/search_results"
33+
android:theme="@style/ThemeOverlay.Owl.Blue.Dark">
3334

3435
<androidx.appcompat.widget.Toolbar
3536
android:layout_width="match_parent"

‎app/src/main/res/layout/search_item.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
android:focusable="true"
3333
android:clickable="true"
3434
android:textAppearance="?attr/textAppearanceHeadline5"
35+
android:textColor="?attr/colorOnPrimarySurface"
3536
android:text="@{topic.name}"/>
3637

3738
</layout>

‎app/src/main/res/values-night/theme.xml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,7 @@
1414
-->
1515
<resources>
1616

17-
<style name="Owl" parent="@style/Base.Owl">
18-
<item name="colorPrimarySurface">?attr/colorSurface</item>
19-
<item name="colorOnPrimarySurface">?attr/colorOnSurface</item>
20-
</style>
21-
22-
<style name="Owl.Yellow" parent="@style/Base.Owl">
17+
<style name="Owl.Yellow">
2318
<item name="colorPrimary">@color/owl_yellow_200</item>
2419
<item name="colorSecondary">@color/owl_blue_200</item>
2520
<item name="colorSurface">@color/owl_yellow_dark_primary</item>
@@ -37,6 +32,8 @@
3732
<item name="colorSurface">@color/owl_blue_dark_primary</item>
3833
</style>
3934

35+
<style name="ThemeOverlay.Owl.Blue.Dark"/>
36+
4037
<style name="Owl.Pink">
4138
<item name="colorPrimary">@color/owl_pink_200</item>
4239
<item name="colorSecondary">@color/owl_pink_200</item>

‎app/src/main/res/values/attrs.xml

Lines changed: 0 additions & 20 deletions
This file was deleted.

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,9 @@
1414
-->
1515
<resources>
1616

17-
<style name="Widget.Owl.BottomNavigationView" parent="@style/Widget.MaterialComponents.BottomNavigationView.Colored">
18-
<item name="android:background">?attr/colorPrimarySurface</item>
19-
<item name="labelVisibilityMode">selected</item>
20-
<item name="itemIconTint">@color/bottom_nav_item</item>
21-
<item name="itemTextColor">@color/bottom_nav_item</item>
22-
<item name="itemTextAppearanceActive">@style/TextAppearance.Owl.BottomNavigation</item>
23-
</style>
24-
25-
<style name="Widget.Owl.Toolbar" parent="@style/Widget.MaterialComponents.Toolbar">
17+
<style
18+
name="Widget.Owl.BottomNavigationView"
19+
parent="@style/Widget.MaterialComponents.BottomNavigationView.PrimarySurface">
2620
<item name="labelVisibilityMode">selected</item>
2721
<item name="itemIconTint">@color/bottom_nav_item</item>
2822
<item name="itemTextColor">@color/bottom_nav_item</item>

0 commit comments

Comments
 (0)