From 8064dbe9a5c2fbd9073b694fa237d457039380b2 Mon Sep 17 00:00:00 2001
From: Clyhtsuriva <aimeric@adjutor.xyz>
Date: Tue, 9 Feb 2021 20:48:18 +0100
Subject: Adding colours and "locking" in dark mode.
---
app/src/main/res/layout/activity_main.xml | 6 ++++--
app/src/main/res/layout/fragment_first.xml | 4 ++--
app/src/main/res/values-night/themes.xml | 10 +++++-----
app/src/main/res/values/colors.xml | 5 +++++
app/src/main/res/values/strings.xml | 1 +
app/src/main/res/values/themes.xml | 10 +++++-----
6 files changed, 22 insertions(+), 14 deletions(-)
(limited to 'app/src/main')
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 616f503..aa7a1c1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".MainActivity">
+ tools:context=".MainActivity"
+ android:background="@color/very_dark_purple">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
@@ -28,6 +29,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
- app:srcCompat="@android:drawable/ic_dialog_email" />
+ app:srcCompat="@android:drawable/ic_dialog_info"
+ android:contentDescription="@string/info"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_first.xml b/app/src/main/res/layout/fragment_first.xml
index 3533ea3..81142cd 100644
--- a/app/src/main/res/layout/fragment_first.xml
+++ b/app/src/main/res/layout/fragment_first.xml
@@ -10,11 +10,11 @@
android:id="@+id/textview_first"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/purple_700"
+ android:background="@color/black"
android:fontFamily="@font/bangers"
android:text="@string/hello_first_fragment"
android:textAlignment="center"
- android:textColor="@color/teal_200"
+ android:textColor="@color/strong_pink"
android:textSize="36sp"
app:layout_constraintBottom_toTopOf="@id/button_first"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index e1dd5d0..e8d4e2d 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -2,12 +2,12 @@
<!-- Base application theme. -->
<style name="Theme.Aniki" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<!-- Primary brand color. -->
- <item name="colorPrimary">@color/purple_200</item>
- <item name="colorPrimaryVariant">@color/purple_700</item>
- <item name="colorOnPrimary">@color/black</item>
+ <item name="colorPrimary">@color/black</item>
+ <item name="colorPrimaryVariant">@color/strong_pink</item>
+ <item name="colorOnPrimary">@color/slightly_desaturated_magenta</item>
<!-- Secondary brand color. -->
- <item name="colorSecondary">@color/teal_200</item>
- <item name="colorSecondaryVariant">@color/teal_200</item>
+ <item name="colorSecondary">@color/purple_200</item>
+ <item name="colorSecondaryVariant">@color/purple_700</item>
<item name="colorOnSecondary">@color/black</item>
<!-- Status bar color. -->
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..95a118e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,9 @@
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
+
+ <color name="very_dark_purple">#09022A</color>
+ <color name="very_light_magenta">#FF70FF</color>
+ <color name="strong_pink">#D52C70</color>
+ <color name="slightly_desaturated_magenta">#c583b6</color>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b907069..cbf81ad 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,4 +10,5 @@
<string name="hello_first_fragment">Oi Otouto !</string>
<string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
+ <string name="info">Infos about the developper of the app.</string>
</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 c79cf5a..2d1852e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,12 +2,12 @@
<!-- Base application theme. -->
<style name="Theme.Aniki" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<!-- Primary brand color. -->
- <item name="colorPrimary">@color/purple_500</item>
- <item name="colorPrimaryVariant">@color/purple_700</item>
- <item name="colorOnPrimary">@color/white</item>
+ <item name="colorPrimary">@color/black</item>
+ <item name="colorPrimaryVariant">@color/strong_pink</item>
+ <item name="colorOnPrimary">@color/slightly_desaturated_magenta</item>
<!-- Secondary brand color. -->
- <item name="colorSecondary">@color/teal_200</item>
- <item name="colorSecondaryVariant">@color/teal_700</item>
+ <item name="colorSecondary">@color/purple_200</item>
+ <item name="colorSecondaryVariant">@color/purple_700</item>
<item name="colorOnSecondary">@color/black</item>
<!-- Status bar color. -->
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
--
cgit v1.2.3