Updating PPLE Android samples - v.1.1.1

.gitignore

@@ -1,7 +1,7 @@
 .gradle/
 .DS_Store
 .java-version
-.idea
+.idea/
 
 libs/
 build/

javaapp/build.gradle.kts → JavaSimpleSample/build.gradle.kts

@@ -3,13 +3,13 @@ plugins {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
 
-    namespace = "com.scandit.shelf.javaapp"
+    namespace = "com.scandit.shelf.javasimplesample"
     defaultConfig {
-        applicationId = "com.scandit.shelf.javaapp"
-        minSdk = 21
-        targetSdk = 32
+        applicationId = "com.scandit.shelf.javasimplesample"
+        minSdk = 24
+        targetSdk = 33
         versionCode = 1
         versionName = "1.0"
     }
@@ -39,24 +39,24 @@ dependencies {
     implementation(files("libs/ScanditTextCaptureBase.aar"))
     implementation(files("libs/ScanditPriceLabel.aar"))
 
-    implementation("androidx.core:core-ktx:1.8.0")
+    implementation("androidx.core:core-ktx:1.9.0")
     implementation("androidx.startup:startup-runtime:1.1.1")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
-    implementation("com.google.code.gson:gson:2.9.0")
+    implementation("com.google.code.gson:gson:2.9.1")
     implementation("com.squareup.retrofit2:retrofit:2.9.0")
     implementation("com.squareup.retrofit2:converter-gson:2.9.0")
-    implementation("com.squareup.okhttp3:okhttp:4.9.3")
-    implementation("com.squareup.okhttp3:logging-interceptor:4.9.3")
-    implementation("androidx.appcompat:appcompat:1.4.2")
-    implementation("com.google.android.material:material:1.5.0")
+    implementation("com.squareup.okhttp3:okhttp:4.10.0")
+    implementation("com.squareup.okhttp3:logging-interceptor:4.10.0")
+    implementation("androidx.appcompat:appcompat:1.5.1")
+    implementation("com.google.android.material:material:1.7.0")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4")
     implementation("androidx.work:work-runtime-ktx:2.7.1")
     implementation("androidx.room:room-runtime:2.4.3")
     implementation("androidx.room:room-ktx:2.4.3")
-    implementation("androidx.security:security-crypto:1.1.0-alpha03")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.0")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.0")
+    implementation("androidx.security:security-crypto:1.1.0-alpha04")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01")
 }

javaapp/src/main/AndroidManifest.xml → JavaSimpleSample/src/main/AndroidManifest.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.scandit.shelf.javaapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/ic_pple_sample_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/ic_pple_sample_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.DebugApp">
         <activity

javaapp/src/main/java/com/scandit/shelf/javaapp/MainActivity.java → JavaSimpleSample/src/main/java/com/scandit/shelf/javasimplesample/MainActivity.java

@@ -12,16 +12,16 @@
  * limitations under the License.
  */
 
-package com.scandit.shelf.javaapp;
+package com.scandit.shelf.javasimplesample;
 
 import android.os.Bundle;
 
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.scandit.shelf.sdk.authentication.Authentication;
-import com.scandit.shelf.javaapp.ui.base.NavigationFragment;
-import com.scandit.shelf.javaapp.ui.login.LoginFragment;
-import com.scandit.shelf.javaapp.ui.storeselection.StoreSelectionFragment;
+import com.scandit.shelf.javasimplesample.ui.base.NavigationFragment;
+import com.scandit.shelf.javasimplesample.ui.login.LoginFragment;
+import com.scandit.shelf.javasimplesample.ui.storeselection.StoreSelectionFragment;
 
 /**
  * The main Activity that hosts all Fragments in the sample app.

javaapp/src/main/java/com/scandit/shelf/javaapp/catalog/CatalogStore.java → JavaSimpleSample/src/main/java/com/scandit/shelf/javasimplesample/catalog/CatalogStore.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.scandit.shelf.javaapp.catalog;
+package com.scandit.shelf.javasimplesample.catalog;
 
 import com.scandit.shelf.sdk.catalog.ProductCatalog;
 

javaapp/src/main/java/com/scandit/shelf/javaapp/ui/base/CameraPermissionFragment.java → JavaSimpleSample/src/main/java/com/scandit/shelf/javasimplesample/ui/base/CameraPermissionFragment.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.scandit.shelf.javaapp.ui.base;
+package com.scandit.shelf.javasimplesample.ui.base;
 
 import android.Manifest;
 import android.content.pm.PackageManager;

javaapp/src/main/java/com/scandit/shelf/javaapp/ui/base/NavigationFragment.java → JavaSimpleSample/src/main/java/com/scandit/shelf/javasimplesample/ui/base/NavigationFragment.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.scandit.shelf.javaapp.ui.base;
+package com.scandit.shelf.javasimplesample.ui.base;
 
 import android.os.Bundle;
 import android.view.MenuItem;
@@ -28,7 +28,7 @@
 import androidx.fragment.app.FragmentTransaction;
 
 import com.google.android.material.snackbar.Snackbar;
-import com.scandit.shelf.javaapp.R;
+import com.scandit.shelf.javasimplesample.R;
 
 /**
  * Base Fragment that handles all basic setup operations such as setting up the toolbar, setting

javaapp/src/main/java/com/scandit/shelf/javaapp/ui/login/LoginFragment.java → JavaSimpleSample/src/main/java/com/scandit/shelf/javasimplesample/ui/login/LoginFragment.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.scandit.shelf.javaapp.ui.login;
+package com.scandit.shelf.javasimplesample.ui.login;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -27,9 +27,9 @@
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.scandit.shelf.ShelfSdkVersion;
-import com.scandit.shelf.javaapp.R;
-import com.scandit.shelf.javaapp.ui.base.NavigationFragment;
-import com.scandit.shelf.javaapp.ui.storeselection.StoreSelectionFragment;
+import com.scandit.shelf.javasimplesample.R;
+import com.scandit.shelf.javasimplesample.ui.base.NavigationFragment;
+import com.scandit.shelf.javasimplesample.ui.storeselection.StoreSelectionFragment;
 
 /**
  * A Fragment that allows user to input email and password required to login to its organization.

javaapp/src/main/java/com/scandit/shelf/javaapp/ui/login/LoginViewModel.java → JavaSimpleSample/src/main/java/com/scandit/shelf/javasimplesample/ui/login/LoginViewModel.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.scandit.shelf.javaapp.ui.login;
+package com.scandit.shelf.javasimplesample.ui.login;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;

javaapp/src/main/java/com/scandit/shelf/javaapp/ui/pricecheck/PriceCheckFragment.java → JavaSimpleSample/src/main/java/com/scandit/shelf/javasimplesample/ui/pricecheck/PriceCheckFragment.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.scandit.shelf.javaapp.ui.pricecheck;
+package com.scandit.shelf.javasimplesample.ui.pricecheck;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -29,14 +29,15 @@
 import androidx.lifecycle.ViewModelProvider;
 
 import com.google.android.material.snackbar.Snackbar;
-import com.scandit.shelf.javaapp.R;
-import com.scandit.shelf.javaapp.ui.base.CameraPermissionFragment;
-import com.scandit.shelf.javaapp.ui.login.LoginFragment;
+import com.scandit.shelf.javasimplesample.R;
+import com.scandit.shelf.javasimplesample.ui.base.CameraPermissionFragment;
+import com.scandit.shelf.javasimplesample.ui.login.LoginFragment;
 import com.scandit.shelf.sdk.core.ui.CaptureView;
 import com.scandit.shelf.sdk.core.ui.style.Brush;
 import com.scandit.shelf.sdk.core.ui.viewfinder.RectangularViewfinder;
+import com.scandit.shelf.sdk.core.ui.viewfinder.ViewfinderConfiguration;
 import com.scandit.shelf.sdk.price.PriceCheckResult;
-import com.scandit.shelf.sdk.price.ui.PriceCheckOverlay;
+import com.scandit.shelf.sdk.price.ui.BasicPriceCheckOverlay;
 
 import java.util.Locale;
 
@@ -59,7 +60,6 @@ public static PriceCheckFragment newInstance(String storeName) {
     }
 
     private PriceCheckViewModel viewModel;
-    private CaptureView captureView;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -90,9 +90,19 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         String storeName = args == null ? "" : args.getString(ARG_STORE_NAME);
         ((TextView) rootView.findViewById(R.id.store_name)).setText(storeName);
 
-        captureView = rootView.findViewById(R.id.capture_view);
+        CaptureView captureView = rootView.findViewById(R.id.capture_view);
 
         observeLiveData();
+
+        viewModel.initPriceCheck(
+                captureView,
+                new BasicPriceCheckOverlay(
+                        solidBrush(requireContext(), R.color.transparentGreen),
+                        solidBrush(requireContext(), R.color.transparentRed),
+                        solidBrush(requireContext(), R.color.transparentGrey)
+                ),
+                new ViewfinderConfiguration(new RectangularViewfinder(), null)
+        );
     }
 
     @Override
@@ -104,16 +114,7 @@ public void onResume() {
 
     @Override
     public void onCameraPermissionGranted() {
-        viewModel.initPriceCheck(
-                captureView,
-                new PriceCheckOverlay(
-                        new RectangularViewfinder(),
-                        null,
-                        solidBrush(requireContext(), R.color.transparentGreen),
-                        solidBrush(requireContext(), R.color.transparentRed),
-                        solidBrush(requireContext(), R.color.transparentGrey)
-                )
-        );
+        viewModel.resumePriceCheck();
     }
 
     @Override

javaapp/src/main/java/com/scandit/shelf/javaapp/ui/pricecheck/PriceCheckViewModel.java → JavaSimpleSample/src/main/java/com/scandit/shelf/javasimplesample/ui/pricecheck/PriceCheckViewModel.java

@@ -12,18 +12,19 @@
  * limitations under the License.
  */
 
-package com.scandit.shelf.javaapp.ui.pricecheck;
+package com.scandit.shelf.javasimplesample.ui.pricecheck;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
-import com.scandit.shelf.javaapp.catalog.CatalogStore;
+import com.scandit.shelf.javasimplesample.catalog.CatalogStore;
 import com.scandit.shelf.sdk.authentication.Authentication;
 import com.scandit.shelf.sdk.catalog.ProductCatalog;
 import com.scandit.shelf.sdk.common.CompletionHandler;
 import com.scandit.shelf.sdk.core.ui.CaptureView;
+import com.scandit.shelf.sdk.core.ui.viewfinder.ViewfinderConfiguration;
 import com.scandit.shelf.sdk.price.PriceCheck;
 import com.scandit.shelf.sdk.price.PriceCheckListener;
 import com.scandit.shelf.sdk.price.PriceCheckResult;
@@ -52,7 +53,7 @@ public LiveData<Boolean> hasLogoutSucceeded() {
         return logoutSucceededLiveData;
     }
 
-    public void initPriceCheck(CaptureView view, PriceCheckOverlay overlay) {
+    public void initPriceCheck(CaptureView view, PriceCheckOverlay overlay, ViewfinderConfiguration viewfinderConfiguration) {
         // Get the ProductCatalog object previously stored in CatalogStore
         ProductCatalog catalog = CatalogStore.getInstance().getProductCatalog();
 
@@ -62,18 +63,24 @@ public void initPriceCheck(CaptureView view, PriceCheckOverlay overlay) {
         // Add a PriceCheckOverlay created in PriceCheckFragment.
         // By default, price labels are sought on the whole capture view. If you want to limit the scan area,
         // pass a non-null LocationSelection to PriceCheckOverlay's constructor.
-        priceCheck.setOverlay(overlay);
-        priceCheck.enable(new CompletionHandler<Unit>() {
-            @Override
-            public void success(Unit result) {
-                // Handle price checking enable success
-            }
+        priceCheck.addOverlay(overlay);
+        priceCheck.setViewfinderConfiguration(viewfinderConfiguration);
+    }
 
-            @Override
-            public void failure(@NonNull Exception error) {
-                // Gracefully handle price checking enable failure
-            }
-        });
+    public void resumePriceCheck() {
+        if (priceCheck != null) {
+            priceCheck.enable(new CompletionHandler<Unit>() {
+                @Override
+                public void success(Unit result) {
+                    // Handle price checking enable success
+                }
+
+                @Override
+                public void failure(@NonNull Exception error) {
+                    // Gracefully handle price checking enable failure
+                }
+            });
+        }
     }
 
     public void pausePriceCheck() {

javaapp/src/main/java/com/scandit/shelf/javaapp/ui/storeselection/StoreItemViewModel.java → JavaSimpleSample/src/main/java/com/scandit/shelf/javasimplesample/ui/storeselection/StoreItemViewModel.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.scandit.shelf.javaapp.ui.storeselection;
+package com.scandit.shelf.javasimplesample.ui.storeselection;
 
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;

javaapp/src/main/java/com/scandit/shelf/javaapp/ui/storeselection/StoreSelectionFragment.java → JavaSimpleSample/src/main/java/com/scandit/shelf/javasimplesample/ui/storeselection/StoreSelectionFragment.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.scandit.shelf.javaapp.ui.storeselection;
+package com.scandit.shelf.javasimplesample.ui.storeselection;
 
 import android.os.Bundle;
 import android.text.Editable;
@@ -34,9 +34,9 @@
 
 import com.google.android.material.textfield.TextInputEditText;
 import com.scandit.shelf.sdk.catalog.Store;
-import com.scandit.shelf.javaapp.R;
-import com.scandit.shelf.javaapp.ui.base.NavigationFragment;
-import com.scandit.shelf.javaapp.ui.pricecheck.PriceCheckFragment;
+import com.scandit.shelf.javasimplesample.R;
+import com.scandit.shelf.javasimplesample.ui.base.NavigationFragment;
+import com.scandit.shelf.javasimplesample.ui.pricecheck.PriceCheckFragment;
 
 import java.util.Collections;
 

javaapp/src/main/java/com/scandit/shelf/javaapp/ui/storeselection/StoreSelectionViewModel.java → JavaSimpleSample/src/main/java/com/scandit/shelf/javasimplesample/ui/storeselection/StoreSelectionViewModel.java

@@ -12,14 +12,14 @@
  * limitations under the License.
  */
 
-package com.scandit.shelf.javaapp.ui.storeselection;
+package com.scandit.shelf.javasimplesample.ui.storeselection;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
-import com.scandit.shelf.javaapp.catalog.CatalogStore;
+import com.scandit.shelf.javasimplesample.catalog.CatalogStore;
 import com.scandit.shelf.sdk.catalog.Catalog;
 import com.scandit.shelf.sdk.catalog.ProductCatalog;
 import com.scandit.shelf.sdk.catalog.Store;

javaapp/src/main/java/com/scandit/shelf/javaapp/ui/storeselection/StoreViewHolder.java → JavaSimpleSample/src/main/java/com/scandit/shelf/javasimplesample/ui/storeselection/StoreViewHolder.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.scandit.shelf.javaapp.ui.storeselection;
+package com.scandit.shelf.javasimplesample.ui.storeselection;
 
 import android.view.View;
 import android.widget.TextView;
@@ -22,7 +22,7 @@
 import androidx.lifecycle.MutableLiveData;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.scandit.shelf.javaapp.R;
+import com.scandit.shelf.javasimplesample.R;
 import com.scandit.shelf.sdk.catalog.Store;
 
 /**

javaapp/src/main/java/com/scandit/shelf/javaapp/ui/storeselection/StoresAdapter.java → JavaSimpleSample/src/main/java/com/scandit/shelf/javasimplesample/ui/storeselection/StoresAdapter.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.scandit.shelf.javaapp.ui.storeselection;
+package com.scandit.shelf.javasimplesample.ui.storeselection;
 
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
@@ -24,7 +24,7 @@
 import androidx.recyclerview.widget.ListAdapter;
 
 import com.scandit.shelf.sdk.catalog.Store;
-import com.scandit.shelf.javaapp.R;
+import com.scandit.shelf.javasimplesample.R;
 
 /**
  * A RecyclerView Adapter for displaying the list of Stores.