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

Switch from bridge theme to MaterialComponents theme

Browse Source
This commit is contained in:
Matte23
2020-11-05 21:19:17 +01:00
parent 21bc923c39
commit 024f6beeab
8 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/net/underdesk/circolapp/IntroActivity.kt
View File

@@ -24,7 +24,9 @@ class IntroActivity : AppIntro2() {
title = getString(R.string.title_intro), title = getString(R.string.title_intro),
description = getString(R.string.activity_intro_welcome_description), description = getString(R.string.activity_intro_welcome_description),
imageDrawable = R.mipmap.ic_launcher, imageDrawable = R.mipmap.ic_launcher,
backgroundColor = ContextCompat.getColor(this, R.color.colorPrimary) backgroundColor = ContextCompat.getColor(this, R.color.colorPrimary),
titleColor = ContextCompat.getColor(this, R.color.colorOnPrimary),
descriptionColor = ContextCompat.getColor(this, R.color.colorOnPrimary)
) )
) )
addSlide(LegalFragment.newInstance()) addSlide(LegalFragment.newInstance())
@@ -33,7 +35,9 @@ class IntroActivity : AppIntro2() {
AppIntroFragment.newInstance( AppIntroFragment.newInstance(
title = getString(R.string.activity_intro_last_slide_title), title = getString(R.string.activity_intro_last_slide_title),
description = getString(R.string.activity_intro_last_slide_description), description = getString(R.string.activity_intro_last_slide_description),
backgroundColor = ContextCompat.getColor(this, R.color.colorPrimary) backgroundColor = ContextCompat.getColor(this, R.color.colorPrimary),
titleColor = ContextCompat.getColor(this, R.color.colorOnPrimary),
descriptionColor = ContextCompat.getColor(this, R.color.colorOnPrimary)
) )
) )
} }

2
app/src/main/res/layout/fragment_legal.xml
View File

@@ -17,6 +17,7 @@
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/colorOnPrimary"
app:layout_constraintBottom_toTopOf="@+id/legal_checkbox" app:layout_constraintBottom_toTopOf="@+id/legal_checkbox"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -31,6 +32,7 @@
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:textColor="@color/colorOnPrimary"
android:text="@string/activity_intro_legal_checkbox" android:text="@string/activity_intro_legal_checkbox"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

6
app/src/main/res/layout/fragment_school_selection.xml
View File

@@ -22,7 +22,8 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="spread" app:layout_constraintVertical_chainStyle="spread"
style="@style/AppIntroDefaultHeading" style="@style/AppIntroDefaultHeading"
android:text="@string/activity_intro_school_selection_title" /> android:text="@string/activity_intro_school_selection_title"
android:textColor="@color/colorOnPrimary" />
<com.tiper.MaterialSpinner <com.tiper.MaterialSpinner
android:id="@+id/school_selection_spinner" android:id="@+id/school_selection_spinner"
@@ -49,7 +50,8 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/school_selection_spinner" app:layout_constraintTop_toBottomOf="@+id/school_selection_spinner"
style="@style/AppIntroDefaultText" style="@style/AppIntroDefaultText"
android:text="@string/activity_intro_school_selection_description" /> android:text="@string/activity_intro_school_selection_description"
android:textColor="@color/colorOnPrimary" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/item_attachment.xml
View File

@@ -33,7 +33,7 @@
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:src="@drawable/baseline_visibility_24" android:src="@drawable/baseline_visibility_24"
android:tint="@color/colorAccent" android:tint="@color/colorSecondary"
android:contentDescription="@string/image_view_attachment" android:contentDescription="@string/image_view_attachment"
app:layout_constraintEnd_toStartOf="@+id/attachment_download_button" app:layout_constraintEnd_toStartOf="@+id/attachment_download_button"
app:layout_constraintTop_toBottomOf="@+id/attachment_divider" /> app:layout_constraintTop_toBottomOf="@+id/attachment_divider" />
@@ -46,7 +46,7 @@
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:src="@drawable/baseline_get_app_24" android:src="@drawable/baseline_get_app_24"
android:tint="@color/colorAccent" android:tint="@color/colorSecondary"
android:contentDescription="@string/image_download_attachment" android:contentDescription="@string/image_download_attachment"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/attachment_divider" /> app:layout_constraintTop_toBottomOf="@+id/attachment_divider" />

13
app/src/main/res/layout/item_circular.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/circular_card" android:id="@+id/circular_card"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -7,6 +7,7 @@
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
app:cardElevation="2dp"
app:cardCornerRadius="8dp"> app:cardCornerRadius="8dp">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
@@ -65,7 +66,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:src="@drawable/baseline_visibility_24" android:src="@drawable/baseline_visibility_24"
android:tint="@color/colorAccent" android:tint="@color/colorSecondary"
android:contentDescription="@string/image_view_circular" android:contentDescription="@string/image_view_circular"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/circulars_attachments_list" app:layout_constraintBottom_toTopOf="@+id/circulars_attachments_list"
@@ -78,7 +79,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:src="@drawable/baseline_get_app_24" android:src="@drawable/baseline_get_app_24"
android:tint="@color/colorAccent" android:tint="@color/colorSecondary"
android:contentDescription="@string/image_download_circular" android:contentDescription="@string/image_download_circular"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/circulars_attachments_list" app:layout_constraintBottom_toTopOf="@+id/circulars_attachments_list"
@@ -91,7 +92,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/baseline_star_24" android:src="@drawable/baseline_star_24"
android:tint="@color/colorAccent" android:tint="@color/colorSecondary"
android:contentDescription="@string/image_add_favourite" android:contentDescription="@string/image_add_favourite"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/circulars_attachments_list" app:layout_constraintBottom_toTopOf="@+id/circulars_attachments_list"
@@ -105,7 +106,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:src="@drawable/baseline_notifications_24" android:src="@drawable/baseline_notifications_24"
android:tint="@color/colorAccent" android:tint="@color/colorSecondary"
android:contentDescription="@string/image_add_reminder" android:contentDescription="@string/image_add_reminder"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/circulars_attachments_list" app:layout_constraintBottom_toTopOf="@+id/circulars_attachments_list"
@@ -133,4 +134,4 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView> </com.google.android.material.card.MaterialCardView>

9
app/src/main/res/values-night/colors.xml
View File

@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="colorPrimary">#9FA8DA</color> <color name="colorPrimary">#9FA8DA</color>
<color name="colorPrimaryDark">#6F79A8</color> <color name="colorPrimaryVariant">#6f79a8</color>
<color name="colorAccent">#81D4FA</color> <color name="colorOnPrimary">#000000</color>
<color name="colorAccentDark">#4BA3C7</color> <color name="colorSecondary">#81D4FA</color>
<color name="colorSecondaryVariant">#4ba3c7</color>
<color name="colorOnSecondary">#000000</color>
<color name="colorBackground">#121212</color>
</resources> </resources>

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

@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="colorPrimary">#3F51B5</color> <color name="colorPrimary">#3F51B5</color>
<color name="colorPrimaryDark">#303F9F</color> <color name="colorPrimaryVariant">#002984</color>
<color name="colorAccent">#03A9F4</color> <color name="colorOnPrimary">#FFFFFF</color>
<color name="colorAccentDark">#007AC1</color> <color name="colorSecondary">#03A9F4</color>
<color name="colorSecondaryVariant">#007AC1</color>
<color name="colorOnSecondary">#000000</color>
<color name="colorBackground">#FFFFFF</color>ì
<color name="colorDivider">#BDBDBD</color> <color name="colorDivider">#BDBDBD</color>
</resources> </resources>

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

@@ -1,14 +1,16 @@
<resources> <resources>
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge"> <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Customize your theme here. --> <!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryVariant</item>
<item name="colorPrimaryVariant">@color/colorPrimaryDark</item> <item name="colorPrimaryVariant">@color/colorPrimaryVariant</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorOnPrimary">@color/colorOnPrimary</item>
<item name="colorSecondary">@color/colorAccent</item> <item name="colorSecondary">@color/colorSecondary</item>
<item name="colorSecondaryVariant">@color/colorAccentDark</item> <item name="colorSecondaryVariant">@color/colorSecondaryVariant</item>
<item name="colorOnSecondary">@color/colorOnSecondary</item>
<item name="android:colorBackground">@color/colorBackground</item>
<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Primary</item> <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Primary</item>
</style> </style>