Skip to content

Y
YGOMobile-Cn-Ko-En
Commit 9ed5afa2 authored by fallenstardust's avatar fallenstardust
Browse files
Options

搜索按钮适合单手操作 

更改连接标记搜索按钮
微调代码
parent c24cbdd1
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 76 deletions
mobile/src/main/java/cn/garymb/ygomobile/ui/adapters/CardListAdapter.java
View file @ 9ed5afa2
...@@ -108,9 +108,6 @@ public class CardListAdapter extends BaseRecyclerAdapterPlus<Card, ViewHolder> i ...@@ -108,9 +108,6 @@ public class CardListAdapter extends BaseRecyclerAdapterPlus<Card, ViewHolder> i
holder.cardLevel.setVisibility(View.VISIBLE); holder.cardLevel.setVisibility(View.VISIBLE);
holder.layout_atk.setVisibility(View.VISIBLE); holder.layout_atk.setVisibility(View.VISIBLE);
holder.layout_def.setVisibility(View.VISIBLE); holder.layout_def.setVisibility(View.VISIBLE);
if (item.isType(CardType.Link)) {
holder.cardLevel.setVisibility(View.INVISIBLE);
}
// holder.view_bar.setVisibility(View.VISIBLE); // holder.view_bar.setVisibility(View.VISIBLE);
String star = "★"+ item.getStar(); String star = "★"+ item.getStar();
/*for (int i = 0; i < item.getStar(); i++) { /*for (int i = 0; i < item.getStar(); i++) {
...@@ -124,15 +121,12 @@ public class CardListAdapter extends BaseRecyclerAdapterPlus<Card, ViewHolder> i ...@@ -124,15 +121,12 @@ public class CardListAdapter extends BaseRecyclerAdapterPlus<Card, ViewHolder> i
} }
holder.cardAtk.setText((item.Attack < 0 ? "?" : String.valueOf(item.Attack))); holder.cardAtk.setText((item.Attack < 0 ? "?" : String.valueOf(item.Attack)));
if (item.isType(CardType.Link)) { if (item.isType(CardType.Link)) {
holder.cardLevel.setVisibility(View.INVISIBLE);
holder.cardDef.setText(item.getStar() < 0 ? "?" : "LINK-" + String.valueOf(item.getStar())); holder.cardDef.setText(item.getStar() < 0 ? "?" : "LINK-" + String.valueOf(item.getStar()));
holder.TextDef.setText(""); holder.TextDef.setText("");
} else { } else {
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/");
/* }
if(item.isType(CardType.Link)) {
holder.TextDef.setText(" ");
*/
} }
......
mobile/src/main/res/layout/nav_card_search.xml
View file @ 9ed5afa2
...@@ -22,71 +22,6 @@ ...@@ -22,71 +22,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="18dp" /> android:layout_marginLeft="18dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="18dp"
android:layout_weight="1">
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/edt_word1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:hint="@string/hit_keyword1"
android:imeOptions="actionSearch"
android:inputType="textNoSuggestions"
android:maxLines="1"
android:singleLine="true"
android:textColorHint="@color/gold" />
</com.google.android.material.textfield.TextInputLayout>
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@drawable/button_bg"
android:text="@string/search" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="18dp"
android:layout_weight="1">
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/edt_word2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/hit_keyword2"
android:imeOptions="actionSearch"
android:inputType="textNoSuggestions"
android:maxLines="1"
android:singleLine="true"
android:textColorHint="@color/gold" />
</com.google.android.material.textfield.TextInputLayout>
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_reset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@drawable/button_bg"
android:text="@string/reset" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -152,7 +87,7 @@ ...@@ -152,7 +87,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/button_bg" android:background="@color/transparent"
android:text="@string/linkmarker" android:text="@string/linkmarker"
android:visibility="visible" /> android:visibility="visible" />
...@@ -279,5 +214,70 @@ ...@@ -279,5 +214,70 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="18dp"
android:layout_weight="1">
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/edt_word1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:hint="@string/hit_keyword1"
android:imeOptions="actionSearch"
android:inputType="textNoSuggestions"
android:maxLines="1"
android:singleLine="true"
android:textColorHint="@color/gold" />
</com.google.android.material.textfield.TextInputLayout>
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@drawable/button_bg"
android:text="@string/search" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="18dp"
android:layout_weight="1">
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/edt_word2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/hit_keyword2"
android:imeOptions="actionSearch"
android:inputType="textNoSuggestions"
android:maxLines="1"
android:singleLine="true"
android:textColorHint="@color/gold" />
</com.google.android.material.textfield.TextInputLayout>
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_reset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@drawable/button_bg"
android:text="@string/reset" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
mobile/src/main/res/values-ko/strings.xml
View file @ 9ed5afa2
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<string name="label_level">레벨/랭크/링크</string> <string name="label_level">레벨/랭크/링크</string>
<string name="label_attr">속성</string> <string name="label_attr">속성</string>
<string name="label_category">카테고리</string> <string name="label_category">카테고리</string>
<string name="linkmarker">링크마커</string>> <string name="linkmarker">◀링크마커▶</string>>
<string name="searching">카드검색</string> <string name="searching">카드검색</string>
<string name="card_faq">뽜큐</string> <string name="card_faq">뽜큐</string>
<string name="no_webbrowser">웹브라우저를 사용하지 않습니다.</string> <string name="no_webbrowser">웹브라우저를 사용하지 않습니다.</string>
......
mobile/src/main/res/values-zh/strings.xml
View file @ 9ed5afa2
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<string name="label_level">星/标数</string> <string name="label_level">星/标数</string>
<string name="label_attr">属性</string> <string name="label_attr">属性</string>
<string name="label_category">效果分类</string> <string name="label_category">效果分类</string>
<string name="linkmarker">连接标记</string>> <string name="linkmarker">◀连接标记▶</string>>
<string name="searching">读取中</string> <string name="searching">读取中</string>
<string name="card_faq">在线调整</string> <string name="card_faq">在线调整</string>
<string name="no_webbrowser">没有安装浏览器</string> <string name="no_webbrowser">没有安装浏览器</string>
......
mobile/src/main/res/values/colors.xml
View file @ 9ed5afa2
...@@ -26,4 +26,5 @@ ...@@ -26,4 +26,5 @@
<color name="FallNavy">#11113d</color> <color name="FallNavy">#11113d</color>
<color name="colorMain">#2196F3</color> <color name="colorMain">#2196F3</color>
<color name="background">#ECEFF1</color> <color name="background">#ECEFF1</color>
<color name="transparent">#00000000</color>
</resources> </resources>
\ No newline at end of file
mobile/src/main/res/values/strings.xml
View file @ 9ed5afa2
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<string name="label_set">Card Set</string> <string name="label_set">Card Set</string>
<string name="label_level">Lv/Rk/Lmk</string> <string name="label_level">Lv/Rk/Lmk</string>
<string name="label_attr">Attribute</string> <string name="label_attr">Attribute</string>
<string name="linkmarker">LINKMARKER</string>> <string name="linkmarker">◀LinkArrows▶</string>>
<string name="label_category">Category</string> <string name="label_category">Category</string>
<string name="searching">Search Cards</string> <string name="searching">Search Cards</string>
<string name="card_faq">FAQ</string> <string name="card_faq">FAQ</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment