Merge branch 'material-design' into story/gh-18/graphical-percentage-…

…indicator
reMARK-able · Aug 18, 2020 · 76f13f1 · 76f13f1
2 parents de02156 + e5784e4
commit 76f13f1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -57,6 +57,7 @@ dependencies {
     implementation "androidx.core:core-ktx:$coreVersion"
     implementation "androidx.appcompat:appcompat:$appCompatVersion"
     implementation "androidx.constraintlayout:constraintlayout:$constraintlayoutVersion"
+    implementation "com.google.android.material:material:$materialVersion"
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidXTestExtKotlinRunnerVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/Theme.AirRybnik">
         <receiver android:name=".appwidget.Pm10AppWidget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="Theme.AirRybnik" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

diff --git a/build.gradle b/build.gradle
@@ -43,6 +43,7 @@ ext {
     hiltAndroidXVersion = '1.0.0-alpha02'
     junitVersion = '4.13'
     lifecycleExtVersion = '2.2.0'
+    materialVersion = '1.2.0'
     moshiVersion = '1.9.3'
     navigationVersion = '2.3.0'
     retrofitVersion = '2.9.0'