Seil0/teapod
1
0
Fork 0
Code Issues 7 Pull Requests Releases 17 Wiki Activity

migrate to material 3 #70

Merged
Seil0 merged 6 commits from feature/material-3 into develop 2023-04-15 23:51:08 +02:00
Conversation 0 Commits 6 Files Changed 43 +340 -183
29 changed files with 340 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 14ad34138c - Show all commits

4
app/src/main/java/org/mosad/teapod/ui/activity/main/MainActivity.kt
View File

@ -72,10 +72,6 @@ class MainActivity : AppCompatActivity(), NavigationBarView.OnItemSelectedListen
load() // start the initial loading
// theming
/**
* TODO button should be white (on dark) or black (on light)
*/
// theme.applyStyle(R.style.AppTheme_DayNight, true) // TODO I think this must be removed for system settings to work
val mode = when (Preferences.theme) {
DataTypes.Theme.LIGHT -> AppCompatDelegate.MODE_NIGHT_NO

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

@ -2,8 +2,7 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?themePrimary">
android:layout_height="match_parent">
<ImageView
android:id="@+id/image_login"
@ -15,8 +14,7 @@
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_launcher_foreground"
app:tint="?buttonBackground" />
app:srcCompat="@drawable/ic_launcher_foreground" />
<LinearLayout
android:id="@+id/linear_login"

7
app/src/main/res/layout/fragment_on_welcome.xml
View File

@ -1,11 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?themePrimary">
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@ -21,8 +19,7 @@
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_launcher_foreground"
app:tint="?buttonBackground" />
app:srcCompat="@drawable/ic_launcher_foreground" />
<LinearLayout
android:id="@+id/linearLayout3"

7
app/src/main/res/layout/modal_bottom_sheet_login.xml
View File

@ -4,7 +4,6 @@
android:id="@+id/standard_bottom_sheet"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?themeSecondary"
android:orientation="vertical"
android:paddingTop="24dp"
android:paddingStart="24dp"
@ -61,8 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:text="@string/cancel"
android:textColor="?colorPrimary" />
android:text="@string/cancel" />
<Button
android:id="@+id/positive_button"
@ -70,8 +68,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:text="@string/save"
android:textColor="?colorPrimary" />
android:text="@string/save" />
</LinearLayout>
</LinearLayout>