+ Hide input for ID Permit (Izin Masuk)

+ Change font for kategori Pekerjaan
+ Make Button Home and scan Other to stack in bottom screen device

app/src/main/java/com/fusi24/entryPermitScanner/ui/home/HomeActivity.java

@@ -12,8 +12,6 @@ import android.telephony.TelephonyManager;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -23,7 +21,6 @@ import androidx.core.app.ActivityCompat;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
 import com.fusi24.entryPermitScanner.BuildConfig;
 import com.fusi24.entryPermitScanner.R;
@@ -128,7 +125,9 @@ public class HomeActivity extends BaseActivity implements HomeView, StatusScanAd
         binding.refresh.setRefreshing(false);
         ActivityCompat.requestPermissions(this, Constant.PERMISSIONS_RFID, 1000);
 
-        entryPermitList = new ArrayList<>();
+        binding.llPermit.setVisibility(View.GONE);
+
+        //entryPermitList = new ArrayList<>();
         statusScanList = new ArrayList<>();
 
         scanAdapter = new StatusScanAdapter(this, this);
@@ -156,11 +155,11 @@ public class HomeActivity extends BaseActivity implements HomeView, StatusScanAd
             siteAdapter.notifyDataSetChanged();
         }
 
-        if (getSessionManager().getPermitList() != null) {
+        /*if (getSessionManager().getPermitList() != null) {
             entryPermitList.clear();
             entryPermitList.addAll(getSessionManager().getPermitList());
         }
-        setDataPermit();
+        setDataPermit();*/
 
         Gson gson = new Gson();
         System.out.println("Developer Gate : " + gson.toJson(getSessionManager().getGate()));
@@ -169,14 +168,15 @@ public class HomeActivity extends BaseActivity implements HomeView, StatusScanAd
     }
 
     private void getDataFromService(){
-        presenter.getEntryPermit();
+        //presenter.getEntryPermit();
         presenter.getStatusScan();
         presenter.getDataDevice(idDevice);
     }
 
     private void initEvent(){
 
-        binding.spinnerPermit.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        // Hide Permintaan dari User
+        /*binding.spinnerPermit.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 dataEntryPermit = (DataEntryPermit) parent.getItemAtPosition(position);
@@ -186,14 +186,14 @@ public class HomeActivity extends BaseActivity implements HomeView, StatusScanAd
             public void onNothingSelected(AdapterView<?> parent) {
                 dataEntryPermit = (DataEntryPermit) parent.getSelectedItem();
             }
-        });
+        });*/
 
         binding.btnScan.setOnClickListener(v -> {
 
-            if (binding.spinnerPermit.getSelectedItem() == null){
+            /*if (binding.spinnerPermit.getSelectedItem() == null){
                 Toast.makeText(this, "Data Permit Belum Terpilih", Toast.LENGTH_SHORT).show();
                 return;
-            }
+            }*/
 
             if (idCheckType == null){
                 Toast.makeText(this, "Status Scan Belum Terpilih", Toast.LENGTH_SHORT).show();
@@ -201,15 +201,14 @@ public class HomeActivity extends BaseActivity implements HomeView, StatusScanAd
             }
 
             Intent intent = new Intent(this, ScanActivity.class);
-            intent.putExtra(ScanActivity.ID_PERMIT, String.valueOf(dataEntryPermit.getId()));
+            //intent.putExtra(ScanActivity.ID_PERMIT, String.valueOf(dataEntryPermit.getId()));
+            intent.putExtra(ScanActivity.ID_PERMIT, "1"); // Hardcode ID Permit ==> 1 even UNUSEFUL
             intent.putExtra(ScanActivity.ID_DEVICE, idDevice);
             intent.putExtra(ScanActivity.ID_CHECK_TYPE, idCheckType);
             intent.putExtra(ScanActivity.CHECK_TYPE_NAME, checkTypeName);
             startActivity(intent);
         });
-
         binding.refresh.setOnRefreshListener(this::getDataFromService);
-
     }
 
     @Override
@@ -220,8 +219,8 @@ public class HomeActivity extends BaseActivity implements HomeView, StatusScanAd
 
     @Override
     public void showDataPermit(List<DataEntryPermit> dataEntryPermitList) {
-        binding.refresh.setRefreshing(false);
-        getSessionManager().setPermitList(dataEntryPermitList);
+        /*binding.refresh.setRefreshing(false);
+        getSessionManager().setPermitList(dataEntryPermitList);*/
     }
 
     @Override
@@ -251,11 +250,11 @@ public class HomeActivity extends BaseActivity implements HomeView, StatusScanAd
         loadingData();
     }
 
-    private void setDataPermit(){
+    /*private void setDataPermit(){
         ArrayAdapter<DataEntryPermit> adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item,
                 Stream.of(entryPermitList).filter(DataEntryPermit::getActive).collect(Collectors.toList()));
         binding.spinnerPermit.setAdapter(adapter);
-    }
+    }*/
 
     private void setDataStatusScan(Integer size){
         if (size <= 2){

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

@@ -1,195 +1,203 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
     tools:context=".ui.scanresult.ScanResultActivity">
 
-    <include layout="@layout/default_toolbar"/>
-
-    <ScrollView
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <include layout="@layout/default_toolbar"/>
 
-        <RelativeLayout
+        <ScrollView
+            android:id="@+id/scrollView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <TextView
-                android:id="@+id/tv_status_scan"
-                style="@style/CommonText"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="4dp"
-                android:gravity="center"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:background="@drawable/bg_blue_no_rad"
-                tools:text="Check Out Karyawan" />
-
-            <androidx.cardview.widget.CardView
-                android:id="@+id/cv_profile_bio"
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:elevation="12dp"
-                android:layout_below="@+id/tv_status_scan"
-                android:orientation="vertical"
-                app:cardCornerRadius="2dp"
-                app:cardUseCompatPadding="true">
+                android:layout_height="wrap_content">
 
-                <LinearLayout
-                    android:id="@+id/ll_profile_bio"
+                <TextView
+                    android:id="@+id/tv_status_scan"
+                    style="@style/CommonText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="4dp"
+                    android:gravity="center"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentEnd="true"
+                    android:background="@drawable/bg_blue_no_rad"
+                    tools:text="Check Out Karyawan" />
+
+                <androidx.cardview.widget.CardView
+                    android:id="@+id/cv_profile_bio"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:elevation="12dp"
                     android:layout_below="@+id/tv_status_scan"
-                    android:layout_margin="2dp"
                     android:orientation="vertical"
-                    android:padding="8dp">
+                    app:cardCornerRadius="2dp"
+                    app:cardUseCompatPadding="true">
 
                     <LinearLayout
+                        android:id="@+id/ll_profile_bio"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        tools:ignore="UselessParent">
-
-                        <ImageView
-                            android:id="@+id/iv_profile_image"
-                            android:layout_width="80dp"
-                            android:layout_height="80dp"
-                            android:layout_marginStart="0dp"
-                            android:layout_marginEnd="0dp"
-                            android:src="@drawable/ic_profile_default"
-                            android:contentDescription="@string/cd_image" />
+                        android:layout_below="@+id/tv_status_scan"
+                        android:layout_margin="2dp"
+                        android:orientation="vertical"
+                        android:padding="8dp">
 
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:id="@+id/tv_rfid_number"
-                                style="@style/MyTextLabel"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="8dp"
-                                android:gravity="start"
-                                tools:text="0009449244" />
-
-                            <TextView
-                                android:id="@+id/tv_profile_name"
-                                style="@style/MyTextLabel"
+                            android:orientation="horizontal"
+                            tools:ignore="UselessParent">
+
+                            <ImageView
+                                android:id="@+id/iv_profile_image"
+                                android:layout_width="80dp"
+                                android:layout_height="80dp"
+                                android:layout_marginStart="0dp"
+                                android:layout_marginEnd="0dp"
+                                android:src="@drawable/ic_profile_default"
+                                android:contentDescription="@string/cd_image" />
+
+                            <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_marginStart="8dp"
-                                android:gravity="start"
-                                tools:text="HADYAN EL AUFAR" />
-
-                            <TextView
-                                android:id="@+id/tv_structural_position"
-                                style="@style/MyTextData"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="8dp"
-                                android:gravity="start"
-                                tools:text="IT System Development Specialist" />
-
-                            <TextView
-                                android:id="@+id/tv_functional_position"
-                                style="@style/MyTextData"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="8dp"
-                                android:gravity="start"
-                                tools:text="Engineer/Specialist" />
-
-                            <TextView
-                                android:id="@+id/tv_company_name"
-                                style="@style/MyTextData"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="8dp"
-                                android:gravity="start"
-                                tools:text="PT. Berau Coal Energy" />
+                                android:orientation="vertical">
+
+                                <TextView
+                                    android:id="@+id/tv_rfid_number"
+                                    style="@style/MyTextLabel"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="8dp"
+                                    android:gravity="start"
+                                    tools:text="0009449244" />
+
+                                <TextView
+                                    android:id="@+id/tv_profile_name"
+                                    style="@style/MyTextLabel"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="8dp"
+                                    android:gravity="start"
+                                    tools:text="HADYAN EL AUFAR" />
+
+                                <TextView
+                                    android:id="@+id/tv_structural_position"
+                                    style="@style/MyTextData"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="8dp"
+                                    android:gravity="start"
+                                    tools:text="IT System Development Specialist" />
+
+                                <TextView
+                                    android:id="@+id/tv_functional_position"
+                                    style="@style/MyTextData"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="8dp"
+                                    android:gravity="start"
+                                    tools:text="Engineer/Specialist" />
+
+                                <TextView
+                                    android:id="@+id/tv_company_name"
+                                    style="@style/MyTextData"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="8dp"
+                                    android:gravity="start"
+                                    tools:text="PT. Berau Coal Energy" />
+
+                            </LinearLayout>
 
                         </LinearLayout>
 
                     </LinearLayout>
 
-                </LinearLayout>
+                </androidx.cardview.widget.CardView>
 
-            </androidx.cardview.widget.CardView>
-
-            <LinearLayout
-                android:id="@+id/ll_profile_status"
-                android:layout_width="160dp"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/cv_profile_bio"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:layout_marginTop="16dp"
-                android:layout_marginBottom="16dp"
-                android:layout_marginStart="100dp"
-                android:layout_marginEnd="100dp"
-                android:background="@color/greenPassed">
+                <LinearLayout
+                    android:id="@+id/ll_profile_status"
+                    android:layout_width="160dp"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/cv_profile_bio"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="16dp"
+                    android:layout_marginStart="100dp"
+                    android:layout_marginEnd="100dp"
+                    android:background="@color/greenPassed">
+
+                    <TextView
+                        android:id="@+id/tv_profile_status"
+                        style="@style/CommonText"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="8dp"
+                        android:gravity="center"
+                        tools:text="PASSED" />
+
+                </LinearLayout>
 
                 <TextView
-                    android:id="@+id/tv_profile_status"
+                    android:id="@+id/tv_message"
                     style="@style/CommonText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:textColor="@color/colorBlack"
+                    android:layout_below="@id/ll_profile_status"
+                    android:layout_margin="16dp"
                     android:padding="8dp"
                     android:gravity="center"
-                    tools:text="PASSED" />
-
-            </LinearLayout>
+                    android:visibility="gone"
+                    tools:text="Karyawan ini sudah login pada pukul 16.32 WIB" />
 
-            <TextView
-                android:id="@+id/tv_message"
-                style="@style/CommonText"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="@color/colorBlack"
-                android:layout_below="@id/ll_profile_status"
-                android:layout_margin="16dp"
-                android:padding="8dp"
-                android:gravity="center"
-                android:visibility="gone"
-                tools:text="Karyawan ini sudah login pada pukul 16.32 WIB" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                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_group"
-                tools:itemCount="1"/>
-
-            <Button
-                android:id="@+id/btn_home"
-                style="@style/ButtonCommon"
-                android:background="@color/btn_home"
-                android:layout_width="120dp"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/rv_group_problem"
-                android:layout_alignParentStart="true"
-                android:layout_margin="16dp"
-                android:text="@string/label_home" />
-
-            <Button
-                android:id="@+id/btn_scan_again"
-                style="@style/ButtonCommon"
-                android:background="@color/btn_scan_other"
-                android:layout_width="120dp"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/rv_group_problem"
-                android:layout_alignParentEnd="true"
-                android:layout_margin="16dp"
-                android:text="@string/label_scan_other" />
-        </RelativeLayout>
-
-    </ScrollView>
-
-</LinearLayout>
+                <androidx.recyclerview.widget.RecyclerView
+                    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_group"
+                    tools:itemCount="1"/>
+
+            </RelativeLayout>
+
+        </ScrollView>
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/btn_home"
+        style="@style/ButtonCommon"
+        android:background="@color/btn_home"
+        android:layout_width="120dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentBottom="true"
+        android:layout_margin="16dp"
+        android:text="@string/label_home" />
+
+    <Button
+        android:id="@+id/btn_scan_again"
+        style="@style/ButtonCommon"
+        android:background="@color/btn_scan_other"
+        android:layout_width="120dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_margin="16dp"
+        android:text="@string/label_scan_other" />
+
+</RelativeLayout>

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

@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
-        app:cardBackgroundColor="@color/backgroundLayoutGrey">
+        app:cardBackgroundColor="@color/backgroundLayoutGreySoft">
 
         <RelativeLayout
             android:id="@+id/rl_group"
@@ -39,7 +39,7 @@
 
                 <TextView
                     android:id="@+id/tv_group_name"
-                    style="@style/MyTextLabel"
+                    style="@style/MyTextData"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="8dp"

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

@@ -18,6 +18,7 @@
     <color name="backgroundInner">#FFFFFF</color>
     <color name="backgroundOuter">#F5F5F5</color>
     <color name="backgroundCanvas">#f2f2f9</color>
+    <color name="backgroundLayoutGreySoft">#EFEFF4</color>
     <color name="backgroundLayoutGrey">#E3E3E9</color>
     <color name="backgroundLayoutGreyDark">#B4B4B8</color>
     <color name="backgroundDocument">#E3E3E9</color>