karolina/weserplaner
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Completed the design (colour) change for both dark and light theme now

Browse Source
This commit is contained in:
denizk0461
2023-04-13 21:05:52 +02:00
parent 3a2d444956
commit a3489d06b3
15 changed files with 128 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle
+1
View File
@@ -45,6 +45,7 @@ dependencies {
implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
app/src/main/res/color/list_nav_bar_icon.xml
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="?attr/colorOnPrimary" />
<item android:color="?attr/colorTextHint" />
</selector>
app/src/main/res/color/switch_thumb.xml → app/src/main/res/color/list_nav_bar_text.xml
View File
app/src/main/res/color/list_switch_decoration.xml
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="?attr/colorPrimary" />
<item android:color="?attr/colorTextHint" />
</selector>
app/src/main/res/color/list_switch_thumb.xml
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="?attr/colorText" />
<item android:color="?attr/colorTextHint" />
</selector>
app/src/main/res/color/list_switch_track.xml
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="?attr/colorPrimary" />
<item android:color="?attr/colorSwitchTrack" />
</selector>
app/src/main/res/layout/content_main.xml
+13 -1
View File
@@ -40,6 +40,15 @@
app:layout_constraintTop_toBottomOf="@+id/toolbar"
app:navGraph="@navigation/nav_graph"/>
<com.google.android.material.divider.MaterialDivider
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
app:layout_constraintTop_toBottomOf="@id/nav_host_fragment_content_main"
app:layout_constraintBottom_toTopOf="@id/nav_view"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/nav_view"
android:layout_width="0dp"
@@ -47,8 +56,11 @@
app:menu="@menu/nav_view_items"
app:labelVisibilityMode="selected"
app:itemActiveIndicatorStyle="@style/NavigationViewItemIndicator"
app:itemTextColor="@color/list_nav_bar_text"
app:itemIconTint="@color/list_nav_bar_icon"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
app:layout_constraintEnd_toEndOf="parent"
android:background="?attr/colorBackground"/>
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/fragment_food.xml
+17 -3
View File
@@ -1,7 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.appcompat.widget.LinearLayoutCompat 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="?attr/colorBackground">
android:background="?attr/colorBackground"
android:orientation="vertical">
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipe_refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"/>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
app/src/main/res/layout/fragment_settings.xml
+31 -3
View File
@@ -17,7 +17,8 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
android:layout_marginVertical="4dp"
style="@style/Widget.Material3.CardView.Outlined">
style="@style/Widget.Material3.CardView.Outlined"
android:backgroundTint="?attr/colorCardBackground">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
@@ -40,6 +41,33 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"/>
<!-- App version -->
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/button_refresh_schedule"
android:background="@drawable/layout_ripple"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:clickable="true"
android:focusable="true"
android:paddingHorizontal="16dp"
android:paddingVertical="8dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:fontFamily="@font/lato_bolditalic"
android:text="@string/refresh_schedule_title"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:text="@string/refresh_schedule_subtitle"/>
</androidx.appcompat.widget.LinearLayoutCompat>
<!-- Academic quarter -->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_quarter"
@@ -76,13 +104,13 @@
</androidx.appcompat.widget.LinearLayoutCompat>
<com.google.android.material.materialswitch.MaterialSwitch
style="@style/SwitchTheme"
android:id="@+id/switch_quarter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:thumbTint="@color/switch_thumb"/>
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/item_event.xml
+2 -1
View File
@@ -11,7 +11,8 @@
android:id="@+id/card_background"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Widget.Material3.CardView.Outlined">
style="@style/Widget.Material3.CardView.Outlined"
android:backgroundTint="?attr/colorCardBackground">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
app/src/main/res/values-night/themes.xml
+8 -7
View File
@@ -2,20 +2,22 @@
<!-- Base application theme. -->
<style name="Base.Theme.StudIPTimetable" parent="Theme.Material3.DayNight.NoActionBar">
<item name="android:textColor">?attr/colorText</item>
<item name="android:windowBackground">@color/colorBackgroundNight</item>
<!-- colour -->
<item name="colorPrimary">@color/primaryNight</item>
<item name="rippleColor">@color/primaryNight</item>
<item name="colorNavHighlight">@color/highlightNight</item>
<!-- <item name="colorPrimaryOnContrast">@color/colorPrimaryOnContrastDark</item>-->
<item name="colorOnPrimary">@color/colorTextNight</item>
<item name="colorText">@color/colorTextNight</item>
<item name="colorTextHint">@color/colorTextHintNight</item>
<item name="colorBackground">@color/colorBackgroundNight</item>
<item name="colorCardBackground">@color/colorCardBackgroundNight</item>
<item name="colorSwitchTrack">@color/colorSwitchTrackNight</item>
<item name="android:textColor">?attr/colorText</item>
<item name="android:windowBackground">@color/colorBackgroundNight</item>
<item name="colorNavHighlight">@color/highlightNight</item>
</style>
<style name="NavigationViewItemIndicator" parent="Widget.Material3.BottomNavigationView.ActiveIndicator">
@@ -23,7 +25,6 @@
</style>
<style name="SelectableItemTheme">
<!-- <item name="colorControlHighlight">?attr/colorPrimary</item>-->
<item name="colorControlHighlight">@color/primaryNight</item>
</style>
</resources>
app/src/main/res/values/attrs.xml
+3
View File
@@ -2,7 +2,10 @@
<resources>
<attr name="colorNavHighlight" format="color" />
<attr name="colorPrimaryOnContrast" format="color" />
<attr name="colorOnPrimary" format="color" />
<attr name="colorText" format="color" />
<attr name="colorTextHint" format="color" />
<attr name="colorBackground" format="color" />
<attr name="colorCardBackground" format="color" />
<attr name="colorSwitchTrack" format="color" />
</resources>
app/src/main/res/values/colors.xml
+11 -5
View File
@@ -6,21 +6,27 @@
<!-- <color name="primaryLight">#0F4759</color>-->
<!-- <color name="primaryDark">#62CCE4</color>-->
<color name="primaryDay">#B82729</color>
<color name="primaryNight">#B2665A</color>
<color name="primaryDay">#B2665A</color> <!-- B82729 -->
<color name="primaryNight">#995348</color>
<color name="highlightDay">#871D1E</color>
<color name="highlightNight">#CB9890</color>
<color name="colorTextDay">#CB9890</color> // TODO
<color name="colorTextDay">#141414</color> // TODO
<color name="colorTextNight">#CDCBCB</color>
<color name="colorTextHintDay">#CB9890</color> // TODO
<color name="colorTextHintDay">#2A2828</color> // TODO
<color name="colorTextHintNight">#B9B6B6</color>
<color name="colorBackgroundDay">#151414</color> // TODO
<color name="colorBackgroundDay">#EBEBEB</color> // TODO
<color name="colorBackgroundNight">#151414</color>
<color name="colorCardBackgroundDay">#E0E0E0</color> // TODO
<color name="colorCardBackgroundNight">#1F1E1E</color>
<color name="colorSwitchTrackDay">#D6D6D6</color>
<color name="colorSwitchTrackNight">#2A2828</color>
<!-- <color name="colorPrimaryOnContrastLight">#E6898B</color>-->
<!-- <color name="colorPrimaryOnContrastDark">#B77166</color>-->
</resources>
app/src/main/res/values/strings.xml
+3 -36
View File
@@ -26,46 +26,13 @@
<string name="settings_general">General</string>
<string name="settings_misc">Miscellaneous</string>
<string name="refresh_schedule_title">Refresh your Stud.IP schedule</string>
<string name="refresh_schedule_subtitle">This will clear any customisations!</string>
<string name="settings_quarter_title">Show academic quarter</string>
<string name="settings_quarter_subtitle">Where applicable</string>
<string name="settings_app_version">App Version</string>
<string name="with_love">with ♡️ from Bremen-Osterholz\nmade by denizk0461 \\__*</string>
<string name="lorem_ipsum">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam in scelerisque sem. Mauris
volutpat, dolor id interdum ullamcorper, risus dolor egestas lectus, sit amet mattis purus
dui nec risus. Maecenas non sodales nisi, vel dictum dolor. Class aptent taciti sociosqu ad
litora torquent per conubia nostra, per inceptos himenaeos. Suspendisse blandit eleifend
diam, vel rutrum tellus vulputate quis. Aliquam eget libero aliquet, imperdiet nisl a,
ornare ex. Sed rhoncus est ut libero porta lobortis. Fusce in dictum tellus.\n\n
Suspendisse interdum ornare ante. Aliquam nec cursus lorem. Morbi id magna felis. Vivamus
egestas, est a condimentum egestas, turpis nisl iaculis ipsum, in dictum tellus dolor sed
neque. Morbi tellus erat, dapibus ut sem a, iaculis tincidunt dui. Interdum et malesuada
fames ac ante ipsum primis in faucibus. Curabitur et eros porttitor, ultricies urna vitae,
molestie nibh. Phasellus at commodo eros, non aliquet metus. Sed maximus nisl nec dolor
bibendum, vel congue leo egestas.\n\n
Sed interdum tortor nibh, in sagittis risus mollis quis. Curabitur mi odio, condimentum sit
amet auctor at, mollis non turpis. Nullam pretium libero vestibulum, finibus orci vel,
molestie quam. Fusce blandit tincidunt nulla, quis sollicitudin libero facilisis et. Integer
interdum nunc ligula, et fermentum metus hendrerit id. Vestibulum lectus felis, dictum at
lacinia sit amet, tristique id quam. Cras eu consequat dui. Suspendisse sodales nunc ligula,
in lobortis sem porta sed. Integer id ultrices magna, in luctus elit. Sed a pellentesque
est.\n\n
Aenean nunc velit, lacinia sed dolor sed, ultrices viverra nulla. Etiam a venenatis nibh.
Morbi laoreet, tortor sed facilisis varius, nibh orci rhoncus nulla, id elementum leo dui
non lorem. Nam mollis ipsum quis auctor varius. Quisque elementum eu libero sed commodo. In
eros nisl, imperdiet vel imperdiet et, scelerisque a mauris. Pellentesque varius ex nunc,
quis imperdiet eros placerat ac. Duis finibus orci et est auctor tincidunt. Sed non viverra
ipsum. Nunc quis augue egestas, cursus lorem at, molestie sem. Morbi a consectetur ipsum, a
placerat diam. Etiam vulputate dignissim convallis. Integer faucibus mauris sit amet finibus
convallis.\n\n
Phasellus in aliquet mi. Pellentesque habitant morbi tristique senectus et netus et
malesuada fames ac turpis egestas. In volutpat arcu ut felis sagittis, in finibus massa
gravida. Pellentesque id tellus orci. Integer dictum, lorem sed efficitur ullamcorper,
libero justo consectetur ipsum, in mollis nisl ex sed nisl. Donec maximus ullamcorper
sodales. Praesent bibendum rhoncus tellus nec feugiat. In a ornare nulla. Donec rhoncus
libero vel nunc consequat, quis tincidunt nisl eleifend. Cras bibendum enim a justo luctus
vestibulum. Fusce dictum libero quis erat maximus, vitae volutpat diam dignissim.
</string>
<string name="de4thSpirit">In our hearts, she lives forevermore</string>
</resources>
app/src/main/res/values/themes.xml
+19 -9
View File
@@ -1,29 +1,39 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Base.Theme.StudIPTimetable" parent="Theme.Material3.DayNight.NoActionBar">
<!-- <item name="fontFamily">@font/lato_regular</item>-->
<item name="android:textColor">?attr/colorText</item>
<item name="android:windowBackground">@color/colorBackgroundDay</item>
<!-- customisation -->
<item name="fontFamily">@font/lato_regular</item>
<!-- colour -->
<item name="colorPrimary">@color/primaryDay</item>
<item name="rippleColor">@color/primaryDay</item>
<item name="colorOnPrimary">@color/colorBackgroundDay</item>
<item name="colorText">@color/colorTextDay</item>
<item name="colorTextHint">@color/colorTextHintDay</item>
<item name="colorBackground">@color/colorBackgroundDay</item>
<item name="colorCardBackground">@color/colorCardBackgroundDay</item>
<item name="colorSwitchTrack">@color/colorSwitchTrackDay</item>
<item name="android:textColor">?attr/colorText</item>
<item name="android:windowBackground">@color/colorBackgroundDay</item>
<item name="colorNavHighlight">@color/highlightDay</item>
<!-- <item name="colorPrimaryOnContrast">@color/colorPrimaryOnContrastLight</item>-->
</style>
<style name="Theme.StudIPTimetable" parent="Base.Theme.StudIPTimetable" />
<style name="SwitchTheme" parent="Widget.Material3.CompoundButton.MaterialSwitch">
<item name="thumbTint">@color/list_switch_thumb</item>
<item name="trackTint">@color/list_switch_track</item>
<item name="trackDecorationTint">@color/list_switch_decoration</item>
</style>
<style name="NavigationViewItemIndicator" parent="Widget.Material3.BottomNavigationView.ActiveIndicator">
<item name="android:color">@color/primaryDay</item>
</style>
<style name="SelectableItemTheme">
<!-- <item name="colorControlHighlight">?attr/colorPrimary</item>-->
<item name="colorControlHighlight">@color/primaryDay</item>
</style>
</resources>