Matte23/circolapp
1
0
Fork 0
mirror of https://github.com/Matte23/circolapp.git synced 2025-12-06 07:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated MaterialComponent library, implemented DayNight theme

Browse Source
This commit is contained in:
Matteo Schiff
2019-09-22 19:01:25 +02:00
committed by Matte23
parent d00ce9b51f
commit 348470921d
6 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/net/underdesk/circolapp/adapters/CircularLetterAdapter.kt
View File

@@ -125,9 +125,9 @@ class CircularLetterAdapter(
!= PackageManager.PERMISSION_GRANTED
) {
val builder: AlertDialog.Builder? = AlertDialog.Builder(context)
val builder = AlertDialog.Builder(context)
builder?.apply {
builder.apply {
setMessage(context.getString(R.string.dialog_message_permission_write))
setTitle(context.getString(R.string.dialog_title_permission_required))
setPositiveButton(
@@ -142,7 +142,7 @@ class CircularLetterAdapter(
}
builder?.create()?.show()
builder.create().show()
} else {
adapterCallback.downloadCircular()
}

8
app/src/main/res/layout/dialog_reminder.xml
View File

@@ -24,9 +24,9 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/dialog_date_picker" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/dialog_cancel_button"
style="@style/Widget.AppCompat.Button.Borderless"
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@@ -37,9 +37,9 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/dialog_time_picker" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/dialog_ok_button"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"

7
app/src/main/res/values/colors.xml
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#008577</color>
<color name="colorPrimaryDark">#00574B</color>
<color name="colorAccent">#D81B60</color>
<color name="colorPrimary">#3F51B5</color>
<color name="colorPrimaryDark">#303F9F</color>
<color name="colorAccent">#03A9F4</color>
<color name="colorAccentDark">#007AC1</color>
<color name="colorDivider">#BDBDBD</color>
</resources>

2
app/src/main/res/values/strings.xml
View File

@@ -1,5 +1,5 @@
<resources>
<string name="app_name">Circolapp</string>
<string name="app_name">CircolApp</string>
<string name="title_circular_letters">Circular letters</string>
<string name="title_favourites">Favourites</string>
<string name="title_reminders">Reminders</string>

5
app/src/main/res/values/styles.xml
View File

@@ -1,11 +1,14 @@
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorPrimaryVariant">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="colorSecondary">@color/colorAccent</item>
<item name="colorSecondaryVariant">@color/colorAccentDark</item>
</style>
</resources>