Release source code for 44.2

android/apollo/build.gradle

@@ -117,7 +117,7 @@ dependencies {
     implementation files('libs/libwallet.aar')
 
     // Android support:
-    api 'androidx.appcompat:appcompat:1.0.2'
+    api 'androidx.appcompat:appcompat:1.2.0'
 
     implementation 'androidx.sqlite:sqlite-framework:2.0.1'
 

android/apolloui/build.gradle

@@ -80,8 +80,8 @@ android {
         applicationId "io.muun.apollo"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 401
-        versionName "44.1"
+        versionCode 402
+        versionName "44.2"
 
         // Needed to make sure these classes are available in the main DEX file for API 19
         // See: https://spin.atomicobject.com/2018/07/16/support-kitkat-multidex/

android/apolloui/src/main/java/io/muun/apollo/presentation/ui/select_country/SelectCountryActivity.java

@@ -14,7 +14,6 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.appcompat.widget.AppCompatTextView;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
@@ -80,20 +79,20 @@ private void onCountryItemClick(CountryInfo countryInfo) {
         finishActivity();
     }
 
-    private class CountryAdapter extends RecyclerView.Adapter<MuunViewHolder<AppCompatTextView>> {
+    private class CountryAdapter extends RecyclerView.Adapter<MuunViewHolder<TextView>> {
 
         @NonNull
         @Override
-        public MuunViewHolder<AppCompatTextView> onCreateViewHolder(ViewGroup root, int viewType) {
-            final AppCompatTextView view = (AppCompatTextView) LayoutInflater
+        public MuunViewHolder<TextView> onCreateViewHolder(ViewGroup root, int viewType) {
+            final TextView view = (TextView) LayoutInflater
                     .from(root.getContext())
                     .inflate(R.layout.country_info_item, root, false);
 
             return new MuunViewHolder<>(view);
         }
 
         @Override
-        public void onBindViewHolder(@NonNull MuunViewHolder<AppCompatTextView> holder, int pos) {
+        public void onBindViewHolder(@NonNull MuunViewHolder<TextView> holder, int pos) {
             final TextView textView = holder.getView();
             final CountryInfo countryInfo = countryInfoList.get(pos);
 

android/apolloui/src/main/res/layout/country_info_item.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.AppCompatTextView
+<TextView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="16dp"
         android:textSize="16sp"
         android:textColor="@color/text_primary_color"
-        tools:text="Argentina"
-/>
+        tools:text="Argentina" />

android/apolloui/src/main/res/layout/muun_country_input.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.AppCompatTextView
+<TextView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/selected_country"

android/apolloui/src/main/res/values-night/colors.xml

@@ -4,7 +4,6 @@
     <!-- General-purpose color scheme -->
 
     <color name="blue">#3399FF</color>
-
     <color name="green">#30D158</color>
 
     <!--  General purpose colors  -->

android/apolloui/src/main/res/values/colors.xml

@@ -39,16 +39,6 @@
     <color name="gray_lightest">#F4F4F5</color>
     <color name="white">#FFFFFF</color>
 
-    <!-- Special cases -->
-
-    <!-- Needed for ic_launcher adaptative icons -->
-    <!--
-    Note: seems android doesn't fully support app icon color change based on ui-mode so we
-    stick to a fixed app icon. See:
-    www.reddit.com/r/GooglePixel/comments/eqagn9/we_need_app_icons_backgrounds_to_respect_dark_mode/
-    -->
-    <color name="ic_launcher_background">@color/white</color>
-
     <!--  General purpose colors  -->
     <color name="icon_color">@color/gray_dark</color>
     <color name="text_primary_color">@color/black</color>
@@ -62,6 +52,17 @@
     <color name="pending_color">@color/yellow</color>
     <color name="rbf_color">@color/orange</color>
 
+
+    <!-- Special cases -->
+
+    <!-- Needed for ic_launcher adaptative icons -->
+    <!--
+    Note: seems android doesn't fully support app icon color change based on ui-mode so we
+    stick to a fixed app icon. See:
+    www.reddit.com/r/GooglePixel/comments/eqagn9/we_need_app_icons_backgrounds_to_respect_dark_mode/
+    -->
+    <color name="ic_launcher_background">@color/white</color>
+
     <!-- Used Only in api >= 21  -->
     <color name="statusBarColor">@color/black</color>
 

android/apolloui/src/main/res/values/styles.xml

@@ -90,7 +90,13 @@
 
     </style>
 
-    <style name="cursorColor" parent="ThemeOverlay.MaterialComponents.AutoCompleteTextView">
+    <!--
+    We're keeping the AppCompat style inheritance (instead of migrating to MDC style, like
+    ThemeOverlay.MaterialComponents.AutoCompleteTextView) because otherwise a strange crash occurs
+    when trying to use the SearchView.
+    See: https://stackoverflow.com/a/22295139/901465
+    -->
+    <style name="cursorColor" parent="Widget.AppCompat.AutoCompleteTextView">
         <item name="android:textCursorDrawable">@drawable/cursor</item>
     </style>