优化界面

app/src/main/java/com/miekir/eden/ui/home/about/AboutFragment.java

@@ -53,8 +53,6 @@ public class AboutFragment extends BaseMVPFragment implements View.OnClickListen
         ll_about = rootView.findViewById(R.id.ll_about);
         TextView tv_email = rootView.findViewById(R.id.tv_email);
         tv_email.setText(EdenManager.getInstance().getBeiUser().email);
-        TextView tv_account = rootView.findViewById(R.id.tv_account);
-        tv_account.setText(EdenManager.getInstance().getBeiUser().email);
 
         rootView.findViewById(R.id.tv_feedback).setOnClickListener(this);
         rootView.findViewById(R.id.tv_update).setOnClickListener(this);
@@ -132,7 +130,7 @@ public class AboutFragment extends BaseMVPFragment implements View.OnClickListen
 
             case R.id.ll_email:
                 SystemTool.copyText(getActivity(), EdenManager.getInstance().getBeiUser().email);
-                ToastTool.showLong(StringTool.getString(R.string.about_copy_account));
+                ToastTool.showLong(StringTool.getString(R.string.about_account_copied));
                 break;
 
             case R.id.tv_update:

app/src/main/java/com/miekir/eden/ui/mine/MineActivity.java

@@ -8,6 +8,7 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.Switch;
+import android.widget.TextView;
 
 import androidx.appcompat.app.AlertDialog;
 
@@ -22,6 +23,7 @@ import com.miekir.eden.bean.SystemBean;
 import com.miekir.eden.constant.ConstantString;
 import com.miekir.eden.manager.EdenManager;
 import com.miekir.eden.tool.StringTool;
+import com.miekir.eden.tool.SystemTool;
 import com.miekir.eden.tool.TimeTool;
 import com.miekir.eden.ui.home.tool.ISystemView;
 import com.miekir.eden.ui.home.tool.SystemPresenter;
@@ -39,6 +41,7 @@ public class MineActivity extends BaseBeiActivity implements View.OnClickListene
     private Switch switch_ad;
     private TextInputEditText et_email;
     private TextInputEditText et_zfb;
+    private String mCurrentAccount = EdenManager.getInstance().getBeiUser().email;
 
     private BeiUser mUser;
     private SystemBean mSystemBean;
@@ -58,7 +61,7 @@ public class MineActivity extends BaseBeiActivity implements View.OnClickListene
         mUser = EdenManager.getInstance().getBeiUser();
         setTitle(String.format(getString(R.string.mine_hello), TimeTool.getCurrentTimePeriod()));
         ViewTool.setOnClickListener(this, this,
-                new int[]{R.id.tv_my_fav, R.id.btn_exit_login, R.id.btn_set_vip, R.id.btn_set_zfb, R.id.btn_ali_go});
+                new int[]{R.id.tv_my_fav, R.id.btn_exit_login, R.id.btn_set_vip, R.id.btn_set_zfb, R.id.btn_ali_go, R.id.ll_current_account});
 
         // 只有我才能管理后台
         View ll_admin = findViewById(R.id.ll_admin);
@@ -68,6 +71,8 @@ public class MineActivity extends BaseBeiActivity implements View.OnClickListene
             ll_admin.setVisibility(View.GONE);
         }
 
+        TextView tv_account = findViewById(R.id.tv_account);
+        tv_account.setText(mCurrentAccount);
         TextInputLayout til_zfb = findViewById(R.id.til_zfb);
         et_email = findViewById(R.id.et_email);
         et_zfb = findViewById(R.id.et_zfb);
@@ -141,6 +146,11 @@ public class MineActivity extends BaseBeiActivity implements View.OnClickListene
                 alertDialog.show();
                 break;
 
+            case R.id.ll_current_account:
+                SystemTool.copyText(this, mCurrentAccount);
+                ToastTool.showShort(StringTool.getString(R.string.about_account_copied));
+                break;
+
             default:
                 break;
         }

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

@@ -19,6 +19,36 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
+            <LinearLayout
+                android:id="@+id/ll_current_account"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:background="?attr/selectableItemBackground"
+                android:paddingStart="@dimen/activity_horizontal_margin"
+                android:paddingEnd="@dimen/activity_horizontal_margin">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/height_tool_bar"
+                    android:text="@string/mine_current_account"
+                    android:textColor="@color/black_text"
+                    android:gravity="center_vertical" />
+                <Space
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"/>
+                <TextView
+                    android:id="@+id/tv_account"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/height_tool_bar"
+                    android:layout_marginStart="@dimen/margin_default"
+                    android:textColor="@color/gray_text_hint"
+                    android:gravity="center_vertical" />
+            </LinearLayout>
+
+
+            <include layout="@layout/view_divider_common" />
+
             <TextView
                 android:id="@+id/tv_my_fav"
                 android:layout_width="match_parent"

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

@@ -47,34 +47,6 @@
                 android:textStyle="bold" />
         </LinearLayout>
 
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/margin_ss"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:paddingStart="@dimen/margin_default"
-            android:paddingEnd="@dimen/margin_default">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/about_current_account"
-                android:textColor="@color/black_theme"
-                android:textSize="@dimen/text_normal_p"
-                android:textStyle="bold"/>
-            <TextView
-                android:id="@+id/tv_account"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/app_name"
-                android:textColor="@color/black_theme"
-                android:textSize="@dimen/text_normal_p"
-                android:textStyle="bold"
-                android:textIsSelectable="true"/>
-        </LinearLayout>
-
-
         <LinearLayout
             android:id="@+id/ll_desc"
             android:layout_width="match_parent"
@@ -137,7 +109,6 @@
             android:layout_marginEnd="@dimen/margin_default"
             android:text="@string/about_upgrade_now"
             android:textColor="@color/green_logo"
-            android:textSize="@dimen/text_normal_s"
             android:background="?attr/selectableItemBackground"/>
 
         <TextView
@@ -149,7 +120,6 @@
             android:layout_marginTop="@dimen/margin_default"
             android:text="@string/about_check_new"
             android:textColor="@color/green_logo"
-            android:textSize="@dimen/text_normal_s"
             android:background="?attr/selectableItemBackground"/>
 
         <TextView
@@ -161,7 +131,6 @@
             android:layout_marginTop="@dimen/margin_default"
             android:text="@string/about_feedback"
             android:textColor="@color/green_logo"
-            android:textSize="@dimen/text_normal_s"
             android:background="?attr/selectableItemBackground"/>
 
         <TextView
@@ -173,7 +142,6 @@
             android:layout_marginTop="@dimen/margin_default"
             android:text="@string/about_coupon"
             android:textColor="@color/green_logo"
-            android:textSize="@dimen/text_normal_s"
             android:background="?attr/selectableItemBackground"
             android:visibility="gone"/>
 
@@ -185,7 +153,6 @@
             android:layout_marginStart="@dimen/margin_default"
             android:layout_marginEnd="@dimen/margin_default"
             android:textColor="@color/green_logo"
-            android:textSize="@dimen/text_normal_s"
             android:background="?attr/selectableItemBackground"
             android:visibility="gone"/>
 

app/src/main/res/values-zh-rCN/strings.xml

@@ -9,6 +9,7 @@
     <string name="tab_coupon">优惠</string>
     <string name="tab_template">模板</string>
     <string name="mine_hello">%s好</string>
+    <string name="mine_current_account">当前账号</string>
     <string name="hello_lingchen">凌晨</string>
     <string name="hell_zaoshang">早上</string>
     <string name="hello_shangwu">上午</string>
@@ -20,7 +21,8 @@
     <string name="about_title">伊甸园 v%s%s</string>
     <string name="about_active">(已激活)</string>
     <string name="about_not_active">(未激活)</string>
-    <string name="about_copy_account">已拷贝当前账号</string>
+    <string name="about_account_copied">已拷贝当前账号</string>
+    <string name="about_copy_account">复制账号</string>
     <string name="about_active_copy_account">已拷贝当前账号，请务必粘贴到备注</string>
     <string name="cancel">取消</string>
     <string name="confirm">确定</string>

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

@@ -9,6 +9,7 @@
     <string name="tab_coupon">Coupon</string>
     <string name="tab_template">Template</string>
     <string name="mine_hello">Good %s</string>
+    <string name="mine_current_account">Current Account</string>
     <string name="hello_lingchen">Morning</string>
     <string name="hell_zaoshang">Morning</string>
     <string name="hello_shangwu">Morning</string>
@@ -20,7 +21,8 @@
     <string name="about_title">Eden v%s%s</string>
     <string name="about_active">(Activated)</string>
     <string name="about_not_active">(Not Active)</string>
-    <string name="about_copy_account">Current account copied</string>
+    <string name="about_account_copied">Current account copied</string>
+    <string name="about_copy_account">Copy Current Account</string>
     <string name="about_active_copy_account">Current account copied, please paste when you pay</string>
     <string name="cancel">Cancel</string>
     <string name="confirm">Sure</string>