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
e97875dc
Commit
e97875dc
authored
Apr 18, 2020
by
fallenstardust
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复等级不显示
微调布局
parent
8be50b3a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
12 deletions
+23
-12
mobile/src/main/java/cn/garymb/ygomobile/ui/adapters/CardListAdapter.java
...java/cn/garymb/ygomobile/ui/adapters/CardListAdapter.java
+2
-1
mobile/src/main/res/layout/dialog_cardinfo.xml
mobile/src/main/res/layout/dialog_cardinfo.xml
+11
-4
mobile/src/main/res/layout/item_linkmaker_small.xml
mobile/src/main/res/layout/item_linkmaker_small.xml
+7
-7
mobile/src/main/res/layout/item_search_card_swipe.xml
mobile/src/main/res/layout/item_search_card_swipe.xml
+3
-0
No files found.
mobile/src/main/java/cn/garymb/ygomobile/ui/adapters/CardListAdapter.java
View file @
e97875dc
...
@@ -133,6 +133,7 @@ public class CardListAdapter extends BaseRecyclerAdapterPlus<Card, ViewHolder> i
...
@@ -133,6 +133,7 @@ public class CardListAdapter extends BaseRecyclerAdapterPlus<Card, ViewHolder> i
holder
.
TextDef
.
setText
(
""
);
holder
.
TextDef
.
setText
(
""
);
BaseActivity
.
showLinkArrows
(
item
,
holder
.
linkArrow
);
BaseActivity
.
showLinkArrows
(
item
,
holder
.
linkArrow
);
}
else
{
}
else
{
holder
.
cardLevel
.
setVisibility
(
View
.
VISIBLE
);
holder
.
linkArrow
.
setVisibility
(
View
.
GONE
);
holder
.
linkArrow
.
setVisibility
(
View
.
GONE
);
holder
.
cardDef
.
setText
((
item
.
Defense
<
0
?
"?"
:
String
.
valueOf
(
item
.
Defense
)));
holder
.
cardDef
.
setText
((
item
.
Defense
<
0
?
"?"
:
String
.
valueOf
(
item
.
Defense
)));
holder
.
TextDef
.
setText
(
"DEF/"
);
holder
.
TextDef
.
setText
(
"DEF/"
);
...
@@ -143,7 +144,7 @@ public class CardListAdapter extends BaseRecyclerAdapterPlus<Card, ViewHolder> i
...
@@ -143,7 +144,7 @@ public class CardListAdapter extends BaseRecyclerAdapterPlus<Card, ViewHolder> i
// if (!showCode) {
// if (!showCode) {
// holder.view_bar.setVisibility(View.INVISIBLE);
// holder.view_bar.setVisibility(View.INVISIBLE);
// }
// }
holder
.
layout_star_attr_race_scale
.
setVisibility
(
View
.
GON
E
);
holder
.
layout_star_attr_race_scale
.
setVisibility
(
View
.
INVISIBL
E
);
holder
.
linkArrow
.
setVisibility
(
View
.
GONE
);
holder
.
linkArrow
.
setVisibility
(
View
.
GONE
);
holder
.
layout_atk
.
setVisibility
(
View
.
GONE
);
holder
.
layout_atk
.
setVisibility
(
View
.
GONE
);
holder
.
layout_def
.
setVisibility
(
View
.
GONE
);
holder
.
layout_def
.
setVisibility
(
View
.
GONE
);
...
...
mobile/src/main/res/layout/dialog_cardinfo.xml
View file @
e97875dc
...
@@ -111,9 +111,10 @@
...
@@ -111,9 +111,10 @@
android:textIsSelectable=
"true"
android:textIsSelectable=
"true"
tools:text=
"name"
/>
tools:text=
"name"
/>
<
Frame
Layout
<
Linear
Layout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:gravity=
"center|left"
android:orientation=
"horizontal"
>
android:orientation=
"horizontal"
>
<include
<include
...
@@ -123,8 +124,9 @@
...
@@ -123,8 +124,9 @@
<TextView
<TextView
android:id=
"@+id/card_level"
android:id=
"@+id/card_level"
android:layout_width=
"
match_par
ent"
android:layout_width=
"
wrap_cont
ent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:gravity=
"center_vertical"
android:gravity=
"center_vertical"
android:maxLines=
"1"
android:maxLines=
"1"
android:paddingLeft=
"4dp"
android:paddingLeft=
"4dp"
...
@@ -133,15 +135,20 @@
...
@@ -133,15 +135,20 @@
android:textColor=
"@color/star"
android:textColor=
"@color/star"
tools:text=
"★4"
/>
tools:text=
"★4"
/>
<View
android:layout_width=
"0dp"
android:layout_height=
"1dp"
android:layout_weight=
"1"
/>
<ImageView
<ImageView
android:id=
"@+id/image_fav"
android:id=
"@+id/image_fav"
android:layout_width=
"30dp"
android:layout_width=
"30dp"
android:layout_height=
"30dp"
android:layout_height=
"30dp"
android:layout_gravity=
"
bottom|right
"
android:layout_gravity=
"
center
"
android:background=
"@drawable/ic_control_point"
android:background=
"@drawable/ic_control_point"
android:paddingRight=
"5dp"
android:paddingRight=
"5dp"
android:scaleType=
"center"
/>
android:scaleType=
"center"
/>
</
Frame
Layout>
</
Linear
Layout>
<LinearLayout
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
...
mobile/src/main/res/layout/item_linkmaker_small.xml
View file @
e97875dc
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"2
6
dp"
android:layout_width=
"2
4
dp"
android:layout_height=
"2
6
dp"
android:layout_height=
"2
4
dp"
android:
gravity=
"center_vertical
"
android:
layout_gravity=
"center|left
"
android:orientation=
"vertical"
>
android:orientation=
"vertical"
>
<LinearLayout
<LinearLayout
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
<ImageView
<ImageView
android:id=
"@+id/iv_8"
android:id=
"@+id/iv_8"
android:layout_width=
"1
2
dp"
android:layout_width=
"1
0
dp"
android:layout_height=
"5dp"
android:layout_height=
"5dp"
android:background=
"@drawable/top_0"
android:background=
"@drawable/top_0"
android:visibility=
"visible"
/>
android:visibility=
"visible"
/>
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
<ImageView
<ImageView
android:id=
"@+id/iv_4"
android:id=
"@+id/iv_4"
android:layout_width=
"5dp"
android:layout_width=
"5dp"
android:layout_height=
"1
2
dp"
android:layout_height=
"1
0
dp"
android:background=
"@drawable/left_0"
android:background=
"@drawable/left_0"
android:visibility=
"visible"
/>
android:visibility=
"visible"
/>
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
<ImageView
<ImageView
android:id=
"@+id/iv_6"
android:id=
"@+id/iv_6"
android:layout_width=
"5dp"
android:layout_width=
"5dp"
android:layout_height=
"1
2
dp"
android:layout_height=
"1
0
dp"
android:background=
"@drawable/right_0"
android:background=
"@drawable/right_0"
android:visibility=
"visible"
/>
android:visibility=
"visible"
/>
</LinearLayout>
</LinearLayout>
...
@@ -72,7 +72,7 @@
...
@@ -72,7 +72,7 @@
<ImageView
<ImageView
android:id=
"@+id/iv_2"
android:id=
"@+id/iv_2"
android:layout_width=
"1
2
dp"
android:layout_width=
"1
0
dp"
android:layout_height=
"5dp"
android:layout_height=
"5dp"
android:layout_gravity=
"bottom"
android:layout_gravity=
"bottom"
android:background=
"@drawable/bottom_0"
android:background=
"@drawable/bottom_0"
...
...
mobile/src/main/res/layout/item_search_card_swipe.xml
View file @
e97875dc
...
@@ -93,6 +93,7 @@
...
@@ -93,6 +93,7 @@
android:id=
"@+id/star_attr_race_scale"
android:id=
"@+id/star_attr_race_scale"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:gravity=
"center_horizontal"
android:orientation=
"horizontal"
>
android:orientation=
"horizontal"
>
<include
<include
...
@@ -104,6 +105,7 @@
...
@@ -104,6 +105,7 @@
android:id=
"@+id/card_level"
android:id=
"@+id/card_level"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:maxLines=
"1"
android:maxLines=
"1"
android:shadowColor=
"@color/black"
android:shadowColor=
"@color/black"
android:shadowDx=
"1"
android:shadowDx=
"1"
...
@@ -117,6 +119,7 @@
...
@@ -117,6 +119,7 @@
<LinearLayout
<LinearLayout
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:layout_marginLeft=
"10dp"
android:layout_marginLeft=
"10dp"
android:orientation=
"horizontal"
>
android:orientation=
"horizontal"
>
...
...
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