Merge branch 'cart' into dev

app/src/main/AndroidManifest.xml

@@ -30,6 +30,7 @@
             android:theme="@style/AppTheme.appbar" />
         <activity
             android:name=".LoginActivity"
+            android:windowSoftInputMode="adjustResize"
             android:theme="@style/AppTheme.appbar" />
         <activity
             android:name=".PaymentActivity"

app/src/main/java/com/yono/messeripos/LoginActivity.java

@@ -4,6 +4,7 @@ import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -101,6 +102,11 @@ public class LoginActivity extends AppCompatActivity {
         btnSignIn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                Uri data = LoginActivity.this.getIntent().getData();
+                if (data != null && data.isHierarchical()) {
+                    String uri = LoginActivity.this.getIntent().getDataString();
+                    Log.d("TAG", "onBackPressed: "+uri);
+                }
                 loginState = new LoginState(LoginActivity.this, mainViewModels);
                 loginState.setCancelable(false);
                 loginState.show(getSupportFragmentManager(), loginState.getTag());

app/src/main/java/com/yono/messeripos/MainActivity.java

@@ -6,6 +6,7 @@ import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -550,10 +551,4 @@ public class MainActivity extends AppCompatActivity {
             binding.pbLoading.setVisibility(View.GONE);
         }
     }
-
-    @Override
-    public void onBackPressed() {
-        super.onBackPressed();
-        finish();
-    }
 }
\ No newline at end of file

app/src/main/java/com/yono/messeripos/TransactionActivity.java

 package com.yono.messeripos;
 
+import android.os.Build;
 import android.os.Bundle;
 import android.os.PersistableBundle;
+import android.view.Window;
+import android.view.WindowManager;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
@@ -26,6 +29,11 @@ public class TransactionActivity extends AppCompatActivity {
         viewPager = findViewById(R.id.viewPager);
         tabLayout = findViewById(R.id.tabLayout);
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            Window w = getWindow();
+            w.setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS, WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+        }
+
         MaterialToolbar toolbars = findViewById(R.id.toolbar);
         setSupportActionBar(toolbars);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);

app/src/main/java/com/yono/messeripos/transactiontab/TransactionSuccess.java

 package com.yono.messeripos.transactiontab;
 
+import android.app.AlertDialog;
+import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ProgressBar;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.appbar.MaterialToolbar;
+import com.yono.messeripos.CartActivity;
+import com.yono.messeripos.HistoryActivity;
 import com.yono.messeripos.R;
+import com.yono.messeripos.adapter.TabAdapterTransaction;
+import com.yono.messeripos.adapter.TransactionAdapter;
+import com.yono.messeripos.models.MainViewModels;
+import com.yono.messeripos.models.PaymentsModels;
+import com.yono.messeripos.response.DataResponse;
+import com.yono.messeripos.utils.Utils;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class TransactionSuccess extends Fragment {
+    TransactionAdapter transactionAdapter;
+    PaymentsModels paymentsModels;
+    MainViewModels mainViewModels;
+    RecyclerView recyclerView;
+    Utils utils = new Utils();
+    ProgressBar loading;
 
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.activity_history, container, false);
+        View v = inflater.inflate(R.layout.activity_history, container, false);
+
+
+//        MaterialToolbar toolbars = v.findViewById(R.id.cAppBar);
+        recyclerView = v.findViewById(R.id.rvHistory);
+        loading = v.findViewById(R.id.loading);
+
+        loading.setVisibility(View.VISIBLE);
+//        recyclerView.addItemDecoration(utils.dividerItemDecoration(this));
+        transactionAdapter = new TransactionAdapter();
+        mainViewModels = new ViewModelProvider(this).get(MainViewModels.class);
+
+        mainViewModels.getAllTransactions().observe(getViewLifecycleOwner(), new Observer<DataResponse<List<PaymentsModels<String>>>>() {
+            @Override
+            public void onChanged(DataResponse<List<PaymentsModels<String>>> listDataResponse) {
+                ArrayList<PaymentsModels> newData = new ArrayList<>();
+                newData.addAll(listDataResponse.getData());
+                transactionAdapter.setTransactionAdapter(v.getContext(), newData);
+
+                loading.setVisibility(View.GONE);
+
+                Log.d("TAG", "onChanged: "+newData);
+
+                recyclerView.setLayoutManager(new LinearLayoutManager(v.getContext(),RecyclerView.VERTICAL,false));
+                recyclerView.setAdapter(transactionAdapter);
+            }
+        });
+
+        return v;
+
     }
 }

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

@@ -22,10 +22,10 @@
         android:id="@+id/cartEmptyText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Cart is empty!"
         android:layout_below="@id/cartEmpty"
         android:layout_centerInParent="true"
         android:textSize="30dp"
+        android:text="No item in cart :("
         android:textColor="#61333333"
         />
 

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

@@ -12,10 +12,10 @@
         android:layout_height="wrap_content"
         android:minHeight="?actionBarSize"
         app:tabGravity="fill"
-        app:tabIndicatorColor="@color/colorGreen"
+        app:tabIndicatorColor="@color/colorAccent"
         app:tabIndicatorHeight="4dp"
         app:tabTextColor="@color/colorWhite"
-        app:tabBackground="@drawable/gradient"
+        app:tabBackground="@color/colorPrimary"
         app:layout_constraintTop_toBottomOf="@id/toolbar"
         app:tabMode="fixed"/>
     

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

@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:elevation="0dp"
     android:paddingTop="20dp"
-    android:background="@drawable/gradient"
+    android:background="@color/colorPrimary"
     style="@style/Widget.MaterialComponents.Toolbar.Primary"
     xmlns:android="http://schemas.android.com/apk/res/android">