#164 | Removed. Unnessary conflicting codes with Avni [Sweety]

sweetyTW · Jul 3, 2023 · cf67174 · cf67174
1 parent 6b19fa1
commit cf67174
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 63 deletions.
diff --git a/abha-sample/build.gradle b/abha-sample/build.gradle
@@ -52,7 +52,7 @@ afterEvaluate {
 
                 groupId = 'com.github.sweetyTW'
                 artifactId = 'abha-create-verify-android'
-                version = '6.4'
+                version = '6.5'
             }
         }
     }

diff --git a/abha-sample/src/main/AndroidManifest.xml b/abha-sample/src/main/AndroidManifest.xml
@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
     <application
-        android:allowBackup="true"
-        android:fullBackupContent="@xml/backup_rules"
         android:supportsRtl="true"
         tools:targetApi="31">
         <activity

diff --git a/abha-sample/src/main/java/com/example/abha_sample/LaunchActivity.kt b/abha-sample/src/main/java/com/example/abha_sample/LaunchActivity.kt
diff --git a/abha-sample/src/main/java/com/example/abha_sample/SampleAbhaActivity.kt b/abha-sample/src/main/java/com/example/abha_sample/SampleAbhaActivity.kt
@@ -1,47 +1,41 @@
 package com.example.abha_sample
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.example.abha_sample.databinding.ActivitySampleAbhaBinding
 import org.json.JSONObject
 
 
 class SampleAbhaActivity : AppCompatActivity() {
-
-//     var SESSION_TOKEN : String = "abcd"
-
-     lateinit var patient_json : JSONObject
-
     private lateinit var binding: ActivitySampleAbhaBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivitySampleAbhaBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        binding.proceedButton.setOnClickListener {
-            patient_json = JSONObject(binding.aadhaarEditText.text.toString())
-        }
     }
 
     companion object {
         var SESSION_TOKEN: String = "abcd"
-        var PATIENT_JSON : JSONObject = JSONObject("{\n" +
-                "  \"Subject type\": \"Patient\",\n" +
-                "  \"External ID\": null,\n" +
-                "  \"Voided\": false,\n" +
-                "  \"Registration date\": \"2023-06-22\",\n" +
-                "  \"location\": {\n" +
-                "    \"State\": \"Hosakote\",\n" +
-                "    \"State External ID\": null\n" +
-                "  },\n" +
-                "  \"First name\": \"Priya\",\n" +
-                "  \"Last name\": \"Rao\",\n" +
-                "  \"Date of birth\": \"2013-03-22\",\n" +
-                "  \"Gender\": \"Female\",\n" +
-                "  \"observations\": {\n" +
-                "  },\n" +
-                "  \"Address\": \"Hosakote\"\n" +
-                "}\n")
+        var PATIENT_JSON: JSONObject = JSONObject(
+            "{\n" +
+                    "  \"Subject type\": \"Patient\",\n" +
+                    "  \"External ID\": null,\n" +
+                    "  \"Voided\": false,\n" +
+                    "  \"Registration date\": \"2023-06-22\",\n" +
+                    "  \"location\": {\n" +
+                    "    \"State\": \"Hosakote\",\n" +
+                    "    \"State External ID\": null\n" +
+                    "  },\n" +
+                    "  \"First name\": \"Priya\",\n" +
+                    "  \"Last name\": \"Rao\",\n" +
+                    "  \"Date of birth\": \"2013-03-22\",\n" +
+                    "  \"Gender\": \"Female\",\n" +
+                    "  \"observations\": {\n" +
+                    "  },\n" +
+                    "  \"Address\": \"Hosakote\"\n" +
+                    "}\n"
+        )
     }
 
 

diff --git a/abha-sample/src/main/res/layout/activity_sample_abha.xml b/abha-sample/src/main/res/layout/activity_sample_abha.xml
@@ -17,35 +17,16 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_above="@+id/aadhaarTextInputLayout"
             android:layout_marginTop="1dp"
             android:layout_marginBottom="1dp"
             android:text="Enter Json"
             android:textSize="16sp"
             android:textStyle="bold" />
 
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/aadhaarTextInputLayout"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:hint="Enter Json">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/aadhaarEditText"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inputType="number"
-                android:maxLength="12" />
-
-        </com.google.android.material.textfield.TextInputLayout>
-
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/proceedButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/aadhaarTextInputLayout"
             android:layout_marginTop="10dp"
             android:gravity="center"
             android:text="Proceed"

diff --git a/app/src/main/java/com/example/abha_create_verify_android/CreateAbhaActivity.kt b/app/src/main/java/com/example/abha_create_verify_android/CreateAbhaActivity.kt
@@ -1,10 +1,9 @@
 package com.example.abha_create_verify_android
 
 import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.example.abha_create_verify_android.databinding.ActivityCreateAbhaBinding
-import com.example.abha_sample.LaunchActivity
 import com.example.abha_sample.SampleAbhaActivity
 
 class CreateAbhaActivity : AppCompatActivity() {