Merge branch 'dev' into cart

app/build.gradle

@@ -47,6 +47,8 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.3.1'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.2.1'
     implementation 'com.ethanhua:skeleton:1.1.2'
+    implementation 'com.github.florent37:expansionpanel:1.2.4'
+    implementation 'com.google.guava:guava:29.0-jre'
     implementation 'io.supercharge:shimmerlayout:2.1.0'
     implementation project(':library')
 

app/src/main/AndroidManifest.xml

@@ -6,6 +6,9 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <!--NFC PERMISSION AND FEATURE-->
+    <uses-permission android:name="android.permission.NFC"/>
+    <uses-feature android:name="android.hardware.nfc" />
 
     <uses-feature
         android:name="android.hardware.camera"

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

@@ -66,6 +66,7 @@ public class FormProductActivity extends AppCompatActivity {
     String locationPath = null;
     int idCategorySelected = 0;
     public int id = 0;
+    public String categoryName = "";
 
     private String[] permissions = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
             Manifest.permission.WRITE_EXTERNAL_STORAGE};
@@ -76,6 +77,7 @@ public class FormProductActivity extends AppCompatActivity {
     List<String> categorySelect = new ArrayList<>();
     FormCategory formCategory;
 
+    @RequiresApi(api = Build.VERSION_CODES.N)
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -139,6 +141,7 @@ public class FormProductActivity extends AppCompatActivity {
                 progressDialog.show();
                 CategoryServise categoryServise = client.Client(CategoryServise.class);
                 categoryServise.addCategory(categoryModels).enqueue(new Callback<DataResponse<CategoryModels>>() {
+                    @RequiresApi(api = Build.VERSION_CODES.N)
                     @Override
                     public void onResponse(Call<DataResponse<CategoryModels>> call, Response<DataResponse<CategoryModels>> response) {
                         if (response.body().getStatusData()){
@@ -185,7 +188,11 @@ public class FormProductActivity extends AppCompatActivity {
         HashSet<String> set = new HashSet<>();
         List<String> str = new ArrayList<>();
         categoryModels = new ArrayList<>();
+        if (productModelsIntent == null){
             str.add("SELECT CATEGORY");
+        }else{
+            str.add(getCategoryById(productModelsIntent.getIdProduct()));
+        }
         mainViewModels.getCategory().observe(this, listDataResponse -> {
             progressDialog.dismiss();
             for (CategoryModels cd: listDataResponse.getData()){
@@ -329,6 +336,23 @@ public class FormProductActivity extends AppCompatActivity {
         return id;
     }
 
+    private String getCategoryById(int s) {
+
+        CategoryServise categoryServise = client.Client(CategoryServise.class);
+        categoryServise.getCategoryId(s).enqueue(new Callback<DataResponse<CategoryModels>>() {
+            @Override
+            public void onResponse(Call<DataResponse<CategoryModels>> call, Response<DataResponse<CategoryModels>> response) {
+                categoryName = response.body().getData().getNameCategory();
+            }
+
+            @Override
+            public void onFailure(Call<DataResponse<CategoryModels>> call, Throwable t) {
+
+            }
+        });
+        return categoryName;
+    }
+
     private void openFile(){
         requestPermissions(permissions, REQUEST_PERMISSIONS);
         Intent i = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);

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

@@ -163,6 +163,7 @@ public class PaymentActivity extends AppCompatActivity {
         paymentResponses.add(new PaymentResponse("https://i.ibb.co/XCsdmmT/Bank-Mandiri-logo.png", "mandiri"));
         paymentResponses.add(new PaymentResponse("https://i.ibb.co/2n65nCT/bca-bank-central-asia.png", "bca"));
         paymentResponses.add(new PaymentResponse("https://i.ibb.co/RjJQT9K/BNI-logo.png", "bni"));
+        paymentResponses.add(new PaymentResponse("https://i.ibb.co/n1V3ZCf/Whats-App-Image-2020-09-01-at-14-50-13.jpg", "nfc"));
 
         PaymentAdapter adapter = new PaymentAdapter(paymentResponses, this);
         rvPayment.setAdapter(adapter);

app/src/main/java/com/yono/messeripos/api/service/CategoryServise.java

@@ -26,6 +26,9 @@ public interface CategoryServise {
     @GET(ApiHelper.VERSI_API_1+"category-name/{id}")
     Call<DataResponse<List<CategoryModels>>> getCategoryByName(@Path("id") String name);
 
+    @GET(ApiHelper.VERSI_API_1+"category/{id}")
+    Call<DataResponse<CategoryModels>> getCategoryId(@Path("id") int id);
+
     @POST(ApiHelper.VERSI_API_1+"category")
     Call<DataResponse<CategoryModels>> addCategory(@Body CategoryModels categoryModels);
 

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

@@ -40,7 +40,6 @@
                     android:nestedScrollingEnabled="false"
                     android:layout_marginTop="20dp"
                     tools:layout_editor_absoluteX="10dp"
-                    tools:listitem="@layout/item_checkout"
                     />
 
                 <com.google.android.material.textview.MaterialTextView
@@ -59,6 +58,11 @@
 
                     />
 
+                <ExpandableListView
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tvLabel">
+
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rvPayment"
                         android:layout_width="match_parent"
@@ -66,8 +70,9 @@
                         android:layout_margin="10dp"
                         android:nestedScrollingEnabled="false"
                         tools:layout_editor_absoluteX="10dp"
-                    tools:listitem="@layout/payment_list"
-                    android:layout_below="@id/tvLabel"/>
+                        tools:listitem="@layout/payment_list"/>
+
+                </ExpandableListView>
             </RelativeLayout>
         </ScrollView>