From c1bc64478c8cda49fa6833201fe0ca870a7daf08 Mon Sep 17 00:00:00 2001 From: Sultan Mustafijul Hoque Date: Wed, 6 Dec 2023 23:37:27 +0530 Subject: [PATCH] Initial commit --- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 3 ++- .../com/sultan/plantdatabse/MainActivity.java | 2 +- .../sultan/plantdatabse/WebViewActivity.java | 26 +++++++++++++++++++ app/src/main/res/layout/activity_main.xml | 15 ++++++++--- app/src/main/res/layout/activity_webview.xml | 8 ++++++ app/src/main/res/raw/nature_loading.json | 1 + app/src/main/res/raw/qr_scan_1.json | 1 + app/src/main/res/raw/qr_scan_big_1.json | 1 + app/src/main/res/values/strings.xml | 3 ++- settings.gradle | 2 +- 11 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 app/src/main/res/raw/nature_loading.json create mode 100644 app/src/main/res/raw/qr_scan_1.json create mode 100644 app/src/main/res/raw/qr_scan_big_1.json diff --git a/app/build.gradle b/app/build.gradle index 2ace0ae..13915c4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,6 +36,7 @@ dependencies { testImplementation 'junit:junit:4.13.2' implementation 'com.journeyapps:zxing-android-embedded:4.1.0' implementation 'com.karumi:dexter:6.2.2' + implementation 'com.airbnb.android:lottie:6.2.0' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2f103cc..25efb99 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,8 +13,9 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.PlantDatabse" + android:theme="@style/Theme.AppCompat.DayNight.NoActionBar" tools:targetApi="31"> + diff --git a/app/src/main/java/com/sultan/plantdatabse/MainActivity.java b/app/src/main/java/com/sultan/plantdatabse/MainActivity.java index e630826..b4121ac 100644 --- a/app/src/main/java/com/sultan/plantdatabse/MainActivity.java +++ b/app/src/main/java/com/sultan/plantdatabse/MainActivity.java @@ -42,7 +42,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe // of IntentIntegrator class // which is the class of QR library IntentIntegrator intentIntegrator = new IntentIntegrator(this); - intentIntegrator.setPrompt("Scan a barcode or QR Code"); + intentIntegrator.setPrompt(getString(R.string.scan_qr)); intentIntegrator.setOrientationLocked(true); intentIntegrator.setCaptureActivity(CustomScannerActivity.class); intentIntegrator.initiateScan(); diff --git a/app/src/main/java/com/sultan/plantdatabse/WebViewActivity.java b/app/src/main/java/com/sultan/plantdatabse/WebViewActivity.java index 4ea4af6..8cf706d 100644 --- a/app/src/main/java/com/sultan/plantdatabse/WebViewActivity.java +++ b/app/src/main/java/com/sultan/plantdatabse/WebViewActivity.java @@ -1,13 +1,19 @@ package com.sultan.plantdatabse; +import android.annotation.SuppressLint; import android.os.Bundle; +import android.view.View; import android.webkit.WebView; import android.webkit.WebViewClient; +import android.widget.Button; import androidx.appcompat.app.AppCompatActivity; +import com.google.zxing.integration.android.IntentIntegrator; + public class WebViewActivity extends AppCompatActivity { + @SuppressLint("SetJavaScriptEnabled") @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -20,7 +26,27 @@ public class WebViewActivity extends AppCompatActivity { WebView webView = findViewById(R.id.webView); webView.getSettings().setJavaScriptEnabled(true); webView.setWebViewClient(new WebViewClient()); + assert url != null; webView.loadUrl(url); + // Set an OnClickListener for the "Scan QR" button + Button scanAgainButton = findViewById(R.id.scanAgain); + scanAgainButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + // Handle button click, for example, initiate a new scan + initiateScan(); + } + }); } + + private void initiateScan() { + // Initialize the IntentIntegrator and start the scan + IntentIntegrator intentIntegrator = new IntentIntegrator(this); + intentIntegrator.setPrompt(getString(R.string.scan_qr)); + intentIntegrator.setOrientationLocked(true); + intentIntegrator.setCaptureActivity(CustomScannerActivity.class); + intentIntegrator.initiateScan(); + } + } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 6d27cb9..2adbfc8 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -13,6 +13,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_margin="10dp" + android:visibility="gone" android:text="messageContent"/> + android:layout_height="wrap_content" + android:visibility="gone"/> + +