调整ui

app/src/main/java/com/tool/applockpro/ApplockSkin.java

@@ -47,6 +47,8 @@ public class ApplockSkin extends Application {
     private static final String TOP_KEY = "a32d537b2e12a9fcabe2f2fe77628864c";
     private static final String TOP_DEBUG = "5c12401a5c59afe9a3ac946dd22ae5f1fecd8c1c";
     public static List<ATInterstitial> ads;
+
+    public static   String TAG = "LOCK_APP----------";
     @Override
     public void onCreate() {
         super.onCreate();

app/src/main/java/com/tool/applockpro/activity/PermissionActivity.java

@@ -33,14 +33,14 @@ public class PermissionActivity extends AppCompatActivity {
 
 
 
-        binding.step2.setOnClickListener(new View.OnClickListener() {
+        binding.step2Text.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent usageAccessIntent = new Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS);
                 startActivity(usageAccessIntent);
             }
         });
-        binding.step1.setOnClickListener(new View.OnClickListener() {
+        binding.step1Text.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent overlayIntent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
@@ -62,8 +62,8 @@ public class PermissionActivity extends AppCompatActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        binding.step1.setSelected(Mytools.hasOverlayPermission(this));
+        binding.step1Text.setSelected(Mytools.hasOverlayPermission(this));
-        binding.step2.setSelected(Mytools.hasUsagePermission(this));
+        binding.step2Text.setSelected(Mytools.hasUsagePermission(this));
         if (ApplockSkin.getPWD().isEmpty()) {
             starMainactivity();
         } else {

app/src/main/java/com/tool/applockpro/activity/SearchActivity.java

@@ -85,7 +85,9 @@ public class SearchActivity extends AppCompatActivity {
                             } else {
                                 binding.searchTips.setVisibility(View.GONE);
                                 binding.searchRv.setVisibility(View.VISIBLE);
-                                binding.searchRv.setAdapter(new AppAdapter(SearchActivity.this, searchdata, SearchActivity.this));
+                                AppAdapter appAdapter = new AppAdapter(SearchActivity.this, SearchActivity.this);
+                                appAdapter.update(searchdata);
+                                binding.searchRv.setAdapter(appAdapter);
                                 binding.searchRv.setLayoutManager(new LinearLayoutManager(SearchActivity.this));
                             }
                         }

app/src/main/java/com/tool/applockpro/activity/SetPWDActivity.java

@@ -53,12 +53,6 @@ public class SetPWDActivity extends AppCompatActivity {
 
         chewkpwd = getIntent().getIntExtra("1", 0);
 
-//        if (chewkpwd == 0) {
-//            binding.setpwdBack.setVisibility(View.GONE);
-//        } else {
-//            binding.setpwdBack.setVisibility(View.VISIBLE);
-//        }
-
         etlis.add(binding.et1);
         etlis.add(binding.et2);
         etlis.add(binding.et3);
@@ -93,7 +87,7 @@ public class SetPWDActivity extends AppCompatActivity {
         binding.btnContinue.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                updateEditTextBackgrounds();
+
                 StringBuilder stringBuilder = new StringBuilder();
                 stringBuilder.append(binding.et1.getText().toString());
                 stringBuilder.append(binding.et2.getText().toString());
@@ -102,21 +96,20 @@ public class SetPWDActivity extends AppCompatActivity {
                 if (stringBuilder.length() == 4) {
                     if (TextUtils.isEmpty(firstPwd)) {
                         firstPwd = stringBuilder.toString();
-//                    ApplockSkin.savePWD(stringBuilder.toString());
+
                         Log.e("zzj", "---first set pwd---" + stringBuilder.toString());
-//                    etlis.clear();
+
-//                        stringBuilder.setLength(0);
                         Log.e("zzj", "---clear stringBuilder---" + stringBuilder.toString());
                         binding.et1.setText("");
                         binding.et2.setText("");
                         binding.et3.setText("");
                         binding.et4.setText("");
                         binding.et1.requestFocus();
-                        setupEditTextListeners();
+
                         binding.lockText1.setText(R.string.lock_re_enter);
 
                     } else {
-                        setupEditTextListeners();
+
                         stringBuilder.setLength(0);
                         stringBuilder.append(binding.et1.getText().toString());
                         stringBuilder.append(binding.et2.getText().toString());
@@ -133,16 +126,15 @@ public class SetPWDActivity extends AppCompatActivity {
                                 Toast.makeText(SetPWDActivity.this, getString(R.string.setlock_tips), Toast.LENGTH_SHORT).show();
                                 startActivity(intent);
                                 finish();
-//                        showAd();
+
                             } else {
-//                        Intent intent = new Intent(SetPWDActivity.this, MainActivity.class);
+
-//                        startActivity(intent);
                                 Toast.makeText(SetPWDActivity.this, getString(R.string.changelock_tips), Toast.LENGTH_SHORT).show();
                                 showAd();
                             }
                         }
                     }
-
+                    updateEditTextBackgrounds();
 
                 } else {
                     Toast.makeText(SetPWDActivity.this, getString(R.string.text_hint), Toast.LENGTH_SHORT).show();
@@ -151,11 +143,12 @@ public class SetPWDActivity extends AppCompatActivity {
         });
     }
     private void updateEditTextBackgrounds() {
+        Log.d(ApplockSkin.TAG,"------updateEditTextBackgrounds");
         for (EditText editText : etlis) {
             if (!TextUtils.isEmpty(editText.getText())) {
-                editText.setBackgroundResource(R.drawable.stepwd_check);
+                editText.setSelected(true);
             } else {
-                editText.setBackgroundResource(R.drawable.stepwd_uncheck);
+                editText.setSelected(false);
             }
         }
     }
@@ -179,6 +172,12 @@ public class SetPWDActivity extends AppCompatActivity {
 
                 @Override
                 public void afterTextChanged(Editable s) {
+                    Log.d(ApplockSkin.TAG,"------s="+s.toString());
+                    if(s.toString().isEmpty()){
+                        currentEditText.setSelected(false);
+                    }else {
+                        currentEditText.setSelected(true);
+                    }
 
                     if (s.length() == 1 && nextEditText != null) {
                         nextEditText.requestFocus();
@@ -192,16 +191,6 @@ public class SetPWDActivity extends AppCompatActivity {
                     }
                 }
             });
-            currentEditText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-                @Override
-                public void onFocusChange(View v, boolean hasFocus) {
-                    if (!TextUtils.isEmpty(currentEditText.getText())) {
-                        currentEditText.setBackgroundResource(R.drawable.stepwd_check);
-                    } else {
-                        currentEditText.setBackgroundResource(R.drawable.stepwd_uncheck);
-                    }
-                }
-            });
 
         }
     }

app/src/main/java/com/tool/applockpro/adapter/AppAdapter.java

@@ -1,31 +1,22 @@
 package com.tool.applockpro.adapter;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.TranslateAnimation;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.widget.AppCompatImageView;
+import androidx.cardview.widget.CardView;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
 
 
@@ -41,10 +32,6 @@ import com.tool.applockpro.tool.Mytools;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
-
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
 
 public class AppAdapter extends RecyclerView.Adapter<AppAdapter.AppVH> {
     private Context mycontext;
@@ -55,16 +42,19 @@ public class AppAdapter extends RecyclerView.Adapter<AppAdapter.AppVH> {
     private int a = 0;
 
     @SuppressLint("NotifyDataSetChanged")
-    public AppAdapter(Context context, List<Mydata> list, Activity activity) {
+    public AppAdapter(Context context, Activity activity) {
         ads = ApplockSkin.lodAd();
-        mydataList = list;
         mycontext = context;
         mactivity = activity;
         packageManager = context.getPackageManager();
-        notifyDataSetChanged();
+
         a = ApplockSkin.keyad;
     }
 
+    public void update(List<Mydata> list) {
+        mydataList = list;
+        notifyDataSetChanged();
+    }
 
     @NonNull
     @Override
@@ -79,7 +69,7 @@ public class AppAdapter extends RecyclerView.Adapter<AppAdapter.AppVH> {
         String appname = mydata.getAppName();
         boolean lock = mydata.isLock();
         holder.switchCompat.setSelected(lock);
-        holder.lock.setOnClickListener(new View.OnClickListener() {
+        holder.lockView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 ApplockSkin.keyad++;
@@ -179,15 +169,15 @@ public class AppAdapter extends RecyclerView.Adapter<AppAdapter.AppVH> {
 
         private ImageView imageView;
         private TextView textView;
-        private AppCompatImageView switchCompat;
+        private ImageView switchCompat;
-        private ConstraintLayout lock;
+        private CardView lockView;
 
         public AppVH(@NonNull View itemView) {
             super(itemView);
-            imageView = itemView.findViewById(R.id.logo);
+            imageView = itemView.findViewById(R.id.imlogo);
             textView = itemView.findViewById(R.id.name);
             switchCompat = itemView.findViewById(R.id.app_switch);
-            lock = itemView.findViewById(R.id.lock);
+            lockView = itemView.findViewById(R.id.lock);
         }
 
     }

app/src/main/java/com/tool/applockpro/fragment/AllFragment.java

@@ -37,7 +37,9 @@ public class AllFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         binding = FragmentAllBinding.inflate(inflater, container, false);
-
+        thumAdapter = new AppAdapter(requireContext(), requireActivity());
+        binding.allRv.setLayoutManager(new LinearLayoutManager(requireContext()));
+        binding.allRv.setAdapter(thumAdapter);
         initData();
 
 
@@ -80,13 +82,6 @@ public class AllFragment extends Fragment {
                 }
             });
         } else if (tabargs.equals("Third")) {
-//            updateRecyclerView(list1);
-//            mydao.getAppsBySystem(false).observe(getViewLifecycleOwner(), new Observer<List<Mydata>>() {
-//                @Override
-//                public void onChanged(List<Mydata> mydata) {
-//                    updateRecyclerView(mydata);
-//                }
-//            });
             Mytools.runIO(new Runnable() {
                 @Override
                 public void run() {
@@ -110,9 +105,7 @@ public class AllFragment extends Fragment {
     }
 
     private void updateRecyclerView(List<Mydata> mydataList) {
-        thumAdapter = new AppAdapter(requireContext(), mydataList, requireActivity());
+        thumAdapter.update(mydataList);
-        binding.allRv.setLayoutManager(new LinearLayoutManager(requireContext()));
-        binding.allRv.setAdapter(thumAdapter);
     }
 
     public static AllFragment newInstance(String pos) {

app/src/main/java/com/tool/applockpro/tool/Mytools.java

@@ -56,7 +56,7 @@ public class Mytools {
 
             @Override
             public void onInterstitialAdShow(ATAdInfo atAdInfo) {
-                ad.load();
+//                ad.load();
             }
 
             @Override
@@ -111,7 +111,7 @@ public class Mytools {
 
                     }
                 });
-                ad.load();
+//                ad.load();
             }
         }
         return adArrayList;

app/src/main/res/color/selector_step_text_color.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/step_text_normal" android:state_selected="false"/>
+    <item android:color="@color/text_uncheck" android:state_selected="true"/>
+
+</selector>

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

@@ -14,4 +14,5 @@
     <corners
         android:radius="64dp" />
 
+
 </shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/oval_bg_color"/>
+
+</shape>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@mipmap/bg_main"/>
+
+    <item android:drawable="@mipmap/image_permission_title"
+        android:height="160dp"/>
+</layer-list>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/item_lock_bg_color"/>
+
+</shape>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/step_uncheck" android:state_selected="true" />
+    <item android:drawable="@drawable/step_uncheck" android:state_selected="false" />
-    <item android:drawable="@drawable/step_check" android:state_selected="false" />
+    <item android:drawable="@drawable/step_check" android:state_selected="true" />
 
 </selector>

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

@@ -5,23 +5,23 @@
     android:id="@+id/activity_main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@mipmap/bg_main"
+    android:background="@drawable/home_bg"
     tools:context=".activity.MainActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/main_search"
-        android:layout_width="wrap_content"
+        android:layout_width="44dp"
-        android:layout_height="wrap_content"
+        android:layout_height="44dp"
         android:layout_marginTop="26dp"
         android:layout_marginEnd="20dp"
-        android:background="@drawable/bg_setting_cons"
+        android:background="@drawable/cirlce_bg"
         android:padding="10dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
-            android:layout_width="18dp"
+            android:layout_width="24dp"
-            android:layout_height="18dp"
+            android:layout_height="24dp"
             android:src="@drawable/icon_search"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -31,17 +31,17 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/main_seeting"
-        android:layout_width="wrap_content"
+        android:layout_width="44dp"
-        android:layout_height="wrap_content"
+        android:layout_height="44dp"
         android:layout_marginEnd="24dp"
-        android:background="@drawable/bg_setting_cons"
+        android:background="@drawable/cirlce_bg"
         android:padding="10dp"
         app:layout_constraintEnd_toStartOf="@id/main_search"
         app:layout_constraintTop_toTopOf="@id/main_search">
 
         <ImageView
-            android:layout_width="18dp"
+            android:layout_width="24dp"
-            android:layout_height="18dp"
+            android:layout_height="24dp"
             android:src="@drawable/icon_setting"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -83,7 +83,6 @@
             android:id="@+id/main_viewpager"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_margin="20dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toBottomOf="@id/main_tabLayout" />
     </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -2,97 +2,12 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/activity_Permission"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@mipmap/bg_main"
+    android:background="@drawable/home_bg"
-    android:id="@+id/activity_Permission"
     tools:context=".activity.PermissionActivity">
 
-    <ImageView
-        android:id="@+id/setting_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@mipmap/image_permission_title"
-        app:layout_constraintTop_toTopOf="parent" />
-
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cons_content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/bg_setting_cons"
-        android:paddingStart="40dp"
-        android:paddingEnd="40dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/setting_title">
-
-
-        <TextView
-            android:id="@+id/text_content"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="40dp"
-            android:gravity="center"
-            android:text="@string/setting_content"
-            android:textColor="@color/white"
-            android:textSize="14sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <LinearLayout
-            android:id="@+id/step1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:layout_marginBottom="32dp"
-            android:background="@drawable/step_selector"
-            android:gravity="center"
-            android:orientation="horizontal"
-            android:paddingStart="12dp"
-            android:paddingTop="10dp"
-            android:paddingEnd="12dp"
-            android:paddingBottom="10dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/text_content">
-
-
-            <TextView
-                android:id="@+id/step1_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/step1"
-                android:textColor="@color/black"
-                android:textSize="17sp" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/step2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:background="@drawable/step_selector"
-            android:paddingStart="12dp"
-            android:paddingTop="10dp"
-            android:paddingEnd="12dp"
-            android:paddingBottom="10dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/text_content">
-
-            <TextView
-                android:id="@+id/step2_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/step2"
-                android:textColor="@color/black"
-                android:textSize="17sp" />
-        </LinearLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
     <ImageView
         android:layout_width="230dp"
         android:layout_height="150dp"
@@ -102,5 +17,74 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cons_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="40dp"
+        android:layout_marginEnd="40dp"
+        android:background="@drawable/bg_setting_cons"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp"
+        android:paddingBottom="32dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+
+        <TextView
+            android:id="@+id/text_content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="40dp"
+            android:layout_marginEnd="10dp"
+            android:gravity="center"
+            android:lineSpacingExtra="3dp"
+            android:text="@string/setting_content"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:orientation="horizontal"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/text_content">
+
+            <TextView
+                android:id="@+id/step1_text"
+                android:layout_width="98dp"
+                android:layout_height="44dp"
+                android:layout_gravity="center"
+                android:background="@drawable/step_selector"
+                android:gravity="center"
+                android:text="@string/step1"
+                android:textColor="@color/selector_step_text_color"
+                android:textSize="14sp" />
+
+
+            <TextView
+                android:id="@+id/step2_text"
+                android:layout_width="98dp"
+                android:layout_height="44dp"
+                android:layout_gravity="center"
+                android:layout_marginStart="24dp"
+                android:background="@drawable/step_selector"
+                android:gravity="center"
+                android:text="@string/step2"
+                android:textColor="@color/selector_step_text_color"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -2,21 +2,12 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/activity_setpwd"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@mipmap/bg_main"
-    android:id="@+id/activity_setpwd"
     tools:context=".activity.SetPWDActivity">
 
-<!--        <ImageView-->
-<!--            android:id="@+id/setpwd_back"-->
-<!--            android:layout_width="24dp"-->
-<!--            android:layout_height="24dp"-->
-<!--            android:layout_marginStart="20dp"-->
-<!--            android:layout_marginTop="20dp"-->
-<!--            android:background="@drawable/icon_back"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintTop_toTopOf="parent" />-->
 
 
     <TextView
@@ -36,10 +27,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="30dp"
+        android:layout_marginTop="8dp"
         android:gravity="center_horizontal"
         android:text="@string/lock_text1"
         android:textColor="@color/white"
-        android:textSize="15sp"
+        android:textSize="12sp"
         app:layout_constraintTop_toBottomOf="@id/lock_text" />
 
     <LinearLayout
@@ -53,8 +45,8 @@
 
         <EditText
             android:id="@+id/et1"
-            android:layout_width="36dp"
+            android:layout_width="32dp"
-            android:layout_height="64dp"
+            android:layout_height="44dp"
             android:background="@drawable/stepwd_selector"
             android:gravity="center"
             android:inputType="numberPassword"
@@ -65,9 +57,9 @@
 
         <EditText
             android:id="@+id/et2"
-            android:layout_width="36dp"
+            android:layout_width="32dp"
-            android:layout_height="64dp"
+            android:layout_height="44dp"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="12dp"
             android:background="@drawable/stepwd_selector"
             android:gravity="center"
             android:inputType="numberPassword"
@@ -78,9 +70,9 @@
 
         <EditText
             android:id="@+id/et3"
-            android:layout_width="36dp"
+            android:layout_width="32dp"
-            android:layout_height="64dp"
+            android:layout_height="44dp"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="12dp"
             android:background="@drawable/stepwd_selector"
             android:gravity="center"
             android:inputType="numberPassword"
@@ -91,9 +83,9 @@
 
         <EditText
             android:id="@+id/et4"
-            android:layout_width="36dp"
+            android:layout_width="32dp"
-            android:layout_height="64dp"
+            android:layout_height="44dp"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="12dp"
             android:background="@drawable/stepwd_selector"
             android:gravity="center"
             android:inputType="numberPassword"
@@ -102,15 +94,16 @@
             android:textSize="18sp" />
     </LinearLayout>
 
-    <androidx.appcompat.widget.AppCompatButton
+    <TextView
         android:id="@+id/btn_continue"
-        android:layout_width="200dp"
+        android:layout_width="150dp"
-        android:layout_height="wrap_content"
+        android:layout_height="44dp"
         android:layout_marginTop="32dp"
         android:background="@drawable/stepwd_check"
+        android:gravity="center"
         android:text="@string/text_continue"
         android:textColor="@color/black"
-        android:textSize="17sp"
+        android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/lock_text1" />

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

@@ -2,62 +2,69 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="64dp"
-    android:layout_margin="10dp"
+    android:layout_marginStart="20dp"
+    android:layout_marginEnd="20dp"
+    android:layout_marginBottom="20dp"
+    android:background="@drawable/bg_main_item_cons"
+    android:padding="2dp">
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/logo"
+        android:layout_width="55dp"
+        android:layout_height="55dp"
+        app:cardCornerRadius="60dp"
+        app:cardElevation="0dp"
+        app:cardMaxElevation="0dp"
         android:padding="6dp"
-    android:background="@drawable/bg_main_item_cons">
+        app:cardBackgroundColor="@color/white"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
-        android:id="@+id/logo"
+            android:id="@+id/imlogo"
-        android:layout_width="50dp"
+            android:layout_width="match_parent"
-        android:layout_height="50dp"
+            android:layout_height="match_parent"
-        android:layout_marginStart="10dp"
+            android:scaleType="centerCrop"
-        android:src="@mipmap/ic_launcher"
+            android:src="@mipmap/ic_launcher" />
-        app:layout_constraintStart_toStartOf="parent"
+    </androidx.cardview.widget.CardView>
-        app:layout_constraintTop_toTopOf="parent" />
 
 
     <TextView
         android:id="@+id/name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
+        android:layout_marginStart="12dp"
         android:gravity="center"
         android:text="@string/app_name"
-        android:textColor="@color/black"
+        android:textColor="@color/text_color"
-        android:textSize="17sp"
+        android:textSize="14sp"
         app:layout_constraintBottom_toBottomOf="@id/logo"
         app:layout_constraintStart_toEndOf="@id/logo"
         app:layout_constraintTop_toTopOf="@id/logo" />
 
 
-
+    <androidx.cardview.widget.CardView
-
-    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/lock"
-        android:layout_marginEnd="10dp"
+        android:layout_width="55dp"
-        android:padding="6dp"
+        android:layout_height="55dp"
-        android:layout_width="wrap_content"
+        app:cardBackgroundColor="@color/item_lock_bg_color"
-        android:layout_height="wrap_content"
+        app:cardCornerRadius="60dp"
-        android:background="@drawable/bg_main_item_icon"
+        app:cardElevation="0dp"
-        app:layout_constraintBottom_toBottomOf="@id/name"
+        app:cardMaxElevation="0dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/name">
-
-    
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/app_switch"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
-            app:layout_constraintEnd_toEndOf="parent"
+
-            android:background="@drawable/selector_lock" />
+        <ImageView
-
+            android:id="@+id/app_switch"
-
+            android:layout_width="32dp"
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            android:layout_height="32dp"
+            android:layout_gravity="center"
+            android:scaleType="centerCrop"
+            android:src="@drawable/selector_lock" />
+    </androidx.cardview.widget.CardView>
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -2,8 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/custom_tablayout"
-    android:layout_width="match_parent"
+    android:layout_width="101dp"
-    android:layout_height="wrap_content"
+    android:layout_height="101dp"
     android:background="@drawable/all_tab_selector">
 
     <androidx.constraintlayout.widget.ConstraintLayout

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

@@ -14,5 +14,9 @@
     <color name="text_uncheck">#9AA6A4</color>
     <color name="edit_biankuang">#727272</color>
     <color name="tab_text_uncheck">#909090</color>
+    <color name="step_text_normal">#202020</color>
+    <color name="oval_bg_color">#33FFFFFF</color>
+    <color name="text_color">#3A3938</color>
+    <color name="item_lock_bg_color">#80FFFFFF</color>
 
 </resources>

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

@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">Lock App</string>
-    <string name="setting_content">Permissions\n For normal use App Lock \n Please grant the following</string>
+    <string name="setting_content">Permissions\n For normal use App Lock , Please grant the following</string>
     <string name="step1">Step 1</string>
     <string name="step2">Step 2</string>
     <string name="change_pwd">Change password</string>

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Jul 22 10:28:12 CST 2024
+#Fri Aug 23 14:50:06 CST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -25,6 +25,6 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "ApplockPro"
+rootProject.name = "Lock App"
 include(":app")