-Perbaikan layout data dokument yang sudah tidak valid after scan

app/src/main/java/com/fusi24/rfid/ui/scanresult/ScanResultActivity.java

@@ -103,10 +103,10 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
         adapter = new ProblemGroupAdapter(this);
 
         LinearLayoutManager layoutManager = new LinearLayoutManager(this);
-        binding.rvDocumentProblem.setLayoutManager(layoutManager);
-        binding.rvDocumentProblem.setItemAnimator(new DefaultItemAnimator());
-        binding.rvDocumentProblem.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL));
-        binding.rvDocumentProblem.setAdapter(adapter);
+        binding.rvGroupProblem.setLayoutManager(layoutManager);
+        binding.rvGroupProblem.setItemAnimator(new DefaultItemAnimator());
+        binding.rvGroupProblem.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL));
+        binding.rvGroupProblem.setAdapter(adapter);
     }
 
     private void loadingdata() {

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

@@ -120,7 +120,8 @@
                 android:layout_below="@id/ll_profile_bio"
                 android:layout_alignParentStart="true"
                 android:layout_alignParentEnd="true"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="16dp"
                 android:layout_marginStart="100dp"
                 android:layout_marginEnd="100dp"
                 android:background="@color/colorPrimary">
@@ -150,13 +151,13 @@
                 tools:text="Karyawan ini sudah login pada pukul 16.32 WIB" />
 
             <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/rv_document_problem"
+                android:id="@+id/rv_group_problem"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="8dp"
                 android:layout_below="@+id/tv_message"
-                tools:listitem="@layout/row_document"
-                tools:itemCount="2"/>
+                tools:listitem="@layout/row_group"
+                tools:itemCount="1"/>
 
             <Button
                 android:id="@+id/btn_home"
@@ -164,7 +165,7 @@
                 android:background="@color/btn_home"
                 android:layout_width="120dp"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/rv_document_problem"
+                android:layout_below="@id/rv_group_problem"
                 android:layout_alignParentStart="true"
                 android:layout_margin="16dp"
                 android:text="@string/label_home" />
@@ -175,7 +176,7 @@
                 android:background="@color/btn_scan_other"
                 android:layout_width="120dp"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/rv_document_problem"
+                android:layout_below="@+id/rv_group_problem"
                 android:layout_alignParentEnd="true"
                 android:layout_margin="16dp"
                 android:text="@string/label_scan_other" />

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

@@ -1,46 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/cv_document_problem"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@color/backgroundLayoutGreyDark"
-    android:padding="16dp"
-    android:layout_margin="16dp">
-
-    <TextView
-        android:id="@+id/tv_document_name"
-        style="@style/DocumentText"
-        android:layout_width="70dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="4dp"
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        tools:text="ID CARD KARYAWAN" />
-
-    <TextView
-        android:id="@+id/tv_document_status"
-        style="@style/DocumentText"
-        android:layout_width="55dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="4dp"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentEnd="true"
-        android:layout_centerVertical="true"
-        android:gravity="center"
-        tools:text="NOT FOUND" />
-
-    <TextView
-        android:id="@+id/tv_document_date"
-        style="@style/DocumentText"
-        android:layout_width="55dp"
+    android:elevation="12dp"
+    app:cardCornerRadius="6dp"
+    app:cardElevation="5dp"
+    app:cardUseCompatPadding="true">
+
+    <LinearLayout
+        android:id="@+id/layout_my_leaderboard"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="4dp"
-        android:layout_alignParentEnd="true"
-        android:layout_centerVertical="true"
-        tools:text="19 Nov 2019" />
+        android:layout_gravity="bottom|center_horizontal"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp">
+
+        <LinearLayout
+            android:layout_width="150dp"
+            android:layout_height="match_parent"
+            android:layout_marginStart="10dp"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_document_name"
+                style="@style/MyTextLabel"
+                android:layout_width="150dp"
+                android:layout_height="0dp"
+                android:layout_weight="3"
+                tools:text="KMPD - SIMPER MARINE CERTIFICATION" />
+
+            <TextView
+                android:id="@+id/tv_document_status"
+                style="@style/MyTextData"
+                android:layout_width="150dp"
+                android:layout_height="wrap_content"
+                tools:text="NOT ACTIVE" />
+
+        </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_marginEnd="15dp"
+                android:gravity="center_vertical"
+                android:layout_centerVertical="true"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/tv_document_date"
+                    style="@style/MyTextData"
+                    android:layout_width="135dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:scaleType="centerInside"
+                    android:src="@color/colorPrimary"
+                    tools:text="12 Nov 2020"/>
+
+            </LinearLayout>
+        </RelativeLayout>
 
-</RelativeLayout>
+    </LinearLayout>
+</androidx.cardview.widget.CardView>

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

@@ -5,46 +5,70 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <RelativeLayout
-        android:id="@+id/rl_group"
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/backgroundLayoutGrey"
-        android:padding="8dp"
-        android:layout_margin="16dp">
-
-        <TextView
-            android:id="@+id/tv_group_name"
-            style="@style/DocumentText"
-            android:layout_width="300dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="4dp"
-            android:layout_marginEnd="4dp"
-            android:layout_alignParentStart="true"
-            android:gravity="center_vertical"
-            tools:text="ID CARD KARYAWAN" />
-
-        <ImageView
-            android:id="@+id/iv_chevron"
-            android:layout_width="15dp"
-            android:layout_height="15dp"
-            android:paddingStart="0dp"
-            android:paddingEnd="0dp"
-            android:layout_alignParentEnd="true"
-            android:gravity="center_vertical"
-            app:srcCompat="@drawable/chevron_down"
-            android:contentDescription="@string/cd_image" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv_sub_group"
+        app:cardBackgroundColor="@color/backgroundLayoutGrey">
+
+        <RelativeLayout
+            android:id="@+id/rl_group"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/tv_group_name"
-            android:layout_marginTop="8dp"
-            android:visibility="gone"
-            tools:listitem="@layout/row_document"
-            tools:itemCount="2"/>
+            android:padding="4dp"
+            android:layout_margin="8dp">
+
+            <LinearLayout
+                android:id="@+id/ll_groups"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxWidth="300dp"
+                android:padding="1dp"
+                android:layout_marginStart="4dp"
+                android:layout_marginEnd="4dp"
+                android:layout_alignParentStart="true">
+
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_marginStart="4dp"
+                    android:layout_gravity="center_vertical"
+                    android:src="@drawable/ic_document_green"
+                    android:contentDescription="@string/cd_image" />
+
+                <TextView
+                    android:id="@+id/tv_group_name"
+                    style="@style/MyTextLabel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="8dp"
+                    android:gravity="center_vertical"
+                    tools:text="Izin Usaha" />
+
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/iv_chevron"
+                android:layout_width="15dp"
+                android:layout_height="15dp"
+                android:paddingStart="0dp"
+                android:paddingEnd="0dp"
+                android:layout_alignParentEnd="true"
+                android:gravity="center_vertical"
+                app:srcCompat="@drawable/chevron_down"
+                android:contentDescription="@string/cd_image" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_sub_group"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/ll_groups"
+                android:layout_marginTop="8dp"
+                android:visibility="gone"
+                tools:listitem="@layout/row_document"
+                tools:itemCount="2"/>
+
+        </RelativeLayout>
 
-    </RelativeLayout>
+    </androidx.cardview.widget.CardView>
 
 </ScrollView>

app/src/main/res/values/colors.xml

@@ -7,6 +7,8 @@
     <color name="colorRedDark">#C51616</color>
     <color name="colorGreenDark">#19771D</color>
     <color name="colorBlueDark">#195677</color>
+    <color name="greenSoft">#27AE5D</color>
+    <color name="greenDark">#249852</color>
 
     <color name="btn_home">#9CA7AE</color>
     <color name="btn_scan_other">#64A64B</color>

app/src/main/res/values/dimens.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- Standard Metrics -->
+    <dimen name="spacing_large">24dp</dimen>
+    <dimen name="spacing_normal">8dp</dimen>
+    <dimen name="spacing_micro">4dp</dimen>
+    <dimen name="padding_small">8dp</dimen>
+    <dimen name="padding_normal">16dp</dimen>
+    <dimen name="padding_large">24dp</dimen>
+
+    <!-- App Primary Text Sizes -->
+    <dimen name="app_text_size_small">12sp</dimen>
+    <dimen name="app_text_size_medium">14sp</dimen>
+    <dimen name="app_text_size_large">19sp</dimen>
+    <dimen name="app_text_size_xlarge">21sp</dimen>
+
+</resources>

app/src/main/res/values/styles.xml

@@ -42,6 +42,17 @@
         <item name="android:textColor">@color/colorBlack</item>
     </style>
 
+    <style name="MyTextLabel">
+        <item name="android:textSize">@dimen/app_text_size_medium</item>
+        <item name="android:textColor">@color/colorBlack</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="MyTextData">
+        <item name="android:textSize">@dimen/app_text_size_medium</item>
+        <item name="android:textColor">@color/grey</item>
+    </style>
+
     <style name="spinner_style">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>