Add Russia-Ukraine war banner

AChep · Mar 2, 2022 · c97e228 · c97e228
1 parent d36b163
commit c97e228
Show file tree

Hide file tree

Showing 12 changed files with 118 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -118,7 +118,7 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0'
     implementation 'com.artemchep.config:config:2.2.0'
     implementation 'com.afollestad.material-dialogs:core:3.3.0'
-    implementation 'com.google.android.material:material:1.6.0-alpha02'
+    implementation 'com.google.android.material:material:1.6.0-alpha03'
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-process:$lifecycle_version"

diff --git a/app/src/main/java/com/artemchep/pocketmode/ui/activities/MainActivity.kt b/app/src/main/java/com/artemchep/pocketmode/ui/activities/MainActivity.kt
@@ -204,6 +204,7 @@ class MainActivity : BaseActivity(),
             isAnalyticsSwitchBroadcasting = false
         }
 
+        viewBinding.warLearnMoreBtn.setOnClickListener(this)
         viewBinding.masterSwitchText.setOnClickListener(this)
         viewBinding.accessStub.accessibilityServiceBtn.setOnClickListener(this)
         viewBinding.accessStub.callStateBtn.setOnClickListener(this)
@@ -227,7 +228,7 @@ class MainActivity : BaseActivity(),
         viewBinding.mainStub.aboutAuthor.text = getStringOrEmpty(
             R.string.about_author,
             getString(R.string.about_author_artem_chepurnoy)
-        )
+        ) + " \uD83C\uDDFA\uD83C\uDDE6"
 
         mainViewModel.setup()
     }
@@ -417,6 +418,7 @@ class MainActivity : BaseActivity(),
                 vibrateOneShot(duration)
             }
             // Help
+            R.id.warLearnMoreBtn -> mainViewModel.openWarInfo()
             R.id.donateBtn -> mainViewModel.openDonateToMe()
             R.id.codeBtn -> mainViewModel.openRepo()
             R.id.bugReportBtn -> mainViewModel.openBugReport()

diff --git a/app/src/main/java/com/artemchep/pocketmode/viewmodels/MainViewModel.kt b/app/src/main/java/com/artemchep/pocketmode/viewmodels/MainViewModel.kt
@@ -245,6 +245,11 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
 
     fun openApps() = openUrl(LINK_APPS)
 
+    fun openWarInfo() = kotlin.run {
+        val url = context.getString(R.string.war_learn_more_url)
+        openUrl(url)
+    }
+
     // ---- Permissions ----
 
     fun grantAccessibilityService() {

diff --git a/app/src/main/res/drawable/ic_chevron.xml b/app/src/main/res/drawable/ic_chevron.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M8.59,16.58L13.17,12L8.59,7.41L10,6L16,12L10,18L8.59,16.58Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_info.xml b/app/src/main/res/drawable/ic_outline_info.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M11,9H13V7H11M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M11,17H13V11H11V17Z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -53,6 +53,69 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintWidth_max="520dp">
 
+                <com.google.android.material.card.MaterialCardView
+                    android:id="@+id/warContainer"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/cardMarginHorizontal"
+                    android:layout_marginEnd="@dimen/cardMarginHorizontal"
+                    android:layout_marginBottom="16dp"
+                    app:cardBackgroundColor="?colorErrorContainer"
+                    app:cardCornerRadius="@dimen/cardCornerRadius"
+                    app:cardElevation="0dp"
+                    app:strokeWidth="0dp">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:paddingVertical="16dp">
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="start|center_vertical"
+                            android:background="?selectableItemBackground"
+                            android:gravity="center_vertical"
+                            android:paddingStart="16dp"
+                            android:paddingEnd="16dp"
+                            android:text="@string/war_title"
+                            android:textAppearance="?textAppearanceTitleMedium"
+                            android:textColor="?colorOnErrorContainer" />
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="start|center_vertical"
+                            android:background="?selectableItemBackground"
+                            android:gravity="center_vertical"
+                            android:paddingStart="16dp"
+                            android:paddingEnd="16dp"
+                            android:text="@string/war_text"
+                            android:textAppearance="?textAppearanceBodyMedium"
+                            android:textColor="?colorOnErrorContainer" />
+
+                        <TextView
+                            android:id="@+id/warLearnMoreBtn"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="16dp"
+                            android:background="?selectableItemBackground"
+                            android:drawablePadding="16dp"
+                            android:paddingHorizontal="16dp"
+                            android:paddingTop="12dp"
+                            android:paddingBottom="12dp"
+                            android:text="@string/war_learn_more"
+                            android:textAppearance="?textAppearanceBodyLarge"
+                            android:textColor="?colorOnErrorContainer"
+                            app:drawableEndCompat="@drawable/ic_chevron"
+                            app:drawableStartCompat="@drawable/ic_outline_info"
+                            app:drawableTint="?colorOnErrorContainer" />
+
+                    </LinearLayout>
+
+                </com.google.android.material.card.MaterialCardView>
+
                 <com.google.android.material.card.MaterialCardView
                     android:id="@+id/masterSwitchContainer"
                     android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/layout_access.xml b/app/src/main/res/layout/layout_access.xml
@@ -44,6 +44,7 @@
         android:text="@string/access_accessibility_service"
         android:textAppearance="?textAppearanceBodyLarge"
         android:textColor="?colorError"
+        app:drawableEndCompat="@drawable/ic_chevron"
         app:drawableStartCompat="@drawable/ic_outline_accessibility"
         app:drawableTint="?colorError"
         app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml
@@ -293,6 +293,7 @@
         android:paddingBottom="12dp"
         android:text="@string/help_donate"
         android:textAppearance="?textAppearanceBodyLarge"
+        app:drawableEndCompat="@drawable/ic_chevron"
         app:drawableStartCompat="@drawable/ic_outline_credit_card"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -310,6 +311,7 @@
         android:paddingBottom="12dp"
         android:text="@string/help_code"
         android:textAppearance="?textAppearanceBodyLarge"
+        app:drawableEndCompat="@drawable/ic_chevron"
         app:drawableStartCompat="@drawable/ic_outline_code"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -327,6 +329,7 @@
         android:paddingBottom="12dp"
         android:text="@string/help_translate"
         android:textAppearance="?textAppearanceBodyLarge"
+        app:drawableEndCompat="@drawable/ic_chevron"
         app:drawableStartCompat="@drawable/ic_outline_translate"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -344,6 +347,7 @@
         android:paddingBottom="12dp"
         android:text="@string/help_more_apps"
         android:textAppearance="?textAppearanceBodyLarge"
+        app:drawableEndCompat="@drawable/ic_chevron"
         app:drawableStartCompat="@drawable/ic_outline_apps"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/layout_troubleshooting.xml b/app/src/main/res/layout/layout_troubleshooting.xml
@@ -184,6 +184,7 @@
         android:paddingBottom="12dp"
         android:text="@string/help_bug_report_dont_kill_my_app"
         android:textAppearance="?textAppearanceBodyLarge"
+        app:drawableEndCompat="@drawable/ic_chevron"
         app:drawableStartCompat="@drawable/ic_shortcut"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -201,6 +202,7 @@
         android:paddingBottom="12dp"
         android:text="@string/help_bug_report"
         android:textAppearance="?textAppearanceBodyLarge"
+        app:drawableEndCompat="@drawable/ic_chevron"
         app:drawableStartCompat="@drawable/ic_outline_bug_report"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -218,6 +220,7 @@
         android:paddingBottom="12dp"
         android:text="@string/help_test"
         android:textAppearance="?textAppearanceBodyLarge"
+        app:drawableEndCompat="@drawable/ic_chevron"
         app:drawableStartCompat="@drawable/ic_test_tube"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/values-ru/strings_war.xml b/app/src/main/res/values-ru/strings_war.xml
@@ -0,0 +1,8 @@
+<resources>
+
+    <string name="war_title" translatable="false">Разработка и поддержка приложения может быть остановлена навсегда.</string>
+    <string name="war_text" translatable="false">Мой дом сейчас под обстрелом российской армией. Выходите на улицы, что бы остановить войну!</string>
+    <string name="war_learn_more" translatable="false">Что происходит?</string>
+    <string name="war_learn_more_url" translatable="false">https://www.youtube.com/watch?v=9F5ZmLhIy8E</string>
+
+</resources>
diff --git a/app/src/main/res/values/strings_war.xml b/app/src/main/res/values/strings_war.xml
@@ -0,0 +1,8 @@
+<resources>
+
+    <string name="war_title" translatable="false">Maintenance of the app may be discontinued forever.</string>
+    <string name="war_text" translatable="false">My home is under attack by the russian army. Protest to stop the war!</string>
+    <string name="war_learn_more" translatable="false">What\'s going on?</string>
+    <string name="war_learn_more_url" translatable="false">https://www.youtube.com/watch?v=si1ZdU3wYr8</string>
+
+</resources>
diff --git a/build.gradle b/build.gradle
@@ -2,13 +2,13 @@
 
 buildscript {
     ext.kotlin_version = '1.6.10'
-    ext.lifecycle_version = "2.4.0"
+    ext.lifecycle_version = "2.4.1"
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.0'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.10'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'