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
efc2bb18
Commit
efc2bb18
authored
Jun 21, 2022
by
fallenstardust
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合并卡组编辑类
parent
2fb780ce
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
253 additions
and
309 deletions
+253
-309
mobile/src/main/java/cn/garymb/ygomobile/GameUriManager.java
mobile/src/main/java/cn/garymb/ygomobile/GameUriManager.java
+1
-1
mobile/src/main/java/cn/garymb/ygomobile/ui/activities/BaseActivity.java
.../java/cn/garymb/ygomobile/ui/activities/BaseActivity.java
+1
-0
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/BaseCardsActivity.java
.../java/cn/garymb/ygomobile/ui/cards/BaseCardsActivity.java
+0
-278
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerActivity.java
...ava/cn/garymb/ygomobile/ui/cards/DeckManagerActivity.java
+250
-24
mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java
...c/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java
+1
-1
mobile/src/main/java/cn/garymb/ygomobile/ui/mycard/MyCardActivity.java
...in/java/cn/garymb/ygomobile/ui/mycard/MyCardActivity.java
+0
-1
mobile/src/main/res/menu/nav_main_menu.xml
mobile/src/main/res/menu/nav_main_menu.xml
+0
-4
No files found.
mobile/src/main/java/cn/garymb/ygomobile/GameUriManager.java
View file @
efc2bb18
...
...
@@ -248,7 +248,7 @@ public class GameUriManager {
}
else
{
Deck
deckInfo
=
new
Deck
(
uri
);
File
file
=
deckInfo
.
saveTemp
(
AppsSettings
.
get
().
getDeckDir
());
if
(!
deckInfo
.
isCompleteDeck
()){
if
(!
deckInfo
.
isCompleteDeck
())
{
YGOUtil
.
show
(
"当前卡组缺少完整信息,将只显示已有卡片"
);
}
DeckManagerActivity
.
start
(
activity
,
file
.
getAbsolutePath
());
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/activities/BaseActivity.java
View file @
efc2bb18
...
...
@@ -34,6 +34,7 @@ import androidx.appcompat.app.AppCompatActivity;
import
androidx.appcompat.widget.Toolbar
;
import
java.io.IOException
;
import
java.util.List
;
import
cn.garymb.ygomobile.lite.R
;
import
cn.garymb.ygomobile.utils.FileLogUtil
;
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/BaseCardsActivity.java
deleted
100644 → 0
View file @
2fb780ce
This diff is collapsed.
Click to expand it.
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerActivity.java
View file @
efc2bb18
This diff is collapsed.
Click to expand it.
mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java
View file @
efc2bb18
...
...
@@ -91,7 +91,7 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
// 配置navigation与底部菜单之间的联系
// 底部菜单的样式里面的item里面的ID与navigation布局里面指定的ID必须相同,否则会出现绑定失败的情况
appBarConfiguration
=
new
AppBarConfiguration
.
Builder
(
R
.
id
.
home_fragment
,
R
.
id
.
mycard_fragment
,
R
.
id
.
setting_fragment
).
build
();
R
.
id
.
home_fragment
,
R
.
id
.
cardSearcher_fragment
,
R
.
id
.
mycard_fragment
,
R
.
id
.
setting_fragment
).
build
();
// 建立fragment容器的控制器,这个容器就是页面的上的fragment容器
NavController
navController
=
Navigation
.
findNavController
(
this
,
R
.
id
.
nav_host_fragment
);
// 启动
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/mycard/MyCardActivity.java
View file @
efc2bb18
...
...
@@ -11,7 +11,6 @@ import android.os.Bundle;
import
android.os.Handler
;
import
android.os.Message
;
import
android.text.TextUtils
;
import
android.util.Log
;
import
android.view.Gravity
;
import
android.view.MenuItem
;
import
android.view.View
;
...
...
mobile/src/main/res/menu/nav_main_menu.xml
View file @
efc2bb18
<?xml version="1.0" encoding="utf-8"?>
<menu
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
>
<item
android:id=
"@+id/action_card_search"
android:icon=
"@drawable/ic_search"
android:title=
"@string/card_search"
/>
<item
android:id=
"@+id/action_deck_manager"
android:icon=
"@drawable/ic_edit"
...
...
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