아이콘 수정

app/src/main/java/com/qtagger/Activity/AccountAdd.java

@@ -4,9 +4,13 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.constraintlayout.utils.widget.ImageFilterButton;
 import androidx.core.content.ContextCompat;
 
+import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.View;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
 
@@ -15,7 +19,9 @@ import com.qtagger.R;
 import com.qtagger.util.DataManager;
 
 public class AccountAdd extends AppCompatActivity {
+    Context context;
     private EditText editAccountId, editAccountName, editAccountDapt;
+    private Button button_save;
     private ImageFilterButton backBtn;
     DataManager dataManager = DataManager.getInstance();
 
@@ -23,11 +29,12 @@ public class AccountAdd extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_account_add);
-
+        context = this;
         editAccountId = (EditText) findViewById(R.id.textView_AccountId);
         editAccountName = (EditText) findViewById(R.id.textView_AccountName);
         editAccountDapt = (EditText) findViewById(R.id.textView_AccountDapt);
         backBtn = (ImageFilterButton) findViewById(R.id.imageFilterButton_Back);
+        button_save = findViewById(R.id.button_save);
 
         editAccountId.setOnFocusChangeListener(new View.OnFocusChangeListener() {
             @Override
@@ -42,6 +49,18 @@ public class AccountAdd extends AppCompatActivity {
                 }
             }
         });
+        editAccountId.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                checkData();
+            }
+            @Override
+            public void afterTextChanged(Editable s) {
+            }
+        });
 
         editAccountName.setOnFocusChangeListener(new View.OnFocusChangeListener() {
             @Override
@@ -56,6 +75,18 @@ public class AccountAdd extends AppCompatActivity {
                 }
             }
         });
+        editAccountName.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                checkData();
+            }
+            @Override
+            public void afterTextChanged(Editable s) {
+            }
+        });
 
         editAccountDapt.setOnFocusChangeListener(new View.OnFocusChangeListener() {
             @Override
@@ -70,10 +101,20 @@ public class AccountAdd extends AppCompatActivity {
                 }
             }
         });
+        editAccountDapt.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                checkData();
+            }
+            @Override
+            public void afterTextChanged(Editable s) {
+            }
+        });
 
-
-
-        findViewById(R.id.button_save).setOnClickListener(new View.OnClickListener() {
+        button_save.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 String acId = editAccountId.getText().toString();
@@ -101,6 +142,24 @@ public class AccountAdd extends AppCompatActivity {
                 finish();
             }
         });
-
     }
+
+    private void checkData(){
+        String acId = editAccountId.getText().toString();
+        String acName = editAccountName.getText().toString();
+        String acDapt = editAccountDapt.getText().toString();
+        if(acId.isEmpty() || acName.isEmpty() || acDapt.isEmpty())
+        {
+            button_save.setBackgroundResource(R.drawable.button_new_default_disable_background);
+            button_save.setTextColor(ContextCompat.getColor(context,R.color.defaultDisableTextColor));
+        }
+        else
+        {
+            button_save.setBackgroundResource(R.drawable.button_new_default_background);
+            button_save.setTextColor(Color.WHITE);
+        }
+    }
+
+
+
 }

app/src/main/java/com/qtagger/Activity/AccountModify.java

@@ -1,10 +1,15 @@
 package com.qtagger.Activity;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
 
+import android.content.Context;
 import android.content.Intent;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.provider.ContactsContract;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -18,19 +23,74 @@ import com.qtagger.util.DataManager;
 import java.util.List;
 
 public class AccountModify extends AppCompatActivity {
-TextView textAccountId;
+    Context context;
+    TextView textAccountId;
     EditText  editAccountName, editAccountDapt;
-Button btnModify;
+    Button button_save;
     AccountData findAccount = null;
+
     private DataManager dataManager = DataManager.getInstance();
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_account_modify);
+        context = this;
         textAccountId = (TextView)findViewById(R.id.textView_AccountId);
         editAccountName = (EditText)findViewById(R.id.textView_AccountName);
         editAccountDapt = (EditText)findViewById(R.id.textView_AccountDapt);
-        btnModify = (Button) findViewById(R.id.button_save);
+        button_save = (Button) findViewById(R.id.button_save);
+
+        editAccountName.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View v, boolean hasFocus) {
+
+                if(hasFocus)
+                {
+                    editAccountName.setBackgroundResource(R.drawable.account_edit_focus_background);
+                }
+                else{
+                    editAccountName.setBackgroundResource(R.drawable.account_edit_background);
+                }
+            }
+        });
+        editAccountName.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                checkData();
+            }
+            @Override
+            public void afterTextChanged(Editable s) {
+            }
+        });
+
+        editAccountDapt.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View v, boolean hasFocus) {
+
+                if(hasFocus)
+                {
+                    editAccountDapt.setBackgroundResource(R.drawable.account_edit_focus_background);
+                }
+                else{
+                    editAccountDapt.setBackgroundResource(R.drawable.account_edit_background);
+                }
+            }
+        });
+        editAccountDapt.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                checkData();
+            }
+            @Override
+            public void afterTextChanged(Editable s) {
+            }
+        });
 
         findViewById(R.id.imageFilterButton_Back).setOnClickListener(new View.OnClickListener() {
             @Override
@@ -51,17 +111,18 @@ Button btnModify;
                     break;
                 }
             }
-
             if(findAccount != null)
             {
                 textAccountId.setText(findAccount.getAccountId());
                 editAccountName.setText(findAccount.getAccountName());
                 editAccountDapt.setText(findAccount.getAccountDapt());
             }
-
         }
 
-        btnModify.setOnClickListener(new View.OnClickListener() {
+
+
+
+        button_save.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
 
@@ -90,4 +151,19 @@ Button btnModify;
 
 
     }
+
+    private void checkData(){
+        String acName = editAccountName.getText().toString();
+        String acDapt = editAccountDapt.getText().toString();
+        if( acName.isEmpty() || acDapt.isEmpty())
+        {
+            button_save.setBackgroundResource(R.drawable.button_new_default_disable_background);
+            button_save.setTextColor(ContextCompat.getColor(context,R.color.defaultDisableTextColor));
+        }
+        else
+        {
+            button_save.setBackgroundResource(R.drawable.button_new_default_background);
+            button_save.setTextColor(Color.WHITE);
+        }
+    }
 }

app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java

@@ -102,12 +102,18 @@ public class BarcodeFragment extends Fragment {
                         && !"NR".equals(barcode)
                 ) {
                     barcodeStr = barcode;
-
                     showCustomDialog();
                 }
             }
         });
 
+        view.findViewById(R.id.imageView2).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                barcodeReadData();
+            }
+        });
+
         // Inflate the layout for this fragment
         return view;
     }

app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java

@@ -7,6 +7,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.view.View;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
@@ -32,6 +33,8 @@ public class CommonNavigationView {
         TextView textId = activity.findViewById(R.id.textview_id);
         TextView textDapt = activity.findViewById(R.id.textview_dapt);
         TextView textName = activity.findViewById(R.id.textview_name);
+        DrawerLayout drawerLayout = (DrawerLayout) activity.findViewById(R.id.drawerLayout);
+        NavigationView navigationView = (NavigationView) activity.findViewById(R.id.navigationView);
 
         if(account == null)
         {
@@ -52,6 +55,7 @@ public class CommonNavigationView {
             public void onClick(View v) {
                 Intent intent = new Intent(activity.getApplicationContext(), DbSettingActivity.class);
                 activity.startActivity(intent);
+                drawerLayout.closeDrawer(navigationView,true);
             }
         });
         activity.findViewById(R.id.button_Upload).setOnClickListener(new View.OnClickListener() {
@@ -80,6 +84,7 @@ public class CommonNavigationView {
                         }
                     }
                 }).setNegativeButton("취소", null).show();
+                drawerLayout.closeDrawer(navigationView,true);
 
             }
         });
@@ -96,6 +101,7 @@ public class CommonNavigationView {
             public void onClick(View v) {
                 Intent intent = new Intent(activity.getApplicationContext(), AccountAdd.class);
                 activity.startActivity(intent);
+                drawerLayout.closeDrawer(navigationView,true);
             }
         });
         activity.findViewById(R.id.button_AccountModify).setOnClickListener(new View.OnClickListener() {
@@ -104,35 +110,30 @@ public class CommonNavigationView {
                 if(dataManager.loginAccount == null)
                 {
                     //알림 줄것
+                    Toast.makeText(activity, "계정 정보가 없습니다.", Toast.LENGTH_SHORT).show();
                 }
                 else
                 {
                     Intent intent = new Intent(activity.getApplicationContext(), AccountModify.class);
                     intent.putExtra("Id",dataManager.loginAccount.getId());
                     activity.startActivity(intent);
+                    drawerLayout.closeDrawer(navigationView,true);
                 }
             }
         });
         activity.findViewById(R.id.button_small_close).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                DrawerLayout drawerLayout = (DrawerLayout) activity.findViewById(R.id.drawerLayout);
-                NavigationView navigationView = (NavigationView) activity.findViewById(R.id.navigationView);
                 drawerLayout.closeDrawer(navigationView,true);
-
             }
         });
         activity.findViewById(R.id.button_Close).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                DrawerLayout drawerLayout = (DrawerLayout) activity.findViewById(R.id.drawerLayout);
-                NavigationView navigationView = (NavigationView) activity.findViewById(R.id.navigationView);
                 drawerLayout.closeDrawer(navigationView,true);
 
             }
         });
-
-
     }
 
 }

app/src/main/java/com/qtagger/Database/DBHelper.java

@@ -216,10 +216,13 @@ public class DBHelper extends SQLiteOpenHelper {
     }
 
     public void updateAccount(AccountData ac){
-        db.execSQL("Update Account set accountId ='"+ac.getAccountId()+"'"
+        db = getWritableDatabase();
+        String query = "Update Account set accountId ='"+ac.getAccountId()+"'"
                 +", accountName = '"+ac.getAccountName()+"'"
                 +", accountDapt = '"+ac.getAccountDapt()+"'"
-                +" where id = '"+ac.getId()+"';");
+                +" where id = '"+ac.getId()+"'";
+        db.execSQL(query);
+        db.close();
     }
 
     public void deleteAccount(AccountData ac){

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

@@ -9,7 +9,7 @@
                     <corners
                         android:radius="30dp" />
                     <padding
-                        android:left="10dp"
+                        android:left="20dp"
                         />
                     <stroke
                         android:width="1dp"

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

@@ -9,7 +9,7 @@
                     <corners
                         android:radius="30dp" />
                     <padding
-                        android:left="10dp"
+                        android:left="20dp"
                         />
                     <stroke
                         android:width="1dp"

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

@@ -1,106 +1,120 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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.AccountModify">
-    <View
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginTop="15dp"
-        android:background="#000000"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textViewAccountAccTitle" />
 
-    <TextView
-        android:id="@+id/textViewAccountAccTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="사용자 수정"
-        android:textAlignment="center"
-        android:textSize="24sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-    <androidx.constraintlayout.utils.widget.ImageFilterButton
-        android:id="@+id/imageFilterButton_Back"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="8dp"
-        android:background="#FFFFFF"
-        android:minWidth="48dp"
-        android:minHeight="48dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/back_arrow_5821" />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="65dp"
+        android:background="@color/defaultColor"
+        >
+        <TextView
+            android:id="@+id/textViewAccountAccTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="사용자 수정"
+            android:textColor="@color/white"
+            android:textAlignment="center"
+            android:textSize="24sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+        <androidx.constraintlayout.utils.widget.ImageFilterButton
+            android:id="@+id/imageFilterButton_Back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:background="@android:color/transparent"
+            android:minWidth="48dp"
+            android:minHeight="48dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/back_arrow_5821" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <TextView
-        android:id="@+id/textView_AccountId"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="64dp"
-        android:layout_marginEnd="24dp"
-        android:paddingLeft="5dp"
-        android:textSize="16sp"
-        android:text="사용자 아이디"
-        android:gravity="center_vertical"
-        android:minHeight="48dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textViewAccountAccTitle" />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        >
 
-    <EditText
-        android:id="@+id/textView_AccountName"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="132dp"
-        android:layout_marginEnd="24dp"
-        android:singleLine="true"
-        android:hint="이름을 입력해주세요"
-        android:minHeight="48dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textViewAccountAccTitle" />
+        <TextView
+            android:id="@+id/textView_AccountId"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="64dp"
+            android:layout_marginEnd="24dp"
+            android:background="@android:color/transparent"
+            android:gravity="center_vertical"
+            android:minHeight="48dp"
+            android:paddingLeft="20dp"
+            android:text="사용자 아이디"
+            android:singleLine="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <EditText
-        android:id="@+id/textView_AccountDapt"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="200dp"
-        android:layout_marginEnd="24dp"
-        android:singleLine="true"
-        android:hint="소속을 입력해주세요"
-        android:minHeight="48dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textViewAccountAccTitle" />
+        <EditText
+            android:id="@+id/textView_AccountName"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="132dp"
+            android:layout_marginEnd="24dp"
+            android:background="@drawable/account_edit_background"
+            android:hint="이름"
+            android:minHeight="48dp"
+            android:paddingLeft="20dp"
+            android:singleLine="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <EditText
+            android:id="@+id/textView_AccountDapt"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="200dp"
+            android:layout_marginEnd="24dp"
+            android:background="@drawable/account_edit_background"
+            android:hint="소속"
+            android:minHeight="48dp"
+            android:paddingLeft="20dp"
+            android:singleLine="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
 
 
-    <android.widget.Button
-        android:id="@+id/button_save"
-        android:layout_width="0dp"
-        android:layout_height="56dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="100dp"
-        android:layout_marginEnd="16dp"
-        android:text="수정"
-        android:background="@color/black"
-        android:textColor="#FFFFFF"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView_AccountDapt" />
+        <android.widget.Button
+            android:id="@+id/button_save"
+            android:layout_width="0dp"
+            android:layout_height="56dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="100dp"
+            android:layout_marginEnd="16dp"
+            android:text="수정"
+            android:background="@drawable/button_new_default_disable_background"
+            android:textColor="@color/defaultDisableTextColor"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView_AccountDapt" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>

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

@@ -24,13 +24,13 @@
 
         <ImageView
             android:id="@+id/imageview_navTab"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
+            android:layout_marginEnd="30dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/logo" />
+            app:srcCompat="@drawable/btn_menu_bl" />
 
         <Spinner
             android:id="@+id/spinner_account"

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

@@ -48,12 +48,12 @@
                 android:id="@+id/imageFilterButton_Setting"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
                 android:layout_marginEnd="16dp"
                 android:background="@android:color/transparent"
                 android:minWidth="32dp"
                 android:minHeight="32dp"
-                android:src="@drawable/setting_32"
+                android:src="@drawable/btn_menu_wt"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
         </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -24,11 +24,11 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
-                android:layout_marginTop="8dp"
                 android:background="@android:color/transparent"
                 android:minWidth="48dp"
                 android:minHeight="48dp"
                 android:src="@drawable/back_arrow_5821"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -50,12 +50,12 @@
                 android:id="@+id/imageFilterButton_Setting"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
                 android:layout_marginEnd="16dp"
                 android:background="@android:color/transparent"
                 android:minWidth="32dp"
                 android:minHeight="32dp"
-                android:src="@drawable/setting_32"
+                android:src="@drawable/btn_menu_wt"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
         </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -42,7 +42,7 @@
                 android:background="@android:color/transparent"
                 android:minWidth="32dp"
                 android:minHeight="32dp"
-                android:src="@drawable/setting_32"
+                android:src="@drawable/btn_menu_wt"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />