Add Russia-Ukraine war banner

AChep · Mar 2, 2022 · 2d7e3a7 · 2d7e3a7
1 parent 3fb6556
commit 2d7e3a7
Show file tree

Hide file tree

Showing 8 changed files with 121 additions and 8 deletions.
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/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
@@ -95,7 +95,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
-                android:text="Artem Chepurnoy"
+                android:text="Artem Chepurnoy \uD83C\uDDFA\uD83C\uDDE6"
                 android:textAppearance="?textAppearanceTitleMedium"
                 app:layout_constraintBottom_toBottomOf="@id/authorAvatarImageView"
                 app:layout_constraintStart_toEndOf="@id/authorAvatarImageView"

diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
@@ -94,16 +94,93 @@
         android:layout_height="@dimen/app_bar_height__expanded"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerView"
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/scrollView"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:clipToPadding="false"
-        android:paddingTop="@dimen/frame_margin_vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/barrier" />
+        app:layout_constraintTop_toBottomOf="@id/barrier">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/warContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginBottom="16dp"
+                app:cardBackgroundColor="?colorErrorContainer"
+                app:cardCornerRadius="24dp"
+                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>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:clipToPadding="false"
+                android:nestedScrollingEnabled="false" />
+
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/progressBar"

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.kts b/build.gradle.kts
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:7.1.1")
+        classpath("com.android.tools.build:gradle:7.1.2")
         classpath("io.realm:realm-gradle-plugin:10.7.0")
         classpath("com.google.gms:google-services:4.3.10")
         classpath("androidx.navigation:navigation-safe-args-gradle-plugin:$ANDROIDARCH_NAVIGATION_VERSION")

diff --git 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-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip