diff --git a/app/build.gradle b/app/build.gradle index 0098468b..941bd371 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -119,7 +119,6 @@ ext { configurations.all { resolutionStrategy.force "androidx.constraintlayout:constraintlayout:1.1.3" - resolutionStrategy.force "com.google.android.material:material:1.1.0-alpha07" } dependencies { @@ -140,7 +139,7 @@ dependencies { implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03" implementation "androidx.constraintlayout:constraintlayout:1.1.3" implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0-rc01" - implementation "com.google.android.material:material:1.1.0-alpha07" + implementation "com.google.android.material:material:1.1.0-beta02" implementation "com.github.wulkanowy:material-chips-input:2.0.1" implementation "com.github.PhilJay:MPAndroidChart:v3.1.0" implementation "me.zhanghai.android.materialprogressbar:library:1.6.1" diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt index 4c7f7759..991c1d10 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt @@ -100,7 +100,7 @@ class MainActivity : BaseActivity(), MainView { override fun initView() { with(mainToolbar) { if (SDK_INT >= LOLLIPOP) stateListAnimator = null - setBackgroundColor(overlayProvider.get().getSurfaceColorWithOverlayIfNeeded(dpToPx(4f))) + setBackgroundColor(overlayProvider.get().compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(4f))) } with(mainBottomNav) { @@ -113,7 +113,7 @@ class MainActivity : BaseActivity(), MainView { )) accentColor = getThemeAttrColor(R.attr.colorPrimary) inactiveColor = ColorUtils.setAlphaComponent(getThemeAttrColor(R.attr.colorOnSurface), 153) - defaultBackgroundColor = overlayProvider.get().getSurfaceColorWithOverlayIfNeeded(dpToPx(8f)) + defaultBackgroundColor = overlayProvider.get().compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(8f)) titleState = ALWAYS_SHOW currentItem = startMenuIndex isBehaviorTranslationEnabled = false diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialLinearLayout.kt b/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialLinearLayout.kt index cad26f2e..a04922e5 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialLinearLayout.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialLinearLayout.kt @@ -33,7 +33,7 @@ class MaterialLinearLayout : LinearLayout { if (SDK_INT >= LOLLIPOP) { setElevation(elevation) } else { - setBackgroundColor(ElevationOverlayProvider(context).getSurfaceColorWithOverlayIfNeeded(elevation)) + setBackgroundColor(ElevationOverlayProvider(context).compositeOverlayWithThemeSurfaceColorIfNeeded(elevation)) } } } diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialTabLayout.kt b/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialTabLayout.kt index 3bcaae7d..e19d0111 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialTabLayout.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialTabLayout.kt @@ -19,7 +19,7 @@ open class MaterialTabLayout : TabLayout { if (SDK_INT >= LOLLIPOP) { setElevation(elevation) } else { - setBackgroundColor(ElevationOverlayProvider(context).getSurfaceColorWithOverlayIfNeeded(elevation)) + setBackgroundColor(ElevationOverlayProvider(context).compositeOverlayWithThemeSurfaceColorIfNeeded(elevation)) } } } diff --git a/app/src/main/res/layout/fragment_grade.xml b/app/src/main/res/layout/fragment_grade.xml index d134ec17..b9b86f7d 100644 --- a/app/src/main/res/layout/fragment_grade.xml +++ b/app/src/main/res/layout/fragment_grade.xml @@ -13,7 +13,7 @@ android:visibility="invisible" app:tabMode="scrollable" app:tabSelectedTextColor="?colorPrimary" - app:tabTextColor="@color/mtrl_on_surface_emphasis_medium" + app:tabTextColor="@color/material_on_surface_emphasis_medium" tools:ignore="UnusedAttribute" tools:visibility="visible" /> diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml index d396276f..b4cc0c2f 100644 --- a/app/src/main/res/layout/fragment_message.xml +++ b/app/src/main/res/layout/fragment_message.xml @@ -16,7 +16,7 @@ app:tabMaxWidth="0dp" app:tabMode="fixed" app:tabSelectedTextColor="?colorPrimary" - app:tabTextColor="@color/mtrl_on_surface_emphasis_medium" + app:tabTextColor="@color/material_on_surface_emphasis_medium" tools:ignore="UnusedAttribute" tools:visibility="visible" /> @@ -35,8 +35,8 @@ android:layout_margin="16dp" android:clickable="true" android:focusable="true" - android:tint="?colorOnSecondary" android:text="@string/send_message_title" + android:tint="?colorOnSecondary" app:icon="@drawable/ic_menu_message_write" /> diff --git a/app/src/main/res/menu/action_menu_attendance.xml b/app/src/main/res/menu/action_menu_attendance.xml index 86c2fed7..bb20c8ec 100644 --- a/app/src/main/res/menu/action_menu_attendance.xml +++ b/app/src/main/res/menu/action_menu_attendance.xml @@ -6,6 +6,6 @@ android:icon="@drawable/ic_menu_attendance_summary" android:orderInCategory="1" android:title="@string/attendance_summary_button" - app:iconTint="@color/mtrl_on_surface_emphasis_medium" + app:iconTint="@color/material_on_surface_emphasis_medium" app:showAsAction="ifRoom" /> diff --git a/app/src/main/res/menu/action_menu_grade.xml b/app/src/main/res/menu/action_menu_grade.xml index 4438309d..6357cbb5 100644 --- a/app/src/main/res/menu/action_menu_grade.xml +++ b/app/src/main/res/menu/action_menu_grade.xml @@ -6,6 +6,6 @@ android:icon="@drawable/ic_menu_grade_semester" android:orderInCategory="1" android:title="@string/grade_switch_semester" - app:iconTint="@color/mtrl_on_surface_emphasis_medium" + app:iconTint="@color/material_on_surface_emphasis_medium" app:showAsAction="ifRoom" /> diff --git a/app/src/main/res/menu/action_menu_grade_details.xml b/app/src/main/res/menu/action_menu_grade_details.xml index fbd28eec..62516cbd 100644 --- a/app/src/main/res/menu/action_menu_grade_details.xml +++ b/app/src/main/res/menu/action_menu_grade_details.xml @@ -6,6 +6,6 @@ android:enabled="false" android:orderInCategory="100" android:title="@string/grade_menu_read" - app:iconTint="@color/mtrl_on_surface_emphasis_medium" + app:iconTint="@color/material_on_surface_emphasis_medium" app:showAsAction="never" /> diff --git a/app/src/main/res/menu/action_menu_main.xml b/app/src/main/res/menu/action_menu_main.xml index 78b4ee4a..72bea25a 100644 --- a/app/src/main/res/menu/action_menu_main.xml +++ b/app/src/main/res/menu/action_menu_main.xml @@ -6,6 +6,6 @@ android:icon="@drawable/ic_all_account" android:orderInCategory="2" android:title="@string/main_account_picker" - app:iconTint="@color/mtrl_on_surface_emphasis_medium" + app:iconTint="@color/material_on_surface_emphasis_medium" app:showAsAction="always" /> diff --git a/app/src/main/res/menu/action_menu_message_preview.xml b/app/src/main/res/menu/action_menu_message_preview.xml index f7979780..dfc12e23 100644 --- a/app/src/main/res/menu/action_menu_message_preview.xml +++ b/app/src/main/res/menu/action_menu_message_preview.xml @@ -6,20 +6,20 @@ android:icon="@drawable/ic_menu_message_reply" android:orderInCategory="1" android:title="@string/message_reply" - app:iconTint="@color/mtrl_on_surface_emphasis_medium" + app:iconTint="@color/material_on_surface_emphasis_medium" app:showAsAction="ifRoom" /> diff --git a/app/src/main/res/menu/action_menu_send_message.xml b/app/src/main/res/menu/action_menu_send_message.xml index 491f74f9..4b43764a 100644 --- a/app/src/main/res/menu/action_menu_send_message.xml +++ b/app/src/main/res/menu/action_menu_send_message.xml @@ -6,6 +6,6 @@ android:icon="@drawable/ic_menu_message_send" android:orderInCategory="1" android:title="@string/send_message_title" - app:iconTint="@color/mtrl_on_surface_emphasis_medium" + app:iconTint="@color/material_on_surface_emphasis_medium" app:showAsAction="ifRoom" /> diff --git a/app/src/main/res/menu/action_menu_timetable.xml b/app/src/main/res/menu/action_menu_timetable.xml index cfbdb626..c3d0222c 100644 --- a/app/src/main/res/menu/action_menu_timetable.xml +++ b/app/src/main/res/menu/action_menu_timetable.xml @@ -6,6 +6,6 @@ android:icon="@drawable/ic_menu_timetable_lessons_completed" android:orderInCategory="1" android:title="@string/completed_lessons_button" - app:iconTint="@color/mtrl_on_surface_emphasis_medium" + app:iconTint="@color/material_on_surface_emphasis_medium" app:showAsAction="ifRoom" /> diff --git a/gradle.properties b/gradle.properties index 44e7e13b..113bb106 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,7 @@ # Project-wide Gradle settings. - # IDE (e.g. Android Studio) users: # Gradle settings configured through the IDE *will override* # any settings specified in this file. - # For more details on how to configure your build environment visit # http://www.gradle.org/docs/current/userguide/build_environment.html @@ -18,4 +16,4 @@ kapt.incremental.apt=true # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true +# org.gradle.parallel=true \ No newline at end of file