fix login & welcome session

app/src/main/java/com/example/yourcashiertest/activities/LoginActivity.java

@@ -2,10 +2,9 @@ package com.example.yourcashiertest.activities;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
 
@@ -17,10 +16,6 @@ public class LoginActivity extends AppCompatActivity {
     TextInputEditText etUsername, etPassword;
     MaterialButton btnLogin;
     public static final String DATA_LOGIN = "DATA_LOGIN";
-    public static Boolean syarat;
-//    SharedPreferences sharedPreferences;
-//    public static final String SESS_SYARAT = "syarat";
-//    public static final String my_shared = "session_status";
     private PrefManager prefManager;
 
     @Override
@@ -30,10 +25,13 @@ public class LoginActivity extends AppCompatActivity {
 //        sharedPreferences = getSharedPreferences(my_shared, Context.MODE_PRIVATE);
 //        syarat = sharedPreferences.getBoolean(SESS_SYARAT, false);
         prefManager = new PrefManager(this);
+        Log.d("login1", ""+ prefManager.isFirstLogin());
         if (!prefManager.isFirstLogin()) {
+            Log.d("login2", ""+ prefManager.isFirstLogin());
             launchMain();
             finish();
         }
+        Log.d("login3", ""+ prefManager.isFirstLogin());
         etPassword = findViewById(R.id.etPassword);
         etUsername = findViewById(R.id.etUsername);
         btnLogin = findViewById(R.id.btnLogin);
@@ -47,9 +45,7 @@ public class LoginActivity extends AppCompatActivity {
             }else if(etPassword.getText().toString().length() < 8) {
                 etPassword.setError("Password length cannot be less than 8 characters");
             }else{
-                startActivity(new Intent(LoginActivity.this, MainActivity.class)
-                        .putExtra(DATA_LOGIN, etUsername.getText().toString()));
-                finish();
+                launchMain();
             }
         });
     }
@@ -63,7 +59,7 @@ public class LoginActivity extends AppCompatActivity {
     }
     public void launchMain() {
         prefManager.setFirstLogin(false);
-        startActivity(new Intent(LoginActivity.this, MainActivity.class));
+        startActivity(new Intent(LoginActivity.this, MainActivity.class).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP));
         finish();
     }
 }
\ No newline at end of file

app/src/main/java/com/example/yourcashiertest/activities/MainActivity.java

@@ -13,7 +13,6 @@ import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.widget.PopupMenu;
 import android.widget.Toast;
 
@@ -25,7 +24,6 @@ import com.example.yourcashiertest.entities.Product;
 import com.example.yourcashiertest.viewmodels.CartViewModel;
 import com.example.yourcashiertest.viewmodels.ProductViewModel;
 
-import java.util.ArrayList;
 import java.util.List;
 
 

app/src/main/java/com/example/yourcashiertest/activities/PrefManager.java

@@ -12,7 +12,7 @@ public class PrefManager {
     int PRIVATE_MODE = 0;
 
     // Shared preferences file name
-    private static final String PREF_NAME = "preferences";
+    private static final String PREF_NAME = "prefWelcome";
     private static final String IS_FIRST_WELCOME = "IsFirstWelcome";
     private static final String IS_FIRST_LOGIN = "IsFirstLogin";
 

app/src/main/java/com/example/yourcashiertest/activities/WelcomeActivity.java

@@ -6,6 +6,7 @@ import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.Html;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -36,11 +37,13 @@ public class WelcomeActivity extends AppCompatActivity {
 
         // mengecek lauch activity - sebelum memanggil setContentView()
         prefManager = new PrefManager(this);
+        Log.d("welcome1", ""+ prefManager.isFirstWelcome());
         if (!prefManager.isFirstWelcome()) {
+            Log.d("welcome2", ""+ prefManager.isFirstWelcome());
             launchHomeScreen();
             finish();
         }
-
+        Log.d("welcome3", ""+ prefManager.isFirstWelcome());
         // membuat transparan notifikasi
         if (Build.VERSION.SDK_INT >= 21) {
             getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);

app/src/main/res/layout/activity_cart.xml

@@ -53,13 +53,12 @@
             android:id="@+id/items"
             android:layout_width="60dp"
             android:layout_height="21dp"
-            android:layout_marginEnd="5dp"
+            android:layout_marginStart="14dp"
             android:gravity="top"
-            app:layout_constraintBottom_toBottomOf="@+id/cart"
-            app:layout_constraintStart_toEndOf="@+id/cart"
-            app:layout_constraintEnd_toStartOf="@+id/amount"
-            app:layout_constraintTop_toTopOf="@+id/cart"
-            app:layout_constraintVertical_bias="0.466" />
+            app:layout_constraintBottom_toTopOf="@id/rvCartList"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cart"
+            app:layout_constraintVertical_bias="0.375" />
 
         <View
             android:id="@+id/amount"