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

Upcoming/current course of the current day will now be highlighted with a thicker border

Browse Source
This commit is contained in:
denizk0461
2023-04-14 13:09:40 +02:00
parent a3489d06b3
commit f07c41079a
8 changed files with 83 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/content_main.xml
+9 -9
View File
@@ -40,15 +40,6 @@
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"
@@ -63,4 +54,13 @@
app:layout_constraintEnd_toEndOf="parent"
android:background="?attr/colorBackground"/>
<com.google.android.material.divider.MaterialDivider
style="@style/DividerTheme"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/nav_view"/>
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/fragment_settings.xml
+1
View File
@@ -37,6 +37,7 @@
android:layout_marginHorizontal="16dp"/>
<com.google.android.material.divider.MaterialDivider
style="@style/DividerTheme"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"/>
app/src/main/res/layout/item_event.xml
+1
View File
@@ -28,6 +28,7 @@
android:fontFamily="@font/lato_bolditalic"/>
<com.google.android.material.divider.MaterialDivider
style="@style/DividerTheme"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="4dp"/>
app/src/main/res/values-night/themes.xml
+5
View File
@@ -9,6 +9,7 @@
<item name="colorText">@color/colorTextNight</item>
<item name="colorTextHint">@color/colorTextHintNight</item>
<item name="colorTextHintLighter">@color/colorTextHintLighterNight</item>
<item name="colorBackground">@color/colorBackgroundNight</item>
<item name="colorCardBackground">@color/colorCardBackgroundNight</item>
@@ -27,4 +28,8 @@
<style name="SelectableItemTheme">
<item name="colorControlHighlight">@color/primaryNight</item>
</style>
<style name="DividerTheme" parent="Widget.Material3.MaterialDivider">
<item name="dividerColor">@color/colorTextHintLighterNight</item>
</style>
</resources>
app/src/main/res/values/attrs.xml
+2
View File
@@ -2,9 +2,11 @@
<resources>
<attr name="colorNavHighlight" format="color" />
<attr name="colorPrimaryOnContrast" format="color" />
<attr name="colorPrimary" format="color" />
<attr name="colorOnPrimary" format="color" />
<attr name="colorText" format="color" />
<attr name="colorTextHint" format="color" />
<attr name="colorTextHintLighter" format="color" />
<attr name="colorBackground" format="color" />
<attr name="colorCardBackground" format="color" />
<attr name="colorSwitchTrack" format="color" />
app/src/main/res/values/colors.xml
+10 -8
View File
@@ -2,26 +2,28 @@
<resources>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<color name="brightfuckingpink">#FF46BB</color> <!-- for debug purposes -->
<!-- <color name="primaryLight">#0F4759</color>-->
<!-- <color name="primaryDark">#62CCE4</color>-->
<color name="primaryDay">#B2665A</color> <!-- B82729 -->
<!-- colours i defined -->
<color name="primaryDay">#B2665A</color>
<color name="primaryNight">#995348</color>
<color name="highlightDay">#871D1E</color>
<color name="highlightNight">#CB9890</color>
<color name="colorTextDay">#141414</color> // TODO
<color name="colorTextDay">#141414</color>
<color name="colorTextNight">#CDCBCB</color>
<color name="colorTextHintDay">#2A2828</color> // TODO
<color name="colorTextHintDay">#2A2828</color>
<color name="colorTextHintNight">#B9B6B6</color>
<color name="colorBackgroundDay">#EBEBEB</color> // TODO
<color name="colorTextHintLighterDay">#3E3C3C</color>
<color name="colorTextHintLighterNight">#918D8D</color>
<color name="colorBackgroundDay">#EBEBEB</color>
<color name="colorBackgroundNight">#151414</color>
<color name="colorCardBackgroundDay">#E0E0E0</color> // TODO
<color name="colorCardBackgroundDay">#E0E0E0</color>
<color name="colorCardBackgroundNight">#1F1E1E</color>
<color name="colorSwitchTrackDay">#D6D6D6</color>
app/src/main/res/values/themes.xml
+5
View File
@@ -10,6 +10,7 @@
<item name="colorText">@color/colorTextDay</item>
<item name="colorTextHint">@color/colorTextHintDay</item>
<item name="colorTextHintLighter">@color/colorTextHintLighterDay</item>
<item name="colorBackground">@color/colorBackgroundDay</item>
<item name="colorCardBackground">@color/colorCardBackgroundDay</item>
@@ -36,4 +37,8 @@
<style name="SelectableItemTheme">
<item name="colorControlHighlight">@color/primaryDay</item>
</style>
<style name="DividerTheme" parent="Widget.Material3.MaterialDivider">
<item name="dividerColor">@color/colorTextHintLighterDay</item>
</style>
</resources>