From 756997b67b534d34f6d279cb5e6e7ee722295c31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20HERVE?= <loic.herve@amplexor.com>
Date: Tue, 8 Dec 2020 22:57:30 +0100
Subject: [PATCH 1/2] Dark mode: use background color in splash screen, add
 force dark for android 29+, night color scheme for 'light blue' to fix row
 dividers

---
 .../res/drawable-v21/background_splash.xml    | 13 ++++++
 app/src/main/res/values-night/colors.xml      | 43 +++++++++++++++++++
 app/src/main/res/values-v29/themes.xml        |  7 +++
 3 files changed, 63 insertions(+)
 create mode 100644 app/src/main/res/drawable-v21/background_splash.xml
 create mode 100644 app/src/main/res/values-night/colors.xml
 create mode 100644 app/src/main/res/values-v29/themes.xml

diff --git a/app/src/main/res/drawable-v21/background_splash.xml b/app/src/main/res/drawable-v21/background_splash.xml
new file mode 100644
index 000000000..0daaf697a
--- /dev/null
+++ b/app/src/main/res/drawable-v21/background_splash.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item
+		android:drawable="?android:attr/colorBackground"/>
+
+	<item>
+		<bitmap
+			android:gravity="center"
+			android:src="@drawable/ic_launcher_large"/>
+	</item>
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 000000000..66b6159ef
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<color name="dark_blue">#ff292e62</color>
+	<color name="medium_blue">#ff405898</color>
+	<color name="light_blue">#ff5C6BC0</color>
+	<color name="orange">#ffff7807</color>
+	<color name="light_blue_transparent">#aae7ecf1</color>
+
+	<color name="primary">@color/dark_blue</color>
+	<color name="primary_dark">#ff232753</color>
+	<color name="accent">@color/orange</color>
+	<color name="info_background">@color/light_blue</color>
+
+	<color name="dialog_text">#000</color>
+	<color name="primary_text">#de000000</color>
+	<color name="secondary_text">#99000000</color>
+	<color name="disabled_text">#61000000</color>
+	<color name="inverse_text">#ffffff</color>
+	<color name="inverse_secondary_text">#b3ffffff</color>
+
+	<color name="black_overlay">#CC000000</color>
+	<color name="black_overlay_light">#6000</color>
+	<color name="no_image">#808080</color>
+	<color name="empty_tint">#aaaaaa</color>
+
+	<color name="best">#00a550</color>
+	<color name="recommended">#ffef00</color>
+	<color name="no_votes">#888888</color>
+	<color name="not_recommended">#ed1C24</color>
+
+	<color name="list_divider">#1F000000</color>
+	<color name="button_under_text">#2000</color>
+
+	<color name="score_low">#f00</color>
+	<color name="score_average">#cc0</color>
+	<color name="score_average_win">#00f</color>
+	<color name="score_high">#080</color>
+
+	<color name="delete">#f00</color>
+	<color name="edit">#080</color>
+
+	<color name="fast_scroll_track">#eee</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v29/themes.xml b/app/src/main/res/values-v29/themes.xml
new file mode 100644
index 000000000..734fed09f
--- /dev/null
+++ b/app/src/main/res/values-v29/themes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<style name="Theme.bgglight.Base" parent="@style/Theme.MaterialComponents.Light.NoActionBar">
+		<item name="android:forceDarkAllowed">true</item>
+	</style>
+</resources>
\ No newline at end of file

From d2adb25919f5b45c76048f044b943e6907effdc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20HERVE?= <loic.herve@amplexor.com>
Date: Sun, 30 Jan 2022 15:01:04 +0100
Subject: [PATCH 2/2] Android studio update

---
 .idea/runConfigurations.xml              | 12 ------------
 app/build.gradle                         | 17 ++++++++---------
 build.gradle                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 4 files changed, 10 insertions(+), 23 deletions(-)
 delete mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460d8..000000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 273475533..01b80909f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
     }
 }
 
@@ -45,15 +45,7 @@ def gitBranchName = { ->
 
 android {
     compileSdkVersion 29
-    buildToolsVersion '29.0.2'
 
-    lintOptions {
-        baseline file("lint-baseline.xml")
-        checkAllWarnings true
-        warningsAsErrors true
-        abortOnError true
-        checkReleaseBuilds false
-    }
 
     dexOptions {
         jumboMode true
@@ -116,6 +108,13 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
+    lint {
+        abortOnError true
+        baseline file('lint-baseline.xml')
+        checkAllWarnings true
+        checkReleaseBuilds false
+        warningsAsErrors true
+    }
 }
 
 dependencies {
diff --git a/build.gradle b/build.gradle
index d5f274c3c..a73588166 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:7.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.27.0'
         classpath 'com.google.gms:google-services:4.3.4'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5d4c95c6d..84483aa3a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip