Version 1.3.0 (little design overhaul) with additional fixes

This commit is contained in:
Deniz Düzgören
2019-05-09 07:48:17 +02:00
parent 4c3d011c6f
commit 907a746b55
35 changed files with 392 additions and 1167 deletions
+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:color="@color/accentPastel" android:state_checked="true" />
<item android:color="@color/hint" />
</selector>
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/accent" android:state_checked="true" />
<item android:color="@color/hint" />
</selector>
@@ -1,16 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- The android:opacity=”opaque” line — this is critical in preventing a flash of black as your theme transitions. -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
<!-- The background color, preferably the same as your normal theme -->
<item android:drawable="?attr/colorAccent"/>
<!-- Your product logo - 144dp color version of your app icon -->
<!--<item>-->
<!--<bitmap android:src="@drawable/ic_avh"-->
<!--android:gravity="center"/>-->
<!--</item>-->
<item android:drawable="@drawable/ic_avhlogo"
android:gravity="center"
android:scaleType="centerInside">
+4 -2
View File
@@ -90,12 +90,14 @@
android:layout_height="56dp"
android:layout_marginBottom="0dp"
app:elevation="0dp"
app:itemIconTint="@color/bottom_nav_color_avhblue"
app:itemTextColor="@color/bottom_nav_color_avhblue"
app:layout_anchor="@+id/bottom_sheet"
android:layout_gravity="bottom"
app:menu="@menu/nav_items"/>
<!-- app:itemIconTint="@drawable/tintlist_light"-->
<!-- app:itemTextColor="@drawable/tintlist_light"-->
<View
android:id="@+id/bottom_nav_divider"
android:layout_width="match_parent"
+24 -9
View File
@@ -22,21 +22,36 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/bottom_sheet_header"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:gravity="top|start"
android:text="@string/information"
android:textSize="16sp"/>
android:orientation="horizontal"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="4dp">
<ImageView
android:id="@+id/info_icon"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/ic_information"/>
<TextView
android:id="@+id/bottom_sheet_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:gravity="top|start"
android:text="@string/information"
android:textSize="16sp"/>
</LinearLayout>
<TextView
android:id="@+id/bottom_sheet_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="8dp"
android:layout_margin="16dp"
android:gravity="top|start"
android:text="@string/noinfo"
android:textSize="12sp"/>
+17 -31
View File
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout 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:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorBackground">
@@ -10,7 +9,8 @@
android:id="@+id/nsvsettings"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
android:fillViewport="true"
android:scrollbars="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -32,6 +32,8 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/txtLayoutName"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:boxStrokeColor="?attr/colorAccent"
app:boxStrokeWidth="2dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@@ -44,25 +46,18 @@
app:layout_constraintTop_toBottomOf="@+id/txtPersonalise"
android:importantForAutofill="no">
<EditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/txtName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:animateLayoutChanges="true"
android:ems="10"
android:gravity="start"
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:textAlignment="textStart"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textColor="?attr/colorText"
android:textCursorDrawable="@null"
android:textSize="14sp"
android:theme="@style/EditTextTheme" />
android:textSize="14sp"/>
</com.google.android.material.textfield.TextInputLayout>
@@ -215,6 +210,8 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/txtLayoutClasses"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:boxStrokeColor="?attr/colorAccent"
app:boxStrokeWidth="2dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@@ -227,24 +224,18 @@
app:layout_constraintTop_toBottomOf="@+id/txtFilter"
android:importantForAutofill="no">
<EditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/txtClasses"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:animateLayoutChanges="true"
android:ems="10"
android:gravity="start"
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:textAlignment="textStart"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textColor="?attr/colorText"
android:textSize="14sp"
android:theme="@style/EditTextTheme" />
android:textSize="14sp"/>
</com.google.android.material.textfield.TextInputLayout>
@@ -265,34 +256,29 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:hint="@string/courses"
android:importantForAutofill="no"
android:textColorHint="?attr/colorHint"
app:boxStrokeColor="?attr/colorAccent"
app:boxStrokeWidth="2dp"
app:layout_constraintEnd_toStartOf="@+id/chipHelpCourses"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtLayoutClasses"
android:importantForAutofill="no">
app:layout_constraintStart_toStartOf="@+id/txtLayoutClasses"
app:layout_constraintTop_toBottomOf="@+id/txtLayoutClasses">
<EditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/txtCourses"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:animateLayoutChanges="true"
android:ems="10"
android:gravity="start"
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:textAlignment="textStart"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textColor="?attr/colorText"
android:textSize="14sp"
android:theme="@style/EditTextTheme" />
android:textSize="14sp" />
</com.google.android.material.textfield.TextInputLayout>
+43 -16
View File
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
@@ -40,16 +42,28 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<EditText
android:id="@+id/dating_txt1"
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:boxStrokeColor="@color/datingPink"
app:boxStrokeWidth="2dp"
android:layout_width="0px"
android:layout_weight="7"
android:backgroundTint="?attr/colorText"
android:layout_height="wrap_content"
android:hint="@string/boy"
android:inputType="textNoSuggestions"
android:layout_marginTop="2dp"
android:layout_marginBottom="2dp"
android:textColorHint="?attr/colorHint"
android:textColor="?attr/colorText"/>
android:hint="@string/boy"
android:importantForAutofill="no">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/dating_txt1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textNoSuggestions"
android:textColor="?attr/colorText"
android:singleLine="true"/>
</com.google.android.material.textfield.TextInputLayout>
<CheckBox
android:id="@+id/cb1"
@@ -66,16 +80,28 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<EditText
android:id="@+id/dating_txt2"
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:boxStrokeColor="@color/datingPink"
app:boxStrokeWidth="2dp"
android:layout_width="0px"
android:layout_weight="7"
android:backgroundTint="?attr/colorText"
android:layout_height="wrap_content"
android:hint="@string/girl"
android:inputType="textNoSuggestions"
android:layout_marginTop="2dp"
android:layout_marginBottom="2dp"
android:textColorHint="?attr/colorHint"
android:textColor="?attr/colorText"/>
android:hint="@string/girl"
android:importantForAutofill="no">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/dating_txt2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textNoSuggestions"
android:textColor="?attr/colorText"
android:singleLine="true"/>
</com.google.android.material.textfield.TextInputLayout>
<CheckBox
android:id="@+id/cb2"
@@ -97,10 +123,11 @@
android:layout_width="0px"
android:layout_weight="5"
android:layout_height="wrap_content"
android:backgroundTint="@color/datingPink"
android:text="@string/calculate"
android:textColor="@color/white"
android:layout_gravity="start|center_vertical"/>
android:textColor="@color/datingPink"
app:strokeColor="@color/datingPink"
android:layout_gravity="start|center_vertical"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"/>
<TextView
android:id="@+id/dating_txtp"
+15 -9
View File
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
@@ -36,22 +38,26 @@
<Button
android:id="@+id/btnResetLaunch"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="@color/accent"
android:textColor="@color/white"
android:textColor="?attr/colorAccent"
app:strokeColor="?attr/colorAccent"
android:layout_marginStart="24dp"
android:text="Reset launch counter"/>
android:layout_marginEnd="24dp"
android:text="Reset launch counter"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"/>
<Button
android:id="@+id/btnResetNotif"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="@color/accent"
android:textColor="@color/white"
android:textColor="?attr/colorAccent"
app:strokeColor="?attr/colorAccent"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="16dp"
android:text="Reset notification counter"/>
android:text="Reset notification counter"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"/>
</LinearLayout>
+27 -7
View File
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
@@ -34,19 +36,37 @@
android:layout_width="wrap_content"
android:textColor="?attr/colorText"/>
<EditText
android:id="@+id/dialog_edittext"
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:boxStrokeColor="?attr/colorAccent"
app:boxStrokeWidth="2dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/colorText"/>
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:textColorHint="?attr/colorHint"
android:importantForAutofill="no">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/dialog_edittext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/colorText"
android:ems="10"
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
android:singleLine="true"/>
</com.google.android.material.textfield.TextInputLayout>
<Button
android:id="@+id/dialog_button"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="?attr/colorAccent"
android:textColor="?attr/colorAccent"
android:text="@string/positivebutton"
android:textColor="@color/white"/>
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
app:strokeColor="?attr/colorAccent"/>
</LinearLayout>
+2 -3
View File
@@ -19,8 +19,7 @@
android:id="@+id/linear_food"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layoutAnimation="@anim/layout_animation_fall_down">
</androidx.recyclerview.widget.RecyclerView>
android:layoutAnimation="@anim/layout_animation_fall_down"
android:scrollbars="vertical"/>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+2 -1
View File
@@ -53,7 +53,8 @@
android:id="@+id/linearRecycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layoutAnimation="@anim/layout_animation_fall_down"/>
android:layoutAnimation="@anim/layout_animation_fall_down"
android:scrollbars="vertical"/>
</LinearLayout>
+1 -1
View File
@@ -27,7 +27,7 @@
android:theme="@style/EditTextTheme"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"/>
<androidx.core.widget.NestedScrollView
android:layout_width="0dp"
-5
View File
@@ -11,11 +11,6 @@
android:icon="@drawable/ic_idea"
android:title="@string/personal"
android:enabled="true"/>
<!--<item-->
<!--android:id="@+id/search"-->
<!--android:icon="@drawable/ic_magnifying_glass"-->
<!--android:title="@string/search"-->
<!--android:enabled="true"/>-->
<item
android:id="@+id/menu"
android:icon="@drawable/ic_tomato"
+15 -5
View File
@@ -1,17 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="background">#1B1B1B</color>
<resources xmlns:tools="http://schemas.android.com/tools">
<color name="background">#121212</color>
<color name="colorChipLight">#e0e0e0</color>
<color name="colorChipDark">#424242</color>
<color name="white">#FFFFFF</color>
<color name="black">#000000</color>
<color name="accent">#448aff</color>
<color name="dark">#1B1B1B</color>
<color name="lessdark">#212121</color>
<color name="lightgrey">#e0e0e0</color>
<color name="accentPastel">#64b5f6</color>
<color name="dark">#121212</color>
<color name="lessdark">#1E1E1E</color>
<color name="lightgrey">#bdbdbd</color>
<color name="textDark">#212121</color>
<color name="textLight">#e0e0e0</color>
<color name="darkdivider">#313131</color>
<color name="darkwhite">#eeeeee</color>
<color name="lightwhite">#f5f5f5</color>
<color name="datingPink">#d81b60</color>
<color name="hint">#9e9e9e</color>
@@ -41,5 +49,7 @@
<color name="neonyellow">#FFEA00</color>
<color name="neonorange">#FF3D00</color>
<color name="mtrl_textinput_default_box_stroke_color" tools:override="true">#757575</color>
</resources>
-11
View File
@@ -147,15 +147,4 @@
<string name="showinfo">Show info tab in navigation bar</string>
<string name="swipeindependent">Independent of swipe gesture</string>
<!--<string name="avhblue">AvH-Blue</string>-->
<!--<string name="rosered">AvH-Blue</string>-->
<!--<string name="sunsetorange">AvH-Blue</string>-->
<!--<string name="datingsimpink">AvH-Blue</string>-->
<!--<string name="deepviolet">AvH-Blue</string>-->
<!--<string name="lessdeepviolet">AvH-Blue</string>-->
<!--<string name="mathematicalblue">AvH-Blue</string>-->
<!--<string name="forestgreen">AvH-Blue</string>-->
<!--<string name="grassgreen">AvH-Blue</string>-->
</resources>
+10 -292
View File
@@ -1,16 +1,5 @@
<resources>
<!--// 0 avh blue: default-->
<!--// 1 rose red: #c62828-->
<!--// 2 dating sim pink: #d81b60-->
<!--// 3 deep violet: #4a148c-->
<!--// 4 less deep violet: #673ab7-->
<!--// 5 mathematical blue: #303f9f-->
<!--// 6 water blue: #1976d2-->
<!--// 7 forest green: #00695c-->
<!--// 8 grass green: #2e7d32-->
<!--// 9 sunset orange: #bf360c-->
<style name="SelectableItemTheme">
<item name="colorControlHighlight">#448aff</item>
</style>
@@ -24,8 +13,8 @@
<item name="colorPrimary">#448aff</item>
<item name="colorPrimaryDark">#FFFFFF</item>
<item name="colorAccent">#448aff</item>
<item name="colorBackground">#FFFFFF</item>
<item name="colorBackgroundCard">#FFFFFF</item>
<item name="colorBackground">#eeeeee</item>
<item name="colorBackgroundCard">#f5f5f5</item>
<item name="colorText">#212121</item>
<item name="colorHintLight">#212121</item>
<item name="colorHint">#9e9e9e</item>
@@ -37,302 +26,31 @@
</style>
<style name="AppTheme0Dark" parent="Theme.MaterialComponents.Light.DarkActionBar">
<item name="colorPrimary">#448aff</item>
<item name="colorPrimaryDark">#1B1B1B</item>
<item name="colorAccent">#448aff</item>
<item name="colorBackground">#1B1B1B</item>
<item name="colorBackgroundCard">#212121</item>
<item name="colorPrimary">#64b5f6</item>
<item name="colorPrimaryDark">#121212</item>
<item name="colorAccent">#64b5f6</item>
<item name="colorBackground">#121212</item>
<item name="colorBackgroundCard">#1E1E1E</item>
<item name="colorText">#e0e0e0</item>
<item name="colorHintLight">#e0e0e0</item>
<item name="colorHint">#9e9e9e</item>
<item name="colorHintDark">#757575</item>
<item name="android:fontFamily">@font/manrope_medium</item>
<item name="referenceTextColor">?attr/colorHint</item>
<item name="colorChip">#212121</item>
<item name="colorChip">#1E1E1E</item>
<item name="android:colorEdgeEffect">#9e9e9e</item>
</style>
<style name="AlertDialogCustomLight" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="android:background">#FFFFFF</item>
<item name="android:background">#eeeeee</item>
<item name="android:textColorPrimary">#212121</item>
</style>
<style name="AlertDialogCustomDark" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="android:background">#1B1B1B</item>
<item name="android:background">#121212</item>
<item name="android:textColorPrimary">#e0e0e0</item>
</style>
<!--<style name="AppTheme1" parent="Theme.MaterialComponents.Light.DarkActionBar">-->
<!--<item name="colorPrimary">#c62828</item>-->
<!--<item name="colorPrimaryDark">#c62828</item>-->
<!--<item name="colorAccent">#c62828</item>-->
<!--<item name="colorBackground">#FFFFFF</item>-->
<!--<item name="colorBackgroundCard">#FFFFFF</item>-->
<!--<item name="colorText">#212121</item>-->
<!--<item name="colorHintLight">#212121</item>-->
<!--<item name="colorHint">#9e9e9e</item>-->
<!--<item name="android:fontFamily">@font/manrope_medium</item>-->
<!--<item name="referenceTextColor">?attr/colorHint</item>-->
<!--<item name="selector">@color/bottom_nav_color_avhblue</item>-->
<!--</style>-->
<!--<style name="AppTheme1Dark" parent="Theme.MaterialComponents.Light.DarkActionBar">-->
<!--<item name="colorPrimary">#c62828</item>-->
<!--<item name="colorPrimaryDark">#c62828</item>-->
<!--<item name="colorAccent">#c62828</item>-->
<!--<item name="colorBackground">#1B1B1B</item>-->
<!--<item name="colorBackgroundCard">#1B1B1B</item>-->
<!--<item name="colorText">#e0e0e0</item>-->
<!--<item name="colorHintLight">#e0e0e0</item>-->
<!--<item name="colorHint">#9e9e9e</item>-->
<!--<item name="android:fontFamily">@font/manrope_medium</item>-->
<!--<item name="referenceTextColor">?attr/colorHint</item>-->
<!--</style>-->
<!--<style name="AppTheme2" parent="Theme.MaterialComponents.Light.DarkActionBar">-->
<!--<item name="colorPrimary">#d81b60</item>-->
<!--<item name="colorPrimaryDark">#d81b60</item>-->
<!--<item name="colorAccent">#d81b60</item>-->
<!--<item name="colorBackground">#FFFFFF</item>-->
<!--<item name="colorBackgroundCard">#FFFFFF</item>-->
<!--<item name="colorText">#212121</item>-->
<!--<item name="colorHintLight">#212121</item>-->
<!--<item name="colorHint">#9e9e9e</item>-->
<!--<item name="android:fontFamily">@font/manrope_medium</item>-->
<!--<item name="referenceTextColor">?attr/colorHint</item>-->
<!--</style>-->
<!--<style name="AppTheme2Dark" parent="Theme.MaterialComponents.Light.DarkActionBar">-->
<!--<item name="colorPrimary">#d81b60</item>-->
<!--<item name="colorPrimaryDark">#d81b60</item>-->
<!--<item name="colorAccent">#d81b60</item>-->
<!--<item name="colorBackground">#1B1B1B</item>-->
<!--<item name="colorBackgroundCard">#1B1B1B</item>-->
<!--<item name="colorText">#e0e0e0</item>-->
<!--<item name="colorHintLight">#e0e0e0</item>-->
<!--<item name="colorHint">#9e9e9e</item>-->
<!--<item name="android:fontFamily">@font/manrope_medium</item>-->
<!--<item name="referenceTextColor">?attr/colorHint</item>-->
<!--</style>-->
<!--<style name="AppTheme3" parent="Theme.MaterialComponents.Light.DarkActionBar">-->
<!--<item name="colorPrimary">#4a148c</item>-->
<!--<item name="colorPrimaryDark">#4a148c</item>-->
<!--<item name="colorAccent">#4a148c</item>-->
<!--<item name="colorBackground">#FFFFFF</item>-->
<!--<item name="colorBackgroundCard">#FFFFFF</item>-->
<!--<item name="colorText">#212121</item>-->
<!--<item name="colorHintLight">#212121</item>-->
<!--<item name="colorHint">#9e9e9e</item>-->
<!--<item name="android:fontFamily">@font/manrope_medium</item>-->
<!--<item name="referenceTextColor">?attr/colorHint</item>-->
<!--</style>-->
<!--<style name="AppTheme3Dark" parent="Theme.MaterialComponents.Light.DarkActionBar">-->
<!--<item name="colorPrimary">#4a148c</item>-->
<!--<item name="colorPrimaryDark">#4a148c</item>-->
<!--<item name="colorAccent">#4a148c</item>-->
<!--<item name="colorBackground">#1B1B1B</item>-->
<!--<item name="colorBackgroundCard">#1B1B1B</item>-->
<!--<item name="colorText">#e0e0e0</item>-->
<!--<item name="colorHintLight">#e0e0e0</item>-->
<!--<item name="colorHint">#9e9e9e</item>-->
<!--<item name="android:fontFamily">@font/manrope_medium</item>-->
<!--<item name="referenceTextColor">?attr/colorHint</item>-->
<!--</style>-->
<!--<style name="AppTheme4" parent="Theme.MaterialComponents.Light.DarkActionBar">-->
<!--<item name="colorPrimary">#673ab7</item>-->
<!--<item name="colorPrimaryDark">#673ab7</item>-->
<!--<item name="colorAccent">#673ab7</item>-->
<!--<item name="colorBackground">#FFFFFF</item>-->
<!--<item name="colorBackgroundCard">#FFFFFF</item>-->
<!--<item name="colorText">#212121</item>-->
<!--<item name="colorHintLight">#212121</item>-->
<!--<item name="colorHint">#9e9e9e</item>-->
<!--<item name="android:fontFamily">@font/manrope_medium</item>-->
<!--<item name="referenceTextColor">?attr/colorHint</item>-->
<!--</style>-->
<!--<style name="AppTheme4Dark" parent="Theme.MaterialComponents.Light.DarkActionBar">-->
<!--<item name="colorPrimary">#673ab7</item>-->
<!--<item name="colorPrimaryDark">#673ab7</item>-->
<!--<item name="colorAccent">#673ab7</item>-->
<!--<item name="colorBackground">#1B1B1B</item>-->
<!--<item name="colorBackgroundCard">#1B1B1B</item>-->
<!--<item name="colorText">#e0e0e0</item>-->
<!--<item name="colorHintLight">#e0e0e0</item>-->
<!--<item name="colorHint">#9e9e9e</item>-->
<!--<item name="android:fontFamily">@font/manrope_medium</item>-->
<!--<item name="referenceTextColor">?attr/colorHint</item>-->
<!--</style>-->
<!--<style name="AppTheme5" parent="Theme.MaterialComponents.Light.DarkActionBar">-->
<!--<item name="colorPrimary">#303f9f</item>-->
<!--<item name="colorPrimaryDark">#303f9f</item>-->
<!--<item name="colorAccent">#303f9f</item>-->
<!--<item name="colorBackground">#FFFFFF</item>-->
<!--<item name="colorBackgroundCard">#FFFFFF</item>-->
<!--<item name="colorText">#212121</item>-->
<!--<item name="colorHintLight">#212121</item>-->
<!--<item name="colorHint">#9e9e9e</item>-->
<!--<item name="android:fontFamily">@font/manrope_medium</item>-->
<!--<item name="referenceTextColor">?attr/colorHint</item>-->
<!--</style>-->
<!--<style name="AppTheme5Dark" parent="Theme.MaterialComponents.Light.DarkActionBar">-->
<!--<item name="colorPrimary">#303f9f</item>-->
<!--<item name="colorPrimaryDark">#303f9f</item>-->
<!--<item name="colorAccent">#303f9f</item>-->
<!--<item name="colorBackground">#1B1B1B</item>-->
<!--<item name="colorBackgroundCard">#1B1B1B</item>-->
<!--<item name="colorText">#e0e0e0</item>-->
<!--<item name="colorHintLight">#e0e0e0</item>-->
<!--<item name="colorHint">#9e9e9e</item>-->
<!--<item name="android:fontFamily">@font/manrope_medium</item>-->
<!--<item name="referenceTextColor">?attr/colorHint</item>-->
<!--</style>-->
<!--<style name="AppTheme6" parent="Theme.MaterialComponents.Light.DarkActionBar">-->
<!--<item name="colorPrimary">#1976d2</item>-->
<!--<item name="colorPrimaryDark">#1976d2</item>-->
<!--<item name="colorAccent">#1976d2</item>-->
<!--<item name="colorBackground">#FFFFFF</item>-->
<!--<item name="colorBackgroundCard">#FFFFFF</item>-->
<!--<item name="colorText">#212121</item>-->
<!--<item name="colorHintLight">#212121</item>-->
<!--<item name="colorHint">#9e9e9e</item>-->
<!--<item name="android:fontFamily">@font/manrope_medium</item>-->
<!--<item name="referenceTextColor">?attr/colorHint</item>-->
<!--</style>-->
<!--<style name="AppTheme6Dark" parent="Theme.MaterialComponents.Light.DarkActionBar">-->
<!--<item name="colorPrimary">#1976d2</item>-->
<!--<item name="colorPrimaryDark">#1976d2</item>-->
<!--<item name="colorAccent">#1976d2</item>-->
<!--<item name="colorBackground">#1B1B1B</item>-->
<!--<item name="colorBackgroundCard">#1B1B1B</item>-->
<!--<item name="colorText">#e0e0e0</item>-->
<!--<item name="colorHintLight">#e0e0e0</item>-->
<!--<item name="colorHint">#9e9e9e</item>-->
<!--<item name="android:fontFamily">@font/manrope_medium</item>-->
<!--<item name="referenceTextColor">?attr/colorHint</item>-->
<!--</style>-->
<!--<style name="AppTheme7" parent="Theme.MaterialComponents.Light.DarkActionBar">-->
<!--<item name="colorPrimary">#00695c</item>-->
<!--<item name="colorPrimaryDark">#00695c</item>-->
<!--<item name="colorAccent">#00695c</item>-->
<!--<item name="colorBackground">#FFFFFF</item>-->
<!--<item name="colorBackgroundCard">#FFFFFF</item>-->
<!--<item name="colorText">#212121</item>-->
<!--<item name="colorHintLight">#212121</item>-->
<!--<item name="colorHint">#9e9e9e</item>-->
<!--<item name="android:fontFamily">@font/manrope_medium</item>-->
<!--<item name="referenceTextColor">?attr/colorHint</item>-->
<!--</style>-->
<!--<style name="AppTheme7Dark" parent="Theme.MaterialComponents.Light.DarkActionBar">-->
<!--<item name="colorPrimary">#00695c</item>-->
<!--<item name="colorPrimaryDark">#00695c</item>-->
<!--<item name="colorAccent">#00695c</item>-->
<!--<item name="colorBackground">#1B1B1B</item>-->
<!--<item name="colorBackgroundCard">#1B1B1B</item>-->
<!--<item name="colorText">#e0e0e0</item>-->
<!--<item name="colorHintLight">#e0e0e0</item>-->
<!--<item name="colorHint">#9e9e9e</item>-->
<!--<item name="android:fontFamily">@font/manrope_medium</item>-->
<!--<item name="referenceTextColor">?attr/colorHint</item>-->
<!--</style>-->
<!--<style name="AppTheme8" parent="Theme.MaterialComponents.Light.DarkActionBar">-->
<!--<item name="colorPrimary">#2e7d32</item>-->
<!--<item name="colorPrimaryDark">#2e7d32</item>-->
<!--<item name="colorAccent">#2e7d32</item>-->
<!--<item name="colorBackground">#FFFFFF</item>-->
<!--<item name="colorBackgroundCard">#FFFFFF</item>-->
<!--<item name="colorText">#212121</item>-->
<!--<item name="colorHintLight">#212121</item>-->
<!--<item name="colorHint">#9e9e9e</item>-->
<!--<item name="android:fontFamily">@font/manrope_medium</item>-->
<!--<item name="referenceTextColor">?attr/colorHint</item>-->
<!--</style>-->
<!--<style name="AppTheme8Dark" parent="Theme.MaterialComponents.Light.DarkActionBar">-->
<!--<item name="colorPrimary">#2e7d32</item>-->
<!--<item name="colorPrimaryDark">#2e7d32</item>-->
<!--<item name="colorAccent">#2e7d32</item>-->
<!--<item name="colorBackground">#1B1B1B</item>-->
<!--<item name="colorBackgroundCard">#1B1B1B</item>-->
<!--<item name="colorText">#e0e0e0</item>-->
<!--<item name="colorHintLight">#e0e0e0</item>-->
<!--<item name="colorHint">#9e9e9e</item>-->
<!--<item name="android:fontFamily">@font/manrope_medium</item>-->
<!--<item name="referenceTextColor">?attr/colorHint</item>-->
<!--</style>-->
<!--<style name="AppTheme9" parent="Theme.MaterialComponents.Light.DarkActionBar">-->
<!--<item name="colorPrimary">#bf360c</item>-->
<!--<item name="colorPrimaryDark">#bf360c</item>-->
<!--<item name="colorAccent">#bf360c</item>-->
<!--<item name="colorBackground">#FFFFFF</item>-->
<!--<item name="colorBackgroundCard">#FFFFFF</item>-->
<!--<item name="colorText">#212121</item>-->
<!--<item name="colorHintLight">#212121</item>-->
<!--<item name="colorHint">#9e9e9e</item>-->
<!--<item name="android:fontFamily">@font/manrope_medium</item>-->
<!--<item name="referenceTextColor">?attr/colorHint</item>-->
<!--</style>-->
<!--<style name="AppTheme9Dark" parent="Theme.MaterialComponents.Light.DarkActionBar">-->
<!--<item name="colorPrimary">#bf360c</item>-->
<!--<item name="colorPrimaryDark">#bf360c</item>-->
<!--<item name="colorAccent">#bf360c</item>-->
<!--<item name="colorBackground">#1B1B1B</item>-->
<!--<item name="colorBackgroundCard">#1B1B1B</item>-->
<!--<item name="colorText">#e0e0e0</item>-->
<!--<item name="colorHintLight">#e0e0e0</item>-->
<!--<item name="colorHint">#9e9e9e</item>-->
<!--<item name="android:fontFamily">@font/manrope_medium</item>-->
<!--<item name="referenceTextColor">?attr/colorHint</item>-->
<!--</style>-->
<!--<style name="AppTheme10" parent="Theme.MaterialComponents.Light.DarkActionBar">-->
<!--<item name="colorPrimary">#1B1B1B</item>-->
<!--<item name="colorPrimaryDark">#1B1B1B</item>-->
<!--<item name="colorAccent">#1B1B1B</item>-->
<!--<item name="colorBackground">#FFFFFF</item>-->
<!--<item name="colorBackgroundCard">#FFFFFF</item>-->
<!--<item name="colorText">#212121</item>-->
<!--<item name="colorHintLight">#212121</item>-->
<!--<item name="colorHint">#9e9e9e</item>-->
<!--<item name="android:fontFamily">@font/manrope_medium</item>-->
<!--<item name="referenceTextColor">?attr/colorHint</item>-->
<!--</style>-->
<!--<style name="AppTheme10Dark" parent="Theme.MaterialComponents.Light.DarkActionBar">-->
<!--<item name="colorPrimary">#1B1B1B</item>-->
<!--<item name="colorPrimaryDark">#1B1B1B</item>-->
<!--<item name="colorAccent">#1B1B1B</item>-->
<!--<item name="colorBackground">#1B1B1B</item>-->
<!--<item name="colorBackgroundCard">#1B1B1B</item>-->
<!--<item name="colorText">#e0e0e0</item>-->
<!--<item name="colorHintLight">#e0e0e0</item>-->
<!--<item name="colorHint">#9e9e9e</item>-->
<!--<item name="android:fontFamily">@font/manrope_medium</item>-->
<!--<item name="referenceTextColor">?attr/colorHint</item>-->
<!--</style>-->
<!--<style name="AppThemeLight.NoActionBar">-->
<!--<item name="windowActionBar">false</item>-->
<!--<item name="windowNoTitle">true</item>-->
<!--</style>-->
<!--<style name="AppThemeDark.NoActionBar">-->
<!--<item name="windowActionBar">false</item>-->
<!--<item name="windowNoTitle">true</item>-->
<!--</style>-->
<style name="AppThemeLight.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="colorControlNormal">#000000</item>
</style>