From 8dfa0e5bcb40444aabb81671f76cc5ecd60ab144 Mon Sep 17 00:00:00 2001
From: R4SAS <r4sas@i2pmail.org>
Date: Wed, 17 Mar 2021 12:40:52 +0300
Subject: [PATCH] fix start on API lesser 21

Signed-off-by: R4SAS <r4sas@i2pmail.org>
---
 app/build.gradle                                       | 2 --
 app/src/main/java/org/purplei2p/i2pd/I2PDActivity.java | 2 +-
 app/src/main/res/drawable/ic_logo.xml                  | 6 +++---
 app/src/main/res/drawable/ic_notification_icon.xml     | 6 +++---
 app/src/main/res/layout/activity_main.xml              | 6 ++----
 gradle.properties                                      | 1 -
 6 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5908a94..ee89734 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,8 +18,6 @@ android {
         versionName "2.37.0"
         setProperty("archivesBaseName", archivesBaseName + "-" + versionName)
 
-        vectorDrawables.useSupportLibrary = true
-
         ndk {
             abiFilters "armeabi-v7a"
             abiFilters "x86"
diff --git a/app/src/main/java/org/purplei2p/i2pd/I2PDActivity.java b/app/src/main/java/org/purplei2p/i2pd/I2PDActivity.java
index 0e67bbb..8f0197f 100644
--- a/app/src/main/java/org/purplei2p/i2pd/I2PDActivity.java
+++ b/app/src/main/java/org/purplei2p/i2pd/I2PDActivity.java
@@ -104,7 +104,7 @@ public class I2PDActivity extends Activity {
         setContentView(R.layout.activity_main);
         enableButton = findViewById(R.id.enableButton);
         disableButton = findViewById(R.id.disableButton);
-        textView = (TextView) findViewById(R.id.textView);
+        textView = (TextView) findViewById(R.id.appStatusText);
         if (daemon == null) {
             ConnectivityManager connectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
             daemon = new DaemonWrapper(getAssets(), connectivityManager);
diff --git a/app/src/main/res/drawable/ic_logo.xml b/app/src/main/res/drawable/ic_logo.xml
index 11d6d32..adbdbda 100644
--- a/app/src/main/res/drawable/ic_logo.xml
+++ b/app/src/main/res/drawable/ic_logo.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
+    android:width="128dp"
+    android:height="128dp"
     android:viewportWidth="135.46666"
-    android:viewportHeight="135.46667">
+    android:viewportHeight="135.46666">
   <path
       android:pathData="m94.809,2.625 l0.329,0.016 -0.167,0.593 -0.705,-0.171 -0.005,0.302 -0.532,-0.166 -0.167,-0.703 0.143,-0.461 0.533,0.145 0.288,-0.211 0.445,0.236zM92.7,3.347l0,0.142c0,0.832 0.734,1.566 1.566,1.566l0.57,0c0.636,0 1.566,-0.738 1.566,-1.281l0,-0.712c0,-0.903 -0.907,-1.566 -1.851,-1.566 -0.873,0 -1.851,0.978 -1.851,1.851z"
       android:fillColor="#F1E726"/>
diff --git a/app/src/main/res/drawable/ic_notification_icon.xml b/app/src/main/res/drawable/ic_notification_icon.xml
index 57bfab5..ccce7a7 100644
--- a/app/src/main/res/drawable/ic_notification_icon.xml
+++ b/app/src/main/res/drawable/ic_notification_icon.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="256dp"
-    android:height="256dp"
+    android:width="48dp"
+    android:height="48dp"
     android:viewportWidth="67.73333"
     android:viewportHeight="67.73333">
   <path
@@ -12,5 +12,5 @@
       android:pathData="m28.237,32.0881c-0.9786,-3.1408 -6.8193,-4.4264 -15.1199,-4.7737 4.1351,5.531 8.9609,7.9108 15.1199,4.7737zM50.159,23.3911c-10.3414,-0.137 -15.6448,2.2441 -14.2333,7.982 5.5091,-0.8369 9.979,-4.1522 14.2333,-7.982zM16.6812,21.3597c2.6043,2.2517 5.2086,4.0418 7.8132,4.5568 5.297,1.7061 5.6425,5.3779 5.281,9.3305v9.3306c-0.3217,3.4969 1.857,4.0152 3.1473,2.4946 0.6986,-0.8231 2.1465,-1.8057 3.3777,-1.9377 1.8931,-0.2029 3.3969,-0.1184 2.3733,-3.2692m-5.5705,0.5424c-0.0241,-4.2433 -0.0482,-8.4866 -0.0725,-12.73M16.6089,18.3219C26.541,27.559 30.9945,26.1085 34.7671,17.0923 39.72,5.2558 49.1877,4.4588 57.1215,16.3689m-9.4048,26.7619c-4.9696,6.6991 -9.1786,18.741 -16.8254,11.1857 -1.9968,-1.9727 -1.9672,-2.5199 -8.2055,-7.6415 2.5469,1.5209 4.8048,3.3307 7.6407,4.5628 0.8114,0.3309 1.3047,0.033 2.4566,0.6863 1.0397,0.5898 1.771,0.6068 2.5286,0 1.4062,-1.1262 2.4482,-1.0302 4.6963,-1.8421 3.5633,-1.2868 5.1391,-4.634 7.7087,-6.9512zM8.1259,22.5676C3.4362,7.1294 12.9037,3.0612 19.9981,9.8293 27.2253,16.7242 28.7593,18.3597 33.8971,8.5266 42.533,-8.0016 62.8223,3.3724 60.8266,22.2781 59.1064,38.5756 55.219,53.2975 47.3619,61.7957 41.2802,68.3735 35.1735,68.7337 30.4224,62.9537 25.8932,58.755 22.0663,53.7378 18.695,48.1889 15.3714,45.2618 12.7532,40.0624 11.1664,31.5422ZM33.3926,50.5808c0.1014,-0.4791 -0.0722,-4.2248 1.5204,-0.0957m1.5285,14.3353c-2.607,-2.3561 2.1116,-3.9639 1.4121,-0.4185M53.8771,36.4639C54.0218,43.6533 51.5124,52.1936 47.7962,57.4531M42.4392,40.3723c6.1774,-3.3295 9.073,-2.4125 8.687,2.7503M15.2932,40.8065c1.5452,3.6162 6.1047,4.1223 9.4827,-1.3028M10.0255,21.7213C9.1816,8.2922 13.3214,6.1141 21.0941,16.9476 25.1871,22.652 28.8678,23.6838 32.6692,15.3563 39.433,0.5392 50.2361,1.582 57.2465,12.0746M33.682,24.2528c6.4671,-11.5489 12.2697,-16.0091 17.0008,-9.0411"
       android:strokeWidth="1.32291663"
       android:fillColor="#00000000"
-      android:strokeColor="#1f1a17"/>
+      android:strokeColor="#FFFFFF"/>
 </vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 101d741..8fc4ef4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -14,13 +14,12 @@
         android:orientation="vertical">
 
         <ImageView
-            android:id="@+id/imageView"
+            android:id="@+id/mainLogo"
             android:layout_width="match_parent"
             android:layout_height="140dp"
             android:src="@drawable/ic_logo" />
 
         <TextView
-            android:id="@+id/textViewDesc1"
             style="@android:style/Widget.Holo.Light.TextView.SpinnerItem"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -31,7 +30,6 @@
             android:textStyle="bold" />
 
         <TextView
-            android:id="@+id/textViewDesc2"
             style="@android:style/Widget.Holo.Light.TextView.SpinnerItem"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -81,7 +79,7 @@
                 android:layout_height="@dimen/margin_medium" />
 
             <TextView
-                android:id="@+id/textView"
+                android:id="@+id/appStatusText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal"
diff --git a/gradle.properties b/gradle.properties
index f8267d2..dfb2fa4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,3 @@
 android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.parallel=true
-android.defaultConfig.vectorDrawables.useSupportLibrary = true