diff --git a/app/.gitignore b/app/.gitignore index aa724b7..607d7f3 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -13,3 +13,9 @@ .externalNativeBuild .cxx local.properties + +# Android build outputs +*.apk +*.aab +/build +/app/build diff --git a/app/release/LOREALBA-LP-V-3.2-22DEC025.apk b/app/release/LOREALBA-LP-V-3.2-22DEC025.apk deleted file mode 100644 index 70d1c5c..0000000 Binary files a/app/release/LOREALBA-LP-V-3.2-22DEC025.apk and /dev/null differ diff --git a/app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/BaAssessmentActivity.java b/app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/BaAssessmentActivity.java index 7ee7e77..6478fcb 100644 --- a/app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/BaAssessmentActivity.java +++ b/app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/BaAssessmentActivity.java @@ -1,73 +1,42 @@ package com.cpm.lorealbaautomation.dailyactivity; import android.annotation.SuppressLint; -import android.content.Context; -import android.content.Intent; import android.content.SharedPreferences; import android.graphics.Bitmap; -import android.os.Build; import android.os.Bundle; -import android.os.Handler; -import android.os.Looper; import android.util.Log; -import android.view.LayoutInflater; import android.view.MenuItem; -import android.view.View; -import android.view.ViewGroup; -import android.webkit.WebSettings; -import android.webkit.WebView; -import android.webkit.WebViewClient; import android.widget.ImageView; -import android.widget.ProgressBar; -import android.widget.TextView; - -import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; -import androidx.cardview.widget.CardView; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.cpm.lorealbaautomation.Database.Lorealba_Database; import com.cpm.lorealbaautomation.R; -import com.cpm.lorealbaautomation.constant.AlertandMessages; import com.cpm.lorealbaautomation.constant.CommonFunctions; import com.cpm.lorealbaautomation.constant.CommonString; import com.cpm.lorealbaautomation.delegates.PrefHelper; import com.cpm.lorealbaautomation.gsonGetterSetter.JourneyPlan; -import com.cpm.lorealbaautomation.gsonGetterSetter.MasterSurvey; - -import java.util.ArrayList; -import java.util.List; +import com.google.zxing.BarcodeFormat; +import com.journeyapps.barcodescanner.BarcodeEncoder; import java.util.Objects; -import im.delight.android.webview.AdvancedWebView; - public class BaAssessmentActivity extends AppCompatActivity { - private final Handler loaderHandler = new Handler(Looper.getMainLooper()); - private String username; - private String couter_code; + private ImageView qrImage; private Lorealba_Database db; JourneyPlan jcp_Object = new JourneyPlan(); - AdvancedWebView webView; - ProgressBar progressBar; - private Runnable showLoaderRunnable; - private boolean pageLoaded = false; @SuppressLint("MissingInflatedId") @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_ba_assessment); - progressBar = (ProgressBar) findViewById(R.id.progressBar); - webView = (AdvancedWebView) findViewById(R.id.webviewbaAssessment); SharedPreferences preferences = PrefHelper.getPrefs(this); String date = preferences.getString(CommonString.KEY_DATE, ""); - username = preferences.getString(CommonString.KEY_USERNAME, ""); + String username = preferences.getString(CommonString.KEY_USERNAME, ""); String counter_id = preferences.getString(CommonString.KEY_COUNTER_ID, ""); - couter_code = preferences.getString(CommonString.KEY_COUNTER_CODE, ""); + String couter_code = preferences.getString(CommonString.KEY_COUNTER_CODE, ""); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + qrImage = findViewById(R.id.qrImage); setSupportActionBar(toolbar); if (!CommonFunctions.isTablet(this)) { toolbar.setTitleTextAppearance(this, R.style.changestext_sizefor_mobile); @@ -78,12 +47,9 @@ public class BaAssessmentActivity extends AppCompatActivity { db.open(); jcp_Object = db.getBIDfromJCP(username, counter_id); setTitle("BA Assessment - " + date); - - if (CommonFunctions.checkNetIsAvailable(this)) { - loadWeb(); - } else { - AlertandMessages.showToastMsg(this, getString(R.string.nonetwork)); - } + String link = CommonString.BA_ASSESSMENT_URL + "c=" + couter_code + "&u=" + username; + Log.e("link", link); + generateQRCode(link); } @Override @@ -106,52 +72,23 @@ public class BaAssessmentActivity extends AppCompatActivity { @Override public void onBackPressed() { - if (webView.canGoBack()) { - webView.goBack(); - } else { - super.onBackPressed(); - this.finish(); - overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); + super.onBackPressed(); + this.finish(); + overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); + } + + private void generateQRCode(String text) { + try { + BarcodeEncoder barcodeEncoder = new BarcodeEncoder(); + Bitmap bitmap = barcodeEncoder.encodeBitmap( + text, + BarcodeFormat.QR_CODE, + 400, + 400 + ); + qrImage.setImageBitmap(bitmap); + } catch (Exception e) { + e.fillInStackTrace(); } } - - - @SuppressLint("SetJavaScriptEnabled") - private void loadWeb() { - WebSettings webSettings = webView.getSettings(); - webSettings.setJavaScriptEnabled(true); - webSettings.setDomStorageEnabled(true); - webSettings.setLoadWithOverviewMode(true); - webSettings.setUseWideViewPort(true); - webSettings.setSupportZoom(true); - webSettings.setBuiltInZoomControls(true); - webSettings.setDisplayZoomControls(false); - // Android 5+ mixed content - webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); - webView.loadUrl(CommonString.BA_ASSESSMENT_URL + "c=" + couter_code + "&u=" + username); - webView.setWebViewClient(new WebViewClient() { - - @Override - public void onPageStarted(WebView view, String url, Bitmap favicon) { - pageLoaded = false; - - showLoaderRunnable = () -> { - if (!pageLoaded) { - progressBar.setVisibility(View.VISIBLE); - } - }; - - // ⏳ Wait 400ms before showing loader - loaderHandler.postDelayed(showLoaderRunnable, 4000); - } - @Override - public void onPageFinished(WebView view, String url) { - pageLoaded = true; - - loaderHandler.removeCallbacks(showLoaderRunnable); - progressBar.setVisibility(View.GONE); - } - }); - - } } diff --git a/app/src/main/res/layout-sw600dp/content_ba_assessment.xml b/app/src/main/res/layout-sw600dp/content_ba_assessment.xml index c2ace31..932301f 100644 --- a/app/src/main/res/layout-sw600dp/content_ba_assessment.xml +++ b/app/src/main/res/layout-sw600dp/content_ba_assessment.xml @@ -4,29 +4,56 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".dailyactivity.BaAssessmentActivity" android:background="@color/grey_background" app:layout_behavior="@string/appbar_scrolling_view_behavior" + tools:context=".dailyactivity.BaAssessmentActivity" tools:showIn="@layout/activity_ba_assessment"> - + + app:layout_constraintEnd_toEndOf="parent"> - + + + - \ No newline at end of file + + + + + + + + + + diff --git a/app/src/main/res/layout/content_ba_assessment.xml b/app/src/main/res/layout/content_ba_assessment.xml index c2ace31..932301f 100644 --- a/app/src/main/res/layout/content_ba_assessment.xml +++ b/app/src/main/res/layout/content_ba_assessment.xml @@ -4,29 +4,56 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".dailyactivity.BaAssessmentActivity" android:background="@color/grey_background" app:layout_behavior="@string/appbar_scrolling_view_behavior" + tools:context=".dailyactivity.BaAssessmentActivity" tools:showIn="@layout/activity_ba_assessment"> - + + app:layout_constraintEnd_toEndOf="parent"> - + + + - \ No newline at end of file + + + + + + + + + + diff --git a/library/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties b/library/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties index 2a4f699..de31746 100644 --- a/library/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties +++ b/library/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Fri Dec 19 17:45:22 IST 2025 +#Tue Dec 30 12:37:22 IST 2025 com.androidbuts.multispinnerfilter.library-main-5\:/layout/activity_main.xml=D\:\\jeevanp_cpm_projects\\LorealBaProjects\\LorealBa-Latest-2024\\library\\build\\intermediates\\packaged_res\\release\\layout\\activity_main.xml com.androidbuts.multispinnerfilter.library-main-5\:/layout/alert_dialog_listview_search.xml=D\:\\jeevanp_cpm_projects\\LorealBaProjects\\LorealBa-Latest-2024\\library\\build\\intermediates\\packaged_res\\release\\layout\\alert_dialog_listview_search.xml com.androidbuts.multispinnerfilter.library-main-5\:/layout/item_listview_multiple.xml=D\:\\jeevanp_cpm_projects\\LorealBaProjects\\LorealBa-Latest-2024\\library\\build\\intermediates\\packaged_res\\release\\layout\\item_listview_multiple.xml