Added the approve assets for no connection page

Nsikaktopdown · Nsikaktopdown · commit 4e9dd3e4d7d9 · 2023-02-08T17:18:01.000+01:00
diff --git a/java-demo/build.gradle b/java-demo/build.gradle
@@ -7,7 +7,7 @@ android {
 
     defaultConfig {
         applicationId "com.example.java_demo"
-        minSdkVersion 21
+        minSdkVersion 23
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"
diff --git a/thepeer-android/src/main/AndroidManifest.xml b/thepeer-android/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
 
     <application>
         <activity
-            android:name=".ui.activity.ThepeerSDKActivity"
+            android:name=".ui.activity.ThepeerSdkActivity"
             android:theme="@style/ThepeerSDKTheme"
             android:screenOrientation="portrait"
             />
diff --git a/thepeer-android/src/main/java/co/thepeer/sdk/ui/ThepeerResultContract.kt b/thepeer-android/src/main/java/co/thepeer/sdk/ui/ThepeerResultContract.kt
@@ -6,12 +6,12 @@ import android.content.Intent
 import androidx.activity.result.contract.ActivityResultContract
 import co.thepeer.sdk.model.ThepeerParam
 import co.thepeer.sdk.model.ThepeerResult
-import co.thepeer.sdk.ui.activity.ThepeerSDKActivity
+import co.thepeer.sdk.ui.activity.ThepeerSdkActivity
 import co.thepeer.sdk.utils.ThepeerConstants
 
 internal class ThepeerResultContract : ActivityResultContract<ThepeerParam, ThepeerResult>() {
     override fun createIntent(context: Context, input: ThepeerParam): Intent {
-        return Intent(context, ThepeerSDKActivity::class.java).apply {
+        return Intent(context, ThepeerSdkActivity::class.java).apply {
             putExtra(ThepeerConstants.THE_PEER_PARAMS, input)
         }
     }
diff --git a/thepeer-android/src/main/java/co/thepeer/sdk/ui/activity/ThepeerSdkActivity.kt b/thepeer-android/src/main/java/co/thepeer/sdk/ui/activity/ThepeerSdkActivity.kt
@@ -16,13 +16,12 @@ import co.thepeer.sdk.R
 import co.thepeer.sdk.databinding.SdkActivityBinding
 import co.thepeer.sdk.model.ThepeerParam
 import co.thepeer.sdk.model.ThepeerResult
-import co.thepeer.sdk.ui.fragments.ThepeerFragment
 import co.thepeer.sdk.utils.*
 import co.thepeer.sdk.utils.Logger
 import co.thepeer.sdk.utils.Urls
 import co.thepeer.sdk.utils.WebInterface
 
-class ThepeerSDKActivity : AppCompatActivity() {
+internal class ThepeerSdkActivity : AppCompatActivity() {
     private var params: ThepeerParam? = null
     private var url: String = ""
     private lateinit var binding: SdkActivityBinding
@@ -53,6 +52,9 @@ class ThepeerSDKActivity : AppCompatActivity() {
             Logger.log(this, url)
         }
 
+        binding.includeRetryView.closeBtn.setOnClickListener {
+            finish()
+        }
     }
 
     @SuppressLint("SetJavaScriptEnabled")
diff --git a/thepeer-android/src/main/java/co/thepeer/sdk/ui/fragments/ThepeerFragment.kt b/thepeer-android/src/main/java/co/thepeer/sdk/ui/fragments/ThepeerFragment.kt
diff --git a/thepeer-android/src/main/java/co/thepeer/sdk/utils/Environment.kt b/thepeer-android/src/main/java/co/thepeer/sdk/utils/Environment.kt
@@ -1,6 +1,6 @@
 package co.thepeer.sdk.utils
 
-enum class Environment(val url: String) {
+internal enum class Environment(val url: String) {
     PROD(""),
     TEST("")
 }
diff --git a/thepeer-android/src/main/java/co/thepeer/sdk/utils/ThepeerConstants.kt b/thepeer-android/src/main/java/co/thepeer/sdk/utils/ThepeerConstants.kt
@@ -1,6 +1,6 @@
 package co.thepeer.sdk.utils
 
-class ThepeerConstants {
+internal class ThepeerConstants {
     companion object {
         const val THE_PEER_PARAMS = "peer_params"
         const val SEND = "send"
diff --git a/thepeer-android/src/main/res/drawable/close_icon.xml b/thepeer-android/src/main/res/drawable/close_icon.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="M20,20m-20,0a20,20 0,1 1,40 0a20,20 0,1 1,-40 0"
+      android:fillColor="#F7F7FC"/>
+  <path
+      android:pathData="M25.884,15.884L21.767,20L25.884,24.116C26.003,24.232 26.098,24.369 26.164,24.522C26.229,24.674 26.264,24.838 26.265,25.004C26.267,25.17 26.235,25.335 26.172,25.489C26.109,25.642 26.017,25.782 25.899,25.899C25.782,26.017 25.642,26.109 25.489,26.172C25.335,26.235 25.17,26.267 25.004,26.265C24.838,26.264 24.674,26.229 24.522,26.164C24.369,26.098 24.232,26.003 24.116,25.884L20,21.767L15.884,25.884C15.768,26.003 15.63,26.098 15.478,26.164C15.325,26.229 15.161,26.264 14.995,26.265C14.83,26.267 14.665,26.235 14.511,26.172C14.358,26.109 14.218,26.017 14.101,25.899C13.983,25.782 13.891,25.642 13.828,25.489C13.765,25.335 13.733,25.17 13.735,25.004C13.736,24.838 13.771,24.674 13.836,24.522C13.902,24.369 13.997,24.232 14.116,24.116L18.233,20L14.116,15.884C13.997,15.768 13.902,15.63 13.836,15.478C13.771,15.325 13.736,15.161 13.735,14.995C13.733,14.83 13.765,14.665 13.828,14.511C13.891,14.358 13.983,14.218 14.101,14.101C14.218,13.983 14.358,13.891 14.511,13.828C14.665,13.765 14.83,13.733 14.995,13.735C15.161,13.736 15.325,13.771 15.478,13.836C15.63,13.902 15.768,13.997 15.884,14.116L20,18.233L24.116,14.116C24.232,13.997 24.369,13.902 24.522,13.836C24.674,13.771 24.838,13.736 25.004,13.735C25.17,13.733 25.335,13.765 25.489,13.828C25.642,13.891 25.782,13.983 25.899,14.101C26.017,14.218 26.109,14.358 26.172,14.511C26.235,14.665 26.267,14.83 26.265,14.995C26.264,15.161 26.229,15.325 26.164,15.478C26.098,15.63 26.003,15.768 25.884,15.884Z"
+      android:fillColor="#586283"/>
+</vector>
diff --git a/thepeer-android/src/main/res/drawable/warning.xml b/thepeer-android/src/main/res/drawable/warning.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="35dp"
+    android:viewportWidth="40"
+    android:viewportHeight="35">
+  <path
+      android:pathData="M20,2L2,33.091H38L20,2Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="3.27273"
+      android:fillColor="#00000000"
+      android:strokeColor="#FFB400"/>
+  <path
+      android:pathData="M20,26.545V27.364M20,13.455L20.007,21.636"
+      android:strokeWidth="3.27273"
+      android:fillColor="#00000000"
+      android:strokeColor="#FFB400"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/thepeer-android/src/main/res/layout/retry_view.xml b/thepeer-android/src/main/res/layout/retry_view.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/retry_view"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/retry_view"
+    android:background="@color/unclearWhite"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <Button
+    <TextView
         android:id="@+id/retry_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="24dp"
         android:text="@string/retry"
-        android:background="@color/colorPrimary"
-        android:textColor="@color/unclearWhite"
+        android:textColor="@color/colorPrimary"
         app:layout_constraintEnd_toEndOf="@+id/textView"
         app:layout_constraintStart_toStartOf="@+id/textView"
         app:layout_constraintTop_toBottomOf="@+id/textView" />
@@ -22,13 +22,33 @@
         android:id="@+id/textView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
         android:text="@string/retry_text"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.5" />
 
+    <ImageView
+        android:id="@+id/close_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="24dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/close_icon" />
+
+    <ImageView
+        android:id="@+id/imageView2"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_marginBottom="16dp"
+        android:scaleType="fitCenter"
+        app:layout_constraintBottom_toTopOf="@+id/textView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:srcCompat="@drawable/warning" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,12 @@ import android.content.Intent`
`6`	`6`	`import androidx.activity.result.contract.ActivityResultContract`
`7`	`7`	`import co.thepeer.sdk.model.ThepeerParam`
`8`	`8`	`import co.thepeer.sdk.model.ThepeerResult`
`9`		`-import co.thepeer.sdk.ui.activity.ThepeerSDKActivity`
	`9`	`+import co.thepeer.sdk.ui.activity.ThepeerSdkActivity`
`10`	`10`	`import co.thepeer.sdk.utils.ThepeerConstants`
`11`	`11`
`12`	`12`	`internal class ThepeerResultContract : ActivityResultContract<ThepeerParam, ThepeerResult>() {`
`13`	`13`	`override fun createIntent(context: Context, input: ThepeerParam): Intent {`
`14`		`- return Intent(context, ThepeerSDKActivity::class.java).apply {`
	`14`	`+ return Intent(context, ThepeerSdkActivity::class.java).apply {`
`15`	`15`	`putExtra(ThepeerConstants.THE_PEER_PARAMS, input)`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package co.thepeer.sdk.utils`
`2`	`2`
`3`		`-enum class Environment(val url: String) {`
	`3`	`+internal enum class Environment(val url: String) {`
`4`	`4`	`PROD(""),`
`5`	`5`	`TEST("")`
`6`	`6`	`}`