From 2c160b853a9013a6bfbc074c4b9f585d7cbf43e6 Mon Sep 17 00:00:00 2001 From: Sakib Sami Date: Sun, 25 Sep 2022 15:00:22 +0300 Subject: [PATCH] - improvement --- .../storefront/storage/CacheStorage.kt | 4 +++ .../storefront/storage/ICacheStorage.kt | 1 + .../ui/activities/BarcodeScannerActivity.kt | 2 ++ .../ui/activities/SplashActivity.kt | 1 - .../storefront/ui/activities/StoreActivity.kt | 6 +++++ app/src/main/res/drawable/alternative_btn.xml | 20 +++++++++++++++ app/src/main/res/layout/activity_store.xml | 17 +++++++++++-- .../main/res/layout/fragment_order_list.xml | 1 + app/src/main/res/navigation/nav_graph.xml | 25 +------------------ 9 files changed, 50 insertions(+), 27 deletions(-) create mode 100644 app/src/main/res/drawable/alternative_btn.xml diff --git a/app/src/main/java/com/shopemaa/android/storefront/storage/CacheStorage.kt b/app/src/main/java/com/shopemaa/android/storefront/storage/CacheStorage.kt index aa9642e..1909b1a 100644 --- a/app/src/main/java/com/shopemaa/android/storefront/storage/CacheStorage.kt +++ b/app/src/main/java/com/shopemaa/android/storefront/storage/CacheStorage.kt @@ -21,4 +21,8 @@ class CacheStorage(ctx: Context) : ICacheStorage { editor.remove(key) return editor.commit() } + + override fun cleanAll(): Boolean { + return store.edit().clear().commit() + } } diff --git a/app/src/main/java/com/shopemaa/android/storefront/storage/ICacheStorage.kt b/app/src/main/java/com/shopemaa/android/storefront/storage/ICacheStorage.kt index 1cb2b9a..41c66b8 100644 --- a/app/src/main/java/com/shopemaa/android/storefront/storage/ICacheStorage.kt +++ b/app/src/main/java/com/shopemaa/android/storefront/storage/ICacheStorage.kt @@ -4,4 +4,5 @@ interface ICacheStorage { fun save(key: String, value: String): Boolean fun get(key: String): String fun delete(key: String): Boolean + fun cleanAll(): Boolean } diff --git a/app/src/main/java/com/shopemaa/android/storefront/ui/activities/BarcodeScannerActivity.kt b/app/src/main/java/com/shopemaa/android/storefront/ui/activities/BarcodeScannerActivity.kt index 6c5b6e6..bf117a8 100644 --- a/app/src/main/java/com/shopemaa/android/storefront/ui/activities/BarcodeScannerActivity.kt +++ b/app/src/main/java/com/shopemaa/android/storefront/ui/activities/BarcodeScannerActivity.kt @@ -94,6 +94,8 @@ class BarcodeScannerActivity : BaseActivity(), PermissionListener { && secret.key!!.isNotEmpty() && secret.secret!!.isNotEmpty() ) { val c = getCacheStorage(applicationContext) + c.cleanAll() + c.save(Constants.storeKeyLabel, secret.key!!) c.save(Constants.storeSecretLabel, secret.secret!!) diff --git a/app/src/main/java/com/shopemaa/android/storefront/ui/activities/SplashActivity.kt b/app/src/main/java/com/shopemaa/android/storefront/ui/activities/SplashActivity.kt index 9eae1f7..6081756 100644 --- a/app/src/main/java/com/shopemaa/android/storefront/ui/activities/SplashActivity.kt +++ b/app/src/main/java/com/shopemaa/android/storefront/ui/activities/SplashActivity.kt @@ -4,7 +4,6 @@ import android.annotation.SuppressLint import android.content.Intent import android.os.Bundle import android.util.Base64 -import android.util.Log import cn.pedant.SweetAlert.SweetAlertDialog import com.google.gson.Gson import com.shopemaa.android.storefront.R diff --git a/app/src/main/java/com/shopemaa/android/storefront/ui/activities/StoreActivity.kt b/app/src/main/java/com/shopemaa/android/storefront/ui/activities/StoreActivity.kt index cc4830f..739b0b1 100644 --- a/app/src/main/java/com/shopemaa/android/storefront/ui/activities/StoreActivity.kt +++ b/app/src/main/java/com/shopemaa/android/storefront/ui/activities/StoreActivity.kt @@ -2,6 +2,7 @@ package com.shopemaa.android.storefront.ui.activities import android.content.Intent import android.os.Bundle +import android.widget.Button import android.widget.ImageView import android.widget.TextView import androidx.lifecycle.lifecycleScope @@ -23,6 +24,7 @@ class StoreActivity : BaseActivity(), StoreView { private lateinit var storeLogo: ImageView private lateinit var storeName: TextView private lateinit var storeBrowseBtn: MaterialButton + private lateinit var storeRescanBtn: Button private lateinit var alertDialog: SweetAlertDialog @@ -40,6 +42,10 @@ class StoreActivity : BaseActivity(), StoreView { startActivity(Intent(applicationContext, HomeActivity::class.java)) finish() } + storeRescanBtn = findViewById(R.id.store_rescan_btn) + storeRescanBtn.setOnClickListener { + startActivity(Intent(this, BarcodeScannerActivity::class.java)) + } alertDialog = createLoader(this, "Loading...") diff --git a/app/src/main/res/drawable/alternative_btn.xml b/app/src/main/res/drawable/alternative_btn.xml new file mode 100644 index 0000000..5d9a25d --- /dev/null +++ b/app/src/main/res/drawable/alternative_btn.xml @@ -0,0 +1,20 @@ + + + + + + + + + diff --git a/app/src/main/res/layout/activity_store.xml b/app/src/main/res/layout/activity_store.xml index c36d20d..b814a97 100644 --- a/app/src/main/res/layout/activity_store.xml +++ b/app/src/main/res/layout/activity_store.xml @@ -31,7 +31,7 @@ android:layout_below="@id/store_welcome" android:layout_marginTop="10dp" android:gravity="center" - android:text="Welcome" + android:text="" android:textSize="32sp" android:textStyle="bold" /> @@ -39,9 +39,22 @@ android:id="@+id/store_browse_btn" android:layout_width="match_parent" android:layout_height="60dp" - android:layout_alignParentBottom="true" + android:layout_below="@+id/store_name" android:layout_marginLeft="20dp" + android:layout_marginTop="30dp" android:layout_marginRight="20dp" + android:background="@drawable/primary_btn" android:text="Browse" /> +