收货与上架初始版本

.idea/deploymentTargetDropDown.xml

@@ -12,6 +12,6 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2021-12-22T02:41:44.052050900Z" />
+    <timeTargetWasSelectedWithDropDown value="2021-12-29T03:16:04.544963100Z" />
   </component>
 </project>

.idea/misc.xml

@@ -15,6 +15,8 @@
         <entry key="..\:/Users/oursdreams/AndroidStudioProjects/swms/app/src/main/res/layout/activity_menu.xml" value="0.27355072463768115" />
         <entry key="..\:/Users/oursdreams/AndroidStudioProjects/swms/app/src/main/res/layout/activity_picking.xml" value="0.27898550724637683" />
         <entry key="..\:/Users/oursdreams/AndroidStudioProjects/swms/app/src/main/res/layout/activity_piecework.xml" value="0.27355072463768115" />
+        <entry key="..\:/Users/oursdreams/AndroidStudioProjects/swms/app/src/main/res/layout/activity_putaway.xml" value="0.25885416666666666" />
+        <entry key="..\:/Users/oursdreams/AndroidStudioProjects/swms/app/src/main/res/layout/activity_receiving.xml" value="0.24427083333333333" />
         <entry key="..\:/Users/oursdreams/AndroidStudioProjects/swms/app/src/main/res/layout/activity_waybill_dispatch.xml" value="0.27355072463768115" />
         <entry key="..\:/Users/oursdreams/AndroidStudioProjects/swms/app/src/main/res/layout/dialog_picking_selected.xml" value="0.2798913043478261" />
         <entry key="..\:/Users/oursdreams/AndroidStudioProjects/swms/app/src/main/res/layout/dispatch_item_waybill_show.xml" value="0.2694746376811594" />

app/build.gradle

@@ -10,7 +10,7 @@ android {
         minSdk 28
         targetSdk 31
         versionCode 1
-        versionName "1.0.4"
+        versionName "1.0.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -66,8 +66,14 @@ dependencies {
     implementation 'com.squareup.retrofit2:converter-gson:2.6.2'//转换器
     implementation 'com.teprinciple:updateapputils:2.3.0'//自动更新
 
-    def dialogx_version = "0.0.43.beta13"
+    def dialogx_version = "0.0.43"
     implementation "com.github.kongzue.DialogX:DialogX:${dialogx_version}"//消息框组件
     implementation 'com.github.kongzue.DialogXSample:DatePicker:0.0.1.alpha4'//日期选择框扩展包依赖上述
     implementation "com.github.kongzue.DialogX:DialogXMIUIStyle:${dialogx_version}"//主题
+    implementation "com.github.kongzue.DialogX:DialogXMaterialYou:${dialogx_version}"
+
+    def room_version = "2.3.0"
+    implementation "androidx.room:room-runtime:$room_version"
+    annotationProcessor "androidx.room:room-compiler:$room_version"
+    implementation "androidx.room:room-rxjava2:$room_version"
 }

app/release/output-metadata.json

@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 1,
-      "versionName": "1.0.4",
+      "versionName": "1.0.6",
       "outputFile": "SWMS.apk"
     }
   ],

app/src/main/AndroidManifest.xml

@@ -18,6 +18,12 @@
         android:roundIcon="@mipmap/ic_logo"
         android:supportsRtl="true"
         android:theme="@style/Theme.Swms.NoActionBar">
+        <activity
+            android:name=".activity.ReceivingActivity"
+            android:exported="true" />
+        <activity
+            android:name=".activity.PutawayActivity"
+            android:exported="true" />
         <activity
             android:name=".activity.PickingActivity"
             android:exported="true" />

app/src/main/java/com/baoshi/swms/activity/PickingActivity.java

@@ -8,11 +8,14 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.media.MediaPlayer;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.os.VibrationEffect;
 import android.os.Vibrator;
 import android.text.Html;
 import android.text.InputType;
 import android.util.DisplayMetrics;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.WindowManager;
@@ -44,6 +47,7 @@ import com.kongzue.dialogx.dialogs.TipDialog;
 import com.kongzue.dialogx.dialogs.WaitDialog;
 import com.kongzue.dialogx.interfaces.OnBindView;
 import com.kongzue.dialogx.interfaces.OnDialogButtonClickListener;
+import com.kongzue.dialogx.style.MaterialStyle;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -85,6 +89,7 @@ public class PickingActivity extends AppCompatActivity implements View.OnKeyList
     private MediaPlayer mediaPlayerErr;
     private Vibrator vibrator;
     private boolean lockStatus;
+    private String type;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -179,6 +184,8 @@ public class PickingActivity extends AppCompatActivity implements View.OnKeyList
      * 询问是否获取新任务
      * */
     private void inquiryTaskStart() {
+        picking = null;
+        pickingItem = null;
         MessageDialog.show("宝时好拣单", "是否获取单据任务", "获取","返回").setOkButton(new OnDialogButtonClickListener<MessageDialog>() {
             @Override
             public boolean onClick(MessageDialog baseDialog, View v) {
@@ -244,7 +251,9 @@ public class PickingActivity extends AppCompatActivity implements View.OnKeyList
      * */
     private void getTask() {
         WaitDialog.show("任务获取中~");
-        String type = ((RadioButton)findViewById(ratio.getCheckedRadioButtonId())).getText().toString();
+        if (type==null){
+            type = ((RadioButton)findViewById(ratio.getCheckedRadioButtonId())).getText().toString();
+        }
         SwmsSubscribe.getPickingTask(type, new SwmsHandlerCallback<PickingDto>() {
             @Override
             public void onSuccess(PickingDto result) {
@@ -271,11 +280,15 @@ public class PickingActivity extends AppCompatActivity implements View.OnKeyList
      * 放弃任务
      * */
     private void giveUpTask(){
+        if(picking==null || picking.getCode()==null){
+            TipDialog.show("任务取消成功！",WaitDialog.TYPE.SUCCESS,2500);
+            return;
+        }
         WaitDialog.show("任务取消中...");
         SwmsSubscribe.giveUpTask(picking.getCode(), new SwmsHandlerCallback<Boolean>() {
             @Override
             public void onSuccess(Boolean result) {
-                super.onSuccess(result);
+                TipDialog.show("任务取消成功！",WaitDialog.TYPE.SUCCESS,2500);
                 clearTask();
             }
             @Override
@@ -291,7 +304,20 @@ public class PickingActivity extends AppCompatActivity implements View.OnKeyList
     private void handlerTask(PickingDto pickingDto){
         picking = pickingDto.getTask();
         if (picking==null){
-            TipDialog.show("暂无拣货任务，请稍后尝试!", WaitDialog.TYPE.WARNING);
+            MessageDialog.build().setTitle("暂无拣货任务").setMessage("是否尝试重新获取？").setOkButton("重新获取").setCancelButton("退出")
+            .setOkButtonClickListener(new OnDialogButtonClickListener<MessageDialog>() {
+                @Override
+                public boolean onClick(MessageDialog baseDialog, View v) {
+                    getTask();
+                    return false;
+                }
+            }).setCancelButtonClickListener(new OnDialogButtonClickListener<MessageDialog>() {
+                @Override
+                public boolean onClick(MessageDialog baseDialog, View v) {
+                    finish();
+                    return false;
+                }
+            }).setStyle(MaterialStyle.style()).show();
             return;
         }
         pickingNumber.setUserBeenWorkCount(pickingDto.getTodayWorkNumber());
@@ -514,6 +540,7 @@ public class PickingActivity extends AppCompatActivity implements View.OnKeyList
                 lock.setImageResource(R.drawable.ic__4gf_lock);
                 barcode.setInputType(InputType.TYPE_NULL);
             }
+            lockStatus = !lockStatus;
         }
         if (v.getId()==R.id.give_up){
             MessageDialog.show("任务取消", "确定要放弃该任务吗？", "确定").setOkButtonClickListener(new OnDialogButtonClickListener<MessageDialog>() {
@@ -641,7 +668,7 @@ public class PickingActivity extends AppCompatActivity implements View.OnKeyList
             return;
         }
         if (verifyNumber.getText().toString().isEmpty()){
-            TipDialog.show("真实拣货数量未填写！",WaitDialog.TYPE.ERROR);
+            TipDialog.show("真实拣货数量未填写！",WaitDialog.TYPE.ERROR,2000);
             return;
         }
         //更新当前数据
@@ -707,8 +734,8 @@ public class PickingActivity extends AppCompatActivity implements View.OnKeyList
         SwmsSubscribe.picking(list, picking.getCode(), btn.getText().toString().equals(BTN_TEXT_BEFORE), new SwmsHandlerCallback<Boolean>() {
             @Override
             public void onSuccess(Boolean result) {
-                super.onSuccess(result);
                 if (btn.getText().toString().equals(BTN_TEXT)){
+                    WaitDialog.dismiss();
                     //向下加载库位信息
                     completeLoad();
                 }else{

app/src/main/java/com/baoshi/swms/activity/PutawayActivity.java

@@ -0,0 +1,17 @@
+package com.baoshi.swms.activity;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+
+import com.baoshi.swms.R;
+
+public class PutawayActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_putaway);
+        getWindow().setStatusBarColor(getResources().getColor(R.color.yellowGold,null));
+    }
+}

app/src/main/java/com/baoshi/swms/activity/ReceivingActivity.java

@@ -0,0 +1,17 @@
+package com.baoshi.swms.activity;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+
+import com.baoshi.swms.R;
+
+public class ReceivingActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_receiving);
+        getWindow().setStatusBarColor(getResources().getColor(R.color.yellowGold,null));
+    }
+}

app/src/main/java/com/baoshi/swms/net/constant/SwmsConstant.java

@@ -7,7 +7,7 @@ package com.baoshi.swms.net.constant;
  * @date 2021/12/21 15:56
  */
 public class SwmsConstant {
-    public static final String BASE_URL = "http://192.168.7.12:8116/";
+    public static final String BASE_URL = "https://device.baoshi56.com/";
     public static final String CACHE_NAME = "swms_cache_channel";
     public static final int DEFAULT_CONNECT_TIMEOUT = 3;
     public static final int DEFAULT_WRITE_TIMEOUT = 3;

app/src/main/java/com/baoshi/swms/room/AppDatabase.java

@@ -0,0 +1,26 @@
+package com.baoshi.swms.room;
+
+import android.content.Context;
+
+import androidx.room.Database;
+import androidx.room.Room;
+import androidx.room.RoomDatabase;
+
+/**
+ * ROOM数据库构建器
+ *
+ * @author Zhendong Zhou
+ * @date 2021/12/29 15:47
+ */
+/*@Database(entities = {}, version = 1,exportSchema = false)*/
+public abstract class AppDatabase extends RoomDatabase{
+    private static final String DB_NAME = "swmsApplication.db";
+    private static volatile AppDatabase instance;
+
+    public static synchronized AppDatabase getInstance(Context context){
+        if (instance==null){
+            instance = Room.databaseBuilder(context.getApplicationContext(), AppDatabase.class, DB_NAME).build();
+        }
+        return instance;
+    }
+}

app/src/main/java/com/baoshi/swms/util/DateUtil.java

@@ -5,6 +5,7 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
+import java.util.TimeZone;
 
 /**
  * 时间处理工具类
@@ -22,7 +23,8 @@ public class DateUtil {
         if (date.isEmpty()){
             return null;
         }
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat sdf = new SimpleDateFormat(DATE_DATE_TIME);
+        sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
         try {
             return sdf.parse(date);
         } catch (ParseException e) {

app/src/main/res/drawable/ic_putaway.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M1022.4,714.8c-0.3,-1.5 0.2,-3.1 -0.3,-4.6L904.6,325.6c-14.5,-53.5 -65.6,-90.9 -124.2,-90.9h-39.3c-23.6,0 -42.7,19.1 -42.7,42.7s19.1,42.7 42.7,42.7h39.3c19.8,0 37.4,11.8 42.2,29.2l101,330.8L745.9,680.1c-1.2,0 -2.1,0.6 -3.2,0.7 -12.4,-1.8 -25.9,1.8 -35.7,11.4l-43.2,42c-8.2,8 -20,12.6 -32.5,12.6L398.5,746.8c-11.4,0 -22.5,-4 -30.6,-10.8L339,711.4c-5.7,-4.9 -11.8,-9.1 -18.2,-12.9 -7.7,-10.8 -19.8,-18.3 -34.1,-18.3L100.3,680.2l101.4,-332c4.4,-16.2 22,-28 41.9,-28h48c23.6,0 42.7,-19.1 42.7,-42.7s-19.1,-42.7 -42.7,-42.7h-48c-58.6,0 -109.7,37.4 -123.8,89.6L1.9,710.2c-0.5,1.5 0,3.1 -0.3,4.6 -0.5,2.6 -1.6,5.1 -1.6,7.8v158.9c0,66.8 57.5,121.1 128.2,121.1h767.5c70.7,0 128.2,-54.3 128.2,-121.1L1023.9,722.7c0.1,-2.8 -1,-5.2 -1.5,-7.9zM938.7,881.6c0,19.7 -19.2,35.8 -42.9,35.8L128.2,917.4c-23.7,0 -42.9,-16 -42.9,-35.8L85.3,765.4h167.8c11.4,0 22.6,3.9 30.6,10.8l28.9,24.6c23.6,20.2 54.1,31.2 86,31.2h232.8c34.5,0 68,-13.4 92,-36.8l30.7,-29.9h184.5v116.3z"
+      android:fillColor="#1296db"/>
+  <path
+      android:pathData="M409.7,183.9l60.4,-43.5v264.9c0,23.6 19.1,42.7 42.7,42.7s42.7,-19.1 42.7,-42.7V140.4l60.4,43.6c7.5,5.4 16.3,8 24.9,8 13.2,0 26.3,-6.2 34.7,-17.7 13.8,-19.1 9.5,-45.8 -9.7,-59.6L554.2,34.4c-24,-17.5 -59,-17.4 -83,0l-111.5,80.4c-19.1,13.8 -23.4,40.5 -9.6,59.5 13.8,19.1 40.5,23.5 59.6,9.6z"
+      android:fillColor="#1296db"/>
+</vector>

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

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activity.PutawayActivity">
+    <FrameLayout
+        android:background="@color/yellowGold"
+        android:layout_width="match_parent"
+        android:layout_height="50dp">
+        <ImageView
+            android:id="@+id/back"
+            android:layout_marginTop="9dp"
+            android:layout_gravity="start"
+            android:layout_marginStart="9dp"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:src="@drawable/ic_baseline_chevron_left_24"/>
+        <TextView
+            android:layout_gravity="center"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            android:text="宝时快上"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+        <ImageView
+            android:id="@+id/all_ope"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="16dp"
+            android:layout_gravity="end"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_putaway"/>
+        <TextView
+            android:id="@+id/all_ope_t"
+            android:text="一键全上"
+            android:layout_marginTop="30dp"
+            android:textColor="@color/blue_light"
+            android:textSize="11sp"
+            android:layout_gravity="end"
+            android:layout_marginEnd="10dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </FrameLayout>
+</LinearLayout>

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

@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".activity.ReceivingActivity">
+    <FrameLayout
+        android:background="@color/yellowGold"
+        android:layout_width="match_parent"
+        android:layout_height="50dp">
+        <ImageView
+            android:id="@+id/back"
+            android:layout_marginTop="9dp"
+            android:layout_gravity="start"
+            android:layout_marginStart="9dp"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:src="@drawable/ic_baseline_chevron_left_24"/>
+        <TextView
+            android:layout_gravity="center"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            android:text="宝时丰收"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </FrameLayout>
+    <LinearLayout
+        android:divider="@drawable/border_shape"
+        android:showDividers="middle"
+        android:background="@drawable/border"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:padding="2dp"/>
+    </LinearLayout>
+    <LinearLayout
+        android:divider="@drawable/border_shape"
+        android:showDividers="middle"
+        android:background="@drawable/border"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:padding="2dp"/>
+    </LinearLayout>
+    <LinearLayout
+        android:divider="@drawable/border_shape"
+        android:showDividers="middle"
+        android:background="@drawable/border"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:padding="2dp"/>
+    </LinearLayout>
+    <LinearLayout
+        android:divider="@drawable/border_shape"
+        android:showDividers="middle"
+        android:background="@drawable/border"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:padding="2dp"/>
+    </LinearLayout>
+    <LinearLayout
+        android:divider="@drawable/border_shape"
+        android:showDividers="middle"
+        android:background="@drawable/border"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:padding="2dp"/>
+    </LinearLayout>
+    <LinearLayout
+        android:divider="@drawable/border_shape"
+        android:showDividers="middle"
+        android:background="@drawable/border"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:padding="2dp"/>
+    </LinearLayout>
+    <LinearLayout
+        android:divider="@drawable/border_shape"
+        android:showDividers="middle"
+        android:background="@drawable/border"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:padding="2dp"/>
+    </LinearLayout>
+    <LinearLayout
+        android:divider="@drawable/border_shape"
+        android:showDividers="middle"
+        android:background="@drawable/border"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:padding="2dp"/>
+    </LinearLayout>
+    <LinearLayout
+        android:divider="@drawable/border_shape"
+        android:showDividers="middle"
+        android:background="@drawable/border"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:padding="2dp"/>
+    </LinearLayout>
+    <LinearLayout
+        android:divider="@drawable/border_shape"
+        android:showDividers="middle"
+        android:background="@drawable/border"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:padding="2dp"/>
+    </LinearLayout>
+    <LinearLayout
+        android:divider="@drawable/border_shape"
+        android:showDividers="middle"
+        android:background="@drawable/border"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:padding="2dp"/>
+    </LinearLayout>
+    <LinearLayout
+        android:divider="@drawable/border_shape"
+        android:showDividers="middle"
+        android:background="@drawable/border"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:padding="2dp"/>
+    </LinearLayout>
+    <LinearLayout
+        android:divider="@drawable/border_shape"
+        android:showDividers="middle"
+        android:background="@drawable/border"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:padding="2dp"/>
+    </LinearLayout>
+    <LinearLayout
+        android:divider="@drawable/border_shape"
+        android:showDividers="middle"
+        android:background="@drawable/border"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:padding="2dp"/>
+    </LinearLayout>
+    <LinearLayout
+        android:divider="@drawable/border_shape"
+        android:showDividers="middle"
+        android:background="@drawable/border"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:padding="2dp"/>
+    </LinearLayout>
+</LinearLayout>

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

@@ -18,4 +18,6 @@
     <color name="light_green">#90EE90</color>
     <color name="red">#FF0000</color>
     <color name="success">#2FA360</color>
+    <color name="yellowGold">#FFC000</color>
+    <color name="blue_light">#1296db</color>
 </resources>