Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
YGOMobile
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fallenstardust
YGOMobile
Commits
ce277792
Commit
ce277792
authored
Jun 05, 2025
by
fallenstardust
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整卡组管理整体布局,翻译多语言文本
parent
69af9b6a
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
18 additions
and
65 deletions
+18
-65
mobile/src/main/java/cn/garymb/ygomobile/deck_square/DeckManageDialog.java
...ava/cn/garymb/ygomobile/deck_square/DeckManageDialog.java
+2
-2
mobile/src/main/java/cn/garymb/ygomobile/deck_square/DeckSquareMyDeckFragment.java
...arymb/ygomobile/deck_square/DeckSquareMyDeckFragment.java
+2
-6
mobile/src/main/res/layout/dialog_privacy.xml
mobile/src/main/res/layout/dialog_privacy.xml
+0
-55
mobile/src/main/res/layout/fragment_deck_select.xml
mobile/src/main/res/layout/fragment_deck_select.xml
+2
-2
mobile/src/main/res/values-es/strings.xml
mobile/src/main/res/values-es/strings.xml
+2
-0
mobile/src/main/res/values-jp/strings.xml
mobile/src/main/res/values-jp/strings.xml
+2
-0
mobile/src/main/res/values-ko/strings.xml
mobile/src/main/res/values-ko/strings.xml
+2
-0
mobile/src/main/res/values-pt/strings.xml
mobile/src/main/res/values-pt/strings.xml
+2
-0
mobile/src/main/res/values-zh/strings.xml
mobile/src/main/res/values-zh/strings.xml
+2
-0
mobile/src/main/res/values/strings.xml
mobile/src/main/res/values/strings.xml
+2
-0
No files found.
mobile/src/main/java/cn/garymb/ygomobile/deck_square/DeckManageDialog.java
View file @
ce277792
...
...
@@ -69,11 +69,11 @@ public class DeckManageDialog extends DialogFragment implements YGODeckDialogUti
break
;
case
1
:
tab
.
setIcon
(
R
.
drawable
.
ic_deck_square
);
tab
.
setText
(
R
.
string
.
share_deck
);
tab
.
setText
(
R
.
string
.
deck_square
);
break
;
case
2
:
tab
.
setIcon
(
R
.
drawable
.
my_deck_square
);
tab
.
setText
(
R
.
string
.
deck_back_up
);
tab
.
setText
(
R
.
string
.
my_deck_online
);
break
;
}
...
...
mobile/src/main/java/cn/garymb/ygomobile/deck_square/DeckSquareMyDeckFragment.java
View file @
ce277792
...
...
@@ -122,7 +122,7 @@ public class DeckSquareMyDeckFragment extends Fragment {
String
password
=
etPassword
.
getText
().
toString
().
trim
();
if
(
username
.
isEmpty
()
||
password
.
isEmpty
())
{
Toast
.
makeText
(
getContext
(),
"Please enter both username and password"
,
Toast
.
LENGTH_SHORT
).
show
(
);
YGOUtil
.
showTextToast
(
"Please enter both username and password"
);
return
;
}
...
...
@@ -130,27 +130,23 @@ public class DeckSquareMyDeckFragment extends Fragment {
btnLogin
.
setEnabled
(
false
);
VUiKit
.
defer
().
when
(()
->
{
LogUtil
.
d
(
TAG
,
"start fetch"
);
LoginResponse
result
=
DeckSquareApiUtil
.
login
(
username
,
password
);
SharedPreferenceUtil
.
setServerToken
(
result
.
token
);
SharedPreferenceUtil
.
setServerUserId
(
result
.
user
.
id
);
return
result
;
}).
fail
((
e
)
->
{
Log
.
e
(
TAG
,
e
+
""
);
LogUtil
.
i
(
TAG
,
"login fail"
);
binding
.
llMainUi
.
setVisibility
(
View
.
GONE
);
progressBar
.
setVisibility
(
View
.
GONE
);
btnLogin
.
setEnabled
(
true
);
}).
done
((
result
)
->
{
if
(
result
!=
null
)
{
LogUtil
.
i
(
TAG
,
"login done"
);
binding
.
llMainUi
.
setVisibility
(
View
.
VISIBLE
);
deckListAdapter
.
loadData
();
binding
.
llDialogLogin
.
setVisibility
(
View
.
GONE
);
progressBar
.
setVisibility
(
View
.
GONE
);
btnLogin
.
setEnabled
(
true
);
YGOUtil
.
showTextToast
(
"Login success!"
);
YGOUtil
.
showTextToast
(
R
.
string
.
login_succeed
);
}
else
{
LogUtil
.
i
(
TAG
,
"login fail2"
);
}
...
...
mobile/src/main/res/layout/dialog_privacy.xml
deleted
100644 → 0
View file @
69af9b6a
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
android:padding=
"16dp"
>
<!-- 标题 -->
<TextView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:text=
"隐私政策协议"
android:textSize=
"20sp"
android:textStyle=
"bold"
/>
<!-- 协议内容(可滚动) -->
<ScrollView
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
android:layout_weight=
"1"
android:layout_marginVertical=
"16dp"
>
<TextView
android:id=
"@+id/tv_content"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:text=
"@string/privacy_policy_content"
/>
</ScrollView>
<!-- 操作按钮 -->
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
android:gravity=
"end"
android:layout_marginTop=
"8dp"
>
<Button
android:id=
"@+id/btn_disagree"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"不同意"
android:background=
"?selectableItemBackgroundBorderless"
/>
<Button
android:id=
"@+id/btn_agree"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"同意并继续"
android:layout_marginStart=
"16dp"
android:background=
"?selectableItemBackgroundBorderless"
/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
mobile/src/main/res/layout/fragment_deck_select.xml
View file @
ce277792
...
...
@@ -178,7 +178,7 @@
<com.tubb.smrv.SwipeMenuRecyclerView
android:id=
"@+id/rv_type"
android:layout_width=
"0dp"
android:layout_height=
"
wrap_cont
ent"
android:layout_height=
"
match_par
ent"
android:layout_weight=
"1"
android:divider=
"@android:color/transparent"
android:dividerHeight=
"4dp"
...
...
@@ -192,7 +192,7 @@
<com.tubb.smrv.SwipeMenuRecyclerView
android:id=
"@+id/rv_deck"
android:layout_width=
"0dp"
android:layout_height=
"
wrap_cont
ent"
android:layout_height=
"
match_par
ent"
android:layout_weight=
"2"
android:divider=
"@android:color/transparent"
android:dividerHeight=
"4dp"
...
...
mobile/src/main/res/values-es/strings.xml
View file @
ce277792
...
...
@@ -379,5 +379,7 @@
<string
name=
"sign_out"
>
Sair
</string>
<string
name=
"input_user_name"
>
Introduce el Nombre de Usuario
</string>
<string
name=
"input_pwd"
>
Introduce la Contraseña
</string>
<string
name=
"deck_square"
>
Plaza de Decks
</string>
<string
name=
"my_deck_online"
>
Copia en la Nube
</string>
</resources>
mobile/src/main/res/values-jp/strings.xml
View file @
ce277792
...
...
@@ -373,4 +373,6 @@
<string
name=
"sign_out"
>
ログアウト
</string>
<string
name=
"input_user_name"
>
ユーザー名を入力してください
</string>
<string
name=
"input_pwd"
>
パスワードを入力してください
</string>
<string
name=
"deck_square"
>
デッキ広場
</string>
<string
name=
"my_deck_online"
>
クラウド バックアップ
</string>
</resources>
mobile/src/main/res/values-ko/strings.xml
View file @
ce277792
...
...
@@ -374,4 +374,6 @@
<string
name=
"sign_out"
>
로그아웃
</string>
<string
name=
"input_user_name"
>
사용자 이름을 입력하세요
</string>
<string
name=
"input_pwd"
>
비밀번호를 입력하세요
</string>
<string
name=
"deck_square"
>
덱 공유 광장
</string>
<string
name=
"my_deck_online"
>
클라우드 백업
</string>
</resources>
mobile/src/main/res/values-pt/strings.xml
View file @
ce277792
...
...
@@ -363,5 +363,7 @@
<string
name=
"sign_out"
>
Sair
</string>
<string
name=
"input_user_name"
>
Insira o Nome de Usuário
</string>
<string
name=
"input_pwd"
>
Insira a Senha
</string>
<string
name=
"deck_square"
>
Praça de Decks
</string>
<string
name=
"my_deck_online"
>
Backup na Nuvem
</string>
</resources>
mobile/src/main/res/values-zh/strings.xml
View file @
ce277792
...
...
@@ -378,4 +378,6 @@
<string
name=
"input_pwd"
>
输入密码
</string>
<string
name=
"register"
>
注册萌卡
</string>
<string
name=
"sign_out"
>
切换账号
</string>
<string
name=
"deck_square"
>
卡组广场
</string>
<string
name=
"my_deck_online"
>
云备份
</string>
</resources>
mobile/src/main/res/values/strings.xml
View file @
ce277792
...
...
@@ -443,4 +443,6 @@
<string
name=
"sign_out"
>
Sign out
</string>
<string
name=
"input_user_name"
>
Enter Username
</string>
<string
name=
"input_pwd"
>
Enter Password
</string>
<string
name=
"deck_square"
>
Deck Plaza
</string>
<string
name=
"my_deck_online"
>
Cloud Backup
</string>
</resources>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment