添加登录时缺失账号密码的提示文字

mobile/src/main/java/cn/garymb/ygomobile/deck_square/DeckSquareFragment.java

@@ -61,7 +61,7 @@ public class DeckSquareFragment extends Fragment {
                 } else {
                     sortLike = false;
                     binding.tvSortMode.setText(R.string.sort_by_time);//当按点赞顺序时，点击应切换为按时间顺序
-                    binding.refreshData.setImageDrawable(icon_like);//因为点击后会变成按时间顺序，就需要图标显示为按时间顺序，告诉用户点它可变回时间顺序
+                    binding.refreshData.setImageDrawable(icon_like);//因为点击后会变成按时间顺序，就需要图标切换为按点赞顺序，告诉用户点它可变成点赞顺序
                 }
                 int targetPage = 1;
                 try {

mobile/src/main/java/cn/garymb/ygomobile/deck_square/DeckSquareMyDeckFragment.java

@@ -109,16 +109,25 @@ public class DeckSquareMyDeckFragment extends Fragment {
         String username = binding.etUsername.getText().toString().trim();
         String password = binding.etPassword.getText().toString().trim();
 
-        if (username.isEmpty() || password.isEmpty()) {
-            YGOUtil.showTextToast("Please enter both username and password");
+        if (username.isEmpty()) {
+            binding.tvAccountWarning.setVisibility(View.VISIBLE);
             return;
+        } else {
+            binding.tvAccountWarning.setVisibility(View.GONE);
+        }
+
+        if (password.isEmpty()) {
+            binding.tvPwdWarning.setVisibility(View.VISIBLE);
+            return;
+        } else {
+            binding.tvPwdWarning.setVisibility(View.GONE);
         }
 
         binding.progressBar.setVisibility(View.VISIBLE);
         binding.btnLogin.setEnabled(false);
 
         VUiKit.defer().when(() -> {
-            LoginResponse result = DeckSquareApiUtil.login(username, password);
+            LoginResponse result = DeckSquareApiUtil.login(username, password);//执行登录
             SharedPreferenceUtil.setServerToken(result.token);
             SharedPreferenceUtil.setServerUserId(result.user.id);
             return result;

mobile/src/main/res/layout/fragment_deck_square_my_deck.xml

@@ -11,43 +11,71 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:padding="16dp">
-<LinearLayout
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="16dp"
-    android:layout_gravity="center">
-
-    <ImageView
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginEnd="4dp"
-        android:src="@drawable/mycard"/>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:text="@string/login_mycard"
-        android:textSize="20sp"
-        android:textStyle="bold" />
-</LinearLayout>
 
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginBottom="16dp">
+
+            <ImageView
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_marginEnd="4dp"
+                android:src="@drawable/mycard" />
 
-        <EditText
-            android:id="@+id/et_username"
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/login_mycard"
+                android:textSize="20sp"
+                android:textStyle="bold" />
+        </LinearLayout>
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dp"
-            android:hint="@string/input_user_name"
-            android:inputType="text" />
+            android:orientation="vertical">
 
-        <EditText
-            android:id="@+id/et_password"
+            <EditText
+                android:id="@+id/et_username"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/input_user_name"
+                android:inputType="text" />
+
+            <TextView
+                android:id="@+id/tv_account_warning"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/account_warning"
+                android:visibility="gone"
+                android:textColor="@color/red" />
+        </LinearLayout>
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:hint="@string/input_pwd"
-            android:inputType="textPassword" />
+            android:orientation="vertical"
+            android:layout_marginBottom="16dp">
+
+            <EditText
+                android:id="@+id/et_password"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/input_pwd"
+                android:inputType="textPassword" />
+
+            <TextView
+                android:id="@+id/tv_pwd_warning"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:text="@string/pwd_warning"
+                android:textColor="@color/red" />
+        </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -119,16 +147,16 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
-            android:padding="16dp"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:padding="16dp">
 
             <Button
                 android:id="@+id/mc_logout_btn"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/ic_radius_bg"
                 android:layout_marginEnd="4dp"
                 android:layout_weight="1"
+                android:background="@drawable/ic_radius_bg"
                 android:text="注销" />
 
         </LinearLayout>

mobile/src/main/res/values-es/strings.xml

@@ -384,5 +384,7 @@
     <string name="input_contributor_name">Introduce el Nombre del Compartidor</string>
     <string name="sort_by_time">Ordenar por Tiempo</string>
     <string name="sort_by_thumb">En el orden recomendado</string>
+    <string name="account_warning">Por favor, complete su correo electrónico o nombre de usuario!</string>
+    <string name="pwd_warning">Por favor, introduzca su contraseña!</string>
 </resources>
 

mobile/src/main/res/values-jp/strings.xml

@@ -378,4 +378,6 @@
     <string name="input_contributor_name">共有者の名前を入力してください</string>
     <string name="sort_by_time">時間順に</string>
     <string name="sort_by_thumb">推薦順に</string>
+    <string name="account_warning">メールアドレスまたはユーザー名を入力してください！</string>
+    <string name="pwd_warning">パスワードを入力してください！</string>
 </resources>

mobile/src/main/res/values-ko/strings.xml

@@ -379,4 +379,6 @@
     <string name="input_contributor_name">공유자의 이름을 입력하세요</string>
     <string name="sort_by_time">시간 순서대로</string>
     <string name="sort_by_thumb">추천 순서대로</string>
+    <string name="account_warning">이메일이나 사용자 이름을 입력해 주세요!</string>
+    <string name="pwd_warning">비밀번호를 입력해 주세요!</string>
 </resources>

mobile/src/main/res/values-pt/strings.xml

@@ -368,5 +368,7 @@
     <string name="input_contributor_name">Insira o Nome do Compartilhador</string>
     <string name="sort_by_time">Ordenar por Tempo</string>
     <string name="sort_by_thumb">Na ordem recomendada</string>
+    <string name="account_warning">Por favor, preencha seu e - mail ou nome de usuário!</string>
+    <string name="pwd_warning">Por favor, insira sua senha!</string>
 </resources>
 

mobile/src/main/res/values-zh/strings.xml

@@ -383,4 +383,6 @@
     <string name="input_contributor_name">输入共享者名称</string>
     <string name="sort_by_time">按时间顺序</string>
     <string name="sort_by_thumb">按点赞顺序</string>
+    <string name="account_warning">请填写你的邮箱或用户名！</string>
+    <string name="pwd_warning">请填写你的密码！</string>
 </resources>

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

@@ -448,4 +448,6 @@
     <string name="input_contributor_name">Enter the Sharer\'s Name</string>
     <string name="sort_by_time">Sort by Time</string>
     <string name="sort_by_thumb">Sort by Thumb</string>
+    <string name="account_warning">Please fill in your email or username!</string>
+    <string name="pwd_warning">Please enter your password!</string>
 </resources>