From c3f0ecbf7d4f3ab9e1e29cc1517e0f824050f4dc Mon Sep 17 00:00:00 2001
From: m23pfeff <melvil.pfeffer@imt-atlantique.net>
Date: Wed, 11 Dec 2024 14:50:15 +0100
Subject: [PATCH] changes for night theme
---
.../main/res/drawable/shape_transparent.xml | 2 +-
.../res/drawable/shape_transparent_black.xml | 19 +++
...shape_transparent_black_bottom_rounded.xml | 15 +++
.../shape_transparent_black_top_rounded.xml | 20 ++++
.../shape_transparent_bottom_rounded.xml | 20 ++++
.../shape_transparent_top_rounded.xml | 20 ++++
.../res/layout/fragment_learning_page.xml | 112 +++---------------
.../res/layout/fragment_settings_page.xml | 45 ++-----
.../main/res/layout/fragment_stats_page.xml | 1 -
app/src/main/res/values-night/themes.xml | 24 +++-
app/src/main/res/values/themes.xml | 20 +++-
11 files changed, 164 insertions(+), 134 deletions(-)
create mode 100644 app/src/main/res/drawable/shape_transparent_black.xml
create mode 100644 app/src/main/res/drawable/shape_transparent_black_bottom_rounded.xml
create mode 100644 app/src/main/res/drawable/shape_transparent_black_top_rounded.xml
create mode 100644 app/src/main/res/drawable/shape_transparent_bottom_rounded.xml
create mode 100644 app/src/main/res/drawable/shape_transparent_top_rounded.xml
diff --git a/app/src/main/res/drawable/shape_transparent.xml b/app/src/main/res/drawable/shape_transparent.xml
index 971ef4d..e867f3d 100644
--- a/app/src/main/res/drawable/shape_transparent.xml
+++ b/app/src/main/res/drawable/shape_transparent.xml
@@ -3,7 +3,7 @@
android:shape="rectangle" >
<solid
- android:color="#99FFFFFF">
+ android:color="#F0D9D9D9">
</solid>
<padding
diff --git a/app/src/main/res/drawable/shape_transparent_black.xml b/app/src/main/res/drawable/shape_transparent_black.xml
new file mode 100644
index 0000000..d6891cb
--- /dev/null
+++ b/app/src/main/res/drawable/shape_transparent_black.xml
@@ -0,0 +1,19 @@
+<shape
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+
+ <solid
+ android:color="#F0121212">
+ </solid>
+
+ <padding
+ android:left="5dp"
+ android:top="5dp"
+ android:right="5dp"
+ android:bottom="5dp" >
+ </padding>
+
+ <corners
+ android:radius="8dp">
+ </corners>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_transparent_black_bottom_rounded.xml b/app/src/main/res/drawable/shape_transparent_black_bottom_rounded.xml
new file mode 100644
index 0000000..bb3763d
--- /dev/null
+++ b/app/src/main/res/drawable/shape_transparent_black_bottom_rounded.xml
@@ -0,0 +1,15 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+
+ <solid android:color="#F0121212"/>
+
+ <padding
+ android:bottom="5dp"
+ android:left="5dp"
+ android:right="5dp"
+ android:top="5dp"/>
+
+ <corners
+ android:bottomLeftRadius="8dp"
+ android:bottomRightRadius="8dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_transparent_black_top_rounded.xml b/app/src/main/res/drawable/shape_transparent_black_top_rounded.xml
new file mode 100644
index 0000000..5c2ee23
--- /dev/null
+++ b/app/src/main/res/drawable/shape_transparent_black_top_rounded.xml
@@ -0,0 +1,20 @@
+<shape
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+
+ <solid
+ android:color="#F0121212">
+ </solid>
+
+ <padding
+ android:left="5dp"
+ android:top="5dp"
+ android:right="5dp"
+ android:bottom="5dp" >
+ </padding>
+
+ <corners
+ android:topLeftRadius="8dp"
+ android:topRightRadius="8dp">
+ </corners>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_transparent_bottom_rounded.xml b/app/src/main/res/drawable/shape_transparent_bottom_rounded.xml
new file mode 100644
index 0000000..c2ffc78
--- /dev/null
+++ b/app/src/main/res/drawable/shape_transparent_bottom_rounded.xml
@@ -0,0 +1,20 @@
+<shape
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+
+ <solid
+ android:color="#F0D9D9D9">
+ </solid>
+
+ <padding
+ android:left="5dp"
+ android:top="5dp"
+ android:right="5dp"
+ android:bottom="5dp" >
+ </padding>
+
+ <corners
+ android:bottomLeftRadius="8dp"
+ android:bottomRightRadius="8dp">
+ </corners>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_transparent_top_rounded.xml b/app/src/main/res/drawable/shape_transparent_top_rounded.xml
new file mode 100644
index 0000000..fb12f2d
--- /dev/null
+++ b/app/src/main/res/drawable/shape_transparent_top_rounded.xml
@@ -0,0 +1,20 @@
+<shape
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+
+ <solid
+ android:color="#F0D9D9D9">
+ </solid>
+
+ <padding
+ android:left="5dp"
+ android:top="5dp"
+ android:right="5dp"
+ android:bottom="5dp" >
+ </padding>
+
+ <corners
+ android:topLeftRadius="8dp"
+ android:topRightRadius="8dp">
+ </corners>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_learning_page.xml b/app/src/main/res/layout/fragment_learning_page.xml
index 9fa5522..db72feb 100644
--- a/app/src/main/res/layout/fragment_learning_page.xml
+++ b/app/src/main/res/layout/fragment_learning_page.xml
@@ -47,21 +47,11 @@
<TextView
android:id="@+id/becasseau"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
+ style="@style/TopAppearance"
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:layout_marginBottom="10dp"
- android:background="@drawable/shape_1"
- android:gravity="center|start"
- android:paddingStart="12dp"
- android:paddingTop="10dp"
- android:paddingEnd="10dp"
- android:paddingBottom="10dp"
- android:text="@string/becasseau"
- android:textColor="#000000"
- android:textSize="18sp" />
+ android:text="@string/becasseau" />
<LinearLayout
android:layout_width="match_parent"
@@ -97,21 +87,11 @@
<TextView
android:id="@+id/bernache"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
+ style="@style/TopAppearance"
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:layout_marginBottom="10dp"
- android:background="@drawable/shape_1"
- android:gravity="center|start"
- android:paddingStart="12dp"
- android:paddingTop="10dp"
- android:paddingEnd="10dp"
- android:paddingBottom="10dp"
- android:text="@string/bernache"
- android:textColor="#000000"
- android:textSize="18sp" />
+ android:text="@string/bernache" />
<LinearLayout
android:layout_width="match_parent"
@@ -150,21 +130,11 @@
<TextView
android:id="@+id/goeland"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
+ style="@style/TopAppearance"
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:layout_marginBottom="10dp"
- android:background="@drawable/shape_1"
- android:gravity="center|start"
- android:paddingStart="12dp"
- android:paddingTop="10dp"
- android:paddingEnd="10dp"
- android:paddingBottom="10dp"
- android:text="@string/goeland"
- android:textColor="#000000"
- android:textSize="18sp" />
+ android:text="@string/goeland" />
<LinearLayout
android:layout_width="match_parent"
@@ -203,21 +173,11 @@
<TextView
android:id="@+id/mouette"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
+ style="@style/TopAppearance"
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:layout_marginBottom="10dp"
- android:background="@drawable/shape_1"
- android:gravity="center|start"
- android:paddingStart="12dp"
- android:paddingTop="10dp"
- android:paddingEnd="10dp"
- android:paddingBottom="10dp"
- android:text="@string/mouette"
- android:textColor="#000000"
- android:textSize="18sp" />
+ android:text="@string/mouette" />
<LinearLayout
android:layout_width="match_parent"
@@ -309,21 +269,11 @@
<TextView
android:id="@+id/cormoran"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
+ style="@style/TopAppearance"
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:layout_marginBottom="10dp"
- android:background="@drawable/shape_1"
- android:gravity="center|start"
- android:paddingStart="12dp"
- android:paddingTop="10dp"
- android:paddingEnd="10dp"
- android:paddingBottom="10dp"
- android:text="@string/grand_cormoran"
- android:textColor="#000000"
- android:textSize="18sp" />
+ android:text="@string/grand_cormoran" />
<LinearLayout
android:layout_width="match_parent"
@@ -362,21 +312,11 @@
<TextView
android:id="@+id/foulque"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
+ style="@style/TopAppearance"
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:layout_marginBottom="10dp"
- android:background="@drawable/shape_1"
- android:gravity="center|start"
- android:paddingStart="12dp"
- android:paddingTop="10dp"
- android:paddingEnd="10dp"
- android:paddingBottom="10dp"
- android:text="@string/foulque_macroule"
- android:textColor="#000000"
- android:textSize="18sp" />
+ android:text="@string/foulque_macroule"/>
<LinearLayout
android:layout_width="match_parent"
@@ -415,21 +355,11 @@
<TextView
android:id="@+id/tadorne"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
+ style="@style/TopAppearance"
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:layout_marginBottom="10dp"
- android:background="@drawable/shape_1"
- android:gravity="center|start"
- android:paddingStart="12dp"
- android:paddingTop="10dp"
- android:paddingEnd="10dp"
- android:paddingBottom="10dp"
- android:text="@string/tadorne_de_belon"
- android:textColor="#000000"
- android:textSize="18sp" />
+ android:text="@string/tadorne_de_belon" />
<LinearLayout
android:layout_width="match_parent"
@@ -468,21 +398,11 @@
<TextView
android:id="@+id/chevalier"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
+ style="@style/TopAppearance"
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:layout_marginBottom="10dp"
- android:background="@drawable/shape_1"
- android:gravity="center|start"
- android:paddingStart="12dp"
- android:paddingTop="10dp"
- android:paddingEnd="10dp"
- android:paddingBottom="10dp"
- android:text="@string/chevalier_gambette"
- android:textColor="#000000"
- android:textSize="18sp" />
+ android:text="@string/chevalier_gambette" />
<LinearLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_settings_page.xml b/app/src/main/res/layout/fragment_settings_page.xml
index 486e32d..a04a161 100644
--- a/app/src/main/res/layout/fragment_settings_page.xml
+++ b/app/src/main/res/layout/fragment_settings_page.xml
@@ -29,14 +29,15 @@
android:layout_height="wrap_content"
android:orientation="vertical">
- <Button
- style="@style/ButtonAppearance"
+ <TextView
+ android:paddingBottom="7dp"
+ android:paddingTop="7dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:layout_marginBottom="33dp"
- android:backgroundTint="@color/white"
+ android:background="@drawable/shape_transparent"
android:fontFamily="@font/inter"
android:text="@string/settings_gen"
android:textAlignment="center"
@@ -46,17 +47,11 @@
app:iconGravity="textStart" />
<TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ style="@style/TopAppearance"
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:layout_marginBottom="8dp"
- android:background="@drawable/shape_1"
- android:fontFamily="@font/inter"
- android:gravity="center"
- android:text="@string/mode"
- android:textAlignment="center"
- android:textSize="16sp" />
+ android:text="@string/mode" />
<FrameLayout
android:layout_width="match_parent"
@@ -74,7 +69,6 @@
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_marginBottom="15dp"
- android:backgroundTint="#517293"
android:text="@string/mode_sombre"
app:icon="@drawable/moon"
app:iconGravity="textStart"/>
@@ -86,17 +80,11 @@
<TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ style="@style/TopAppearance"
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:layout_marginBottom="8dp"
- android:background="@drawable/shape_1"
- android:fontFamily="@font/inter"
- android:gravity="center"
- android:text="@string/tutorial"
- android:textAlignment="center"
- android:textSize="16sp" />
+ android:text="@string/tutorial"/>
<FrameLayout
android:layout_width="match_parent"
@@ -114,7 +102,6 @@
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_marginBottom="15dp"
- android:backgroundTint="#517293"
android:text="@string/download"
app:icon="@drawable/folder"
app:iconGravity="textStart"/>
@@ -124,34 +111,26 @@
android:layout_height="wrap_content"/>
</FrameLayout>
- <Button
- style="@style/ButtonAppearance"
+ <TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:layout_marginBottom="33dp"
- android:backgroundTint="@color/white"
+ android:background="@drawable/shape"
android:fontFamily="@font/inter"
android:text="@string/settings_conf"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="16sp"
- app:icon="@drawable/folder"
app:iconGravity="textStart" />
<TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ style="@style/TopAppearance"
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:layout_marginBottom="8dp"
- android:background="@drawable/shape_1"
- android:fontFamily="@font/inter"
- android:gravity="center"
- android:text="@string/personal_data"
- android:textAlignment="center"
- android:textSize="16sp" />
+ android:text="@string/personal_data"/>
<TextView
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_stats_page.xml b/app/src/main/res/layout/fragment_stats_page.xml
index 7fdd8a5..00d17a7 100644
--- a/app/src/main/res/layout/fragment_stats_page.xml
+++ b/app/src/main/res/layout/fragment_stats_page.xml
@@ -36,7 +36,6 @@
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:layout_marginBottom="33dp"
- android:backgroundTint="#517293"
android:fontFamily="@font/inter"
android:text="@string/csv_export_text"
android:textAlignment="center"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index d25b0f2..b997b48 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,7 +1,29 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources xmlns:tools="http://schemas.android.com/tools"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<!-- Base application theme. -->
<style name="Base.Theme.MyApplication" parent="Theme.Material3.DayNight.NoActionBar">
<!-- Customize your dark theme here. -->
<!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
</style>
+
+ <style name="ButtonAppearance" parent="ShapeAppearance.MaterialComponents.SmallComponent">
+ <item name="cornerFamily">rounded</item>
+ <item name="cornerRadius">8dp</item>
+ <item name="backgroundTint">#1E1E1E</item>
+ <item name="iconTint">#D9D9D9</item>
+ <item name="android:textColor">#D9D9D9</item>
+ </style>
+
+ <style name="TopAppearance" parent="">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:textColor">#D9D9D9</item>
+ <item name="android:background">@drawable/shape_transparent_black_top_rounded</item>
+ <item name="fontFamily">@font/inter</item>
+ <item name="android:gravity">center</item>
+ <item name="android:textAlignment">center</item>
+ <item name="android:textSize">16sp</item>
+ <item name="android:paddingTop">7dp</item>
+ <item name="android:paddingBottom">7dp</item>
+ </style>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 049db4f..208a766 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -6,16 +6,32 @@
</style>
<style name="Theme.MyApplication" parent="Base.Theme.MyApplication" />
-
+
<style name="ButtonAppearance" parent="ShapeAppearance.MaterialComponents.SmallComponent">
<item name="cornerFamily">rounded</item>
<item name="cornerRadius">8dp</item>
+ <item name="backgroundTint">#517293</item>
+ <item name="iconTint">#D9D9D9</item>
</style>
-
+
<style name="RoundedImageView" parent="">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">8dp</item>
<item name="cornerRadius">8dp</item>
<item name="color">@color/white</item>
</style>
+
+ <style name="TopAppearance" parent="">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:textColor">#000000</item>
+ <item name="android:background">@drawable/shape_transparent_top_rounded</item>
+ <item name="fontFamily">@font/inter</item>
+ <item name="android:gravity">center</item>
+ <item name="android:textAlignment">center</item>
+ <item name="android:textSize">16sp</item>
+ <item name="android:paddingTop">7dp</item>
+ <item name="android:paddingBottom">7dp</item>
+ </style>
+
</resources>
\ No newline at end of file
--
GitLab