Skip to content

Y
YGOMobile
Commit eb3bf308 authored by fallenstardust's avatar fallenstardust
Browse files
Options

调整布局

parent 702cc758
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 67 deletions
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardSearcher.java
View file @ eb3bf308
......@@ -223,7 +223,7 @@ public class CardSearcher implements View.OnClickListener {
mCallBack.setLimit(limit);
// 重置禁限筛选条件，以免切换时出现不合预期的结果
reset(isChecked ? genesys_limitSpinner : limitSpinner);
genesys_Switch.setText(isChecked ? "起源赛制模式" : "传统禁限模式");
genesys_Switch.setText(isChecked ? R.string.switch_genesys_mode : R.string.switch_banlist_mode);
mSettings.setGenesysMode(isChecked ? 1 : 0);
});
limitListSpinner.setVisibility(genesys_Switch.isChecked() ? View.GONE : View.VISIBLE);
......
mobile/src/main/res/layout/nav_card_search.xml
View file @ eb3bf308
......@@ -27,41 +27,23 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="40dp">
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/sp_ot"
style="@style/itemSpinnerStyle"
android:layout_width="0dp"
android:layout_height="@dimen/label_width_small"
android:layout_weight="1"
android:textSize="12sp" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_my_fav"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/transparent"
android:text="@string/my_favorites"
android:textColor="@color/selector_text_color_white_gold"
android:visibility="visible" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/label_width_small"
android:orientation="horizontal">
android:layout_weight="1" />
<Switch
android:id="@+id/sw_genesys_mode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="切换为起源(GENESYS)赛制模式" />
android:text="@string/switch_banlist_mode" />
</LinearLayout>
<LinearLayout
......@@ -100,28 +82,6 @@
android:visibility="gone" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/label_width_small"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/sp_category"
style="@style/itemSpinnerStyle"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/sp_scale"
style="@style/itemSpinnerStyle"
android:layout_width="0dp"
android:layout_height="@dimen/label_width_small"
android:layout_weight="1"
android:visibility="invisible" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/label_width_small"
......@@ -135,15 +95,12 @@
android:layout_weight="1"
app:searchTitle="@string/label_set" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_linkmarker"
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/sp_category"
style="@style/itemSpinnerStyle"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/transparent"
android:text="@string/linkmarker"
android:visibility="visible" />
android:layout_weight="1" />
</LinearLayout>
<LinearLayout
......@@ -160,6 +117,7 @@
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/sp_race"
style="@style/itemSpinnerStyle"
android:layout_width="0dp"
android:layout_height="@dimen/label_width_small"
android:layout_weight="1"
......@@ -228,6 +186,30 @@
android:layout_weight="1" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/label_width_small"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_linkmarker"
style="@style/itemSpinnerStyle"
android:layout_width="0dp"
android:layout_marginLeft="10dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/transparent"
android:text="@string/linkmarker"
android:visibility="visible" />
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/sp_scale"
style="@style/itemSpinnerStyle"
android:layout_width="0dp"
android:layout_height="@dimen/label_width_small"
android:layout_weight="1"
android:visibility="invisible" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
......@@ -288,19 +270,37 @@
android:textColorHint="@color/gold" />
</com.google.android.material.textfield.TextInputLayout>
<CheckBox
android:id="@+id/chk_multi_keyword"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/label_width_small"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="30dp"
android:text="@string/settings_key_words_split"
android:textSize="10sp" />
android:orientation="horizontal">
<CheckBox
android:id="@+id/chk_multi_keyword"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="@string/settings_key_words_split"
android:textSize="10sp" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_my_fav"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/button_radius_black_transparents"
android:text="@string/my_favorites"
android:textColor="@color/selector_text_color_white_gold"
android:visibility="visible" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatButton
......
mobile/src/main/res/values-es/strings.xml
View file @ eb3bf308
......@@ -132,7 +132,7 @@
<string name="label_level">Nvl/Rng/Lnk</string>
<string name="label_attr">Atributo</string>
<string name="label_category">Categoría</string>
<string name="linkmarker">◀F.Enlace▶</string>>
<string name="linkmarker">F.Enlace▶</string>>
<string name="searching">Cargando</string>
<string name="card_faq">Ver reglas</string>
<string name="card_related">Relacionadas</string>
......@@ -386,6 +386,8 @@
<string name="tip_credit_max">Excede el límite de %d</string>
<string name="point_cost">Consumo de puntos</string>
<string name="credit_limit">Límite de puntos</string>
<string name="switch_genesys_mode">Modo de GENESYS</string>
<string name="switch_banlist_mode">Modo de Restrição</string>
</resources>
mobile/src/main/res/values-jp/strings.xml
View file @ eb3bf308
......@@ -125,7 +125,7 @@
<string name="label_level">レベル/标数</string>
<string name="label_attr">属性</string>
<string name="label_category">効果分類</string>
<string name="linkmarker">◀リンクマーカー▶</string>>
<string name="linkmarker">リンクマーカー▶</string>>
<string name="searching">ロード中</string>
<string name="card_faq">Q&amp;A</string>
<string name="card_related">関連カード</string>
......@@ -387,4 +387,6 @@
<string name="tip_credit_max">" %dの上限を超えています"</string>
<string name="point_cost">ポイント消費</string>
<string name="credit_limit">ポイント上限</string>
<string name="switch_genesys_mode">起源点数モード</string>
<string name="switch_banlist_mode">禁限通常モード</string>
</resources>
mobile/src/main/res/values-ko/strings.xml
View file @ eb3bf308
......@@ -143,7 +143,7 @@
<string name="label_set_No_Setcode">#카드 세트가 포함되지 않음</string>
<string name="label_level">레벨/랭크/링크</string>
<string name="label_attr">속성</string>
<string name="linkmarker">◀링크 마커▶</string>>
<string name="linkmarker">링크 마커▶</string>>
<string name="label_category">카테고리</string>
<string name="searching">카드 검색</string>
<string name="card_faq">FAQ</string>
......@@ -405,4 +405,6 @@
<string name="pre_view">미리 보기</string>
<string name="point_cost">포인트 소모</string>
<string name="credit_limit">포인트 상한</string>
<string name="switch_genesys_mode">기원제식 모드</string>
<string name="switch_banlist_mode">일반금한 모드</string>
</resources>
mobile/src/main/res/values-pt/strings.xml
View file @ eb3bf308
......@@ -123,7 +123,7 @@
<string name="label_level">Nvl/Rng/Lnk</string>
<string name="label_attr">Atributo</string>
<string name="label_category">Categoria</string>
<string name="linkmarker">◀F.Enlace▶</string>
<string name="linkmarker">F.Enlace▶</string>
<string name="searching">Buscar</string>
<string name="card_faq">FAQ</string>
<string name="no_webbrowser">Nenhum navegador da web instalado</string>
......@@ -377,5 +377,7 @@
<string name="tip_credit_max">Excede o limite de %d</string>
<string name="point_cost">Consumo de puntos</string>
<string name="credit_limit">Limite de pontos</string>
<string name="switch_genesys_mode">Modo de GENESYS</string>
<string name="switch_banlist_mode">Modo de Restrição</string>
</resources>
mobile/src/main/res/values-zh/strings.xml
View file @ eb3bf308
......@@ -121,6 +121,8 @@
<string name="label_ot_No_Exclusive">无独有卡</string>
<string name="label_ot_All">全部卡片</string>
<string name="label_limit">不限制</string>
<string name="switch_genesys_mode">起源点数模式</string>
<string name="switch_banlist_mode">禁限常规模式</string>
<string name="label_limitlist">禁卡表</string>
<string name="label_type">卡片类型</string>
<string name="label_set">字段</string>
......@@ -128,7 +130,7 @@
<string name="label_level">星/标数</string>
<string name="label_attr">属性</string>
<string name="label_category">效果分类</string>
<string name="linkmarker">◀连接标记▶</string>>
<string name="linkmarker">连接标记▶</string>>
<string name="searching">读取中</string>
<string name="card_faq">裁定查询</string>
<string name="card_related">关联卡片</string>
......
mobile/src/main/res/values/strings.xml
View file @ eb3bf308
......@@ -147,7 +147,7 @@
<string name="label_set_No_Setcode">#No Card Set included</string>
<string name="label_level">Lv/Rk/Lmk</string>
<string name="label_attr">Attribute</string>
<string name="linkmarker">◀LinkArrows▶</string>>
<string name="linkmarker">LinkArrows▶</string>>
<string name="label_category">Category</string>
<string name="searching">Search Cards</string>
<string name="card_faq">FAQ</string>
......@@ -417,4 +417,6 @@
<string name="pre_view">pre view</string>
<string name="point_cost">Point Costs</string>
<string name="credit_limit">Point Limit</string>
<string name="switch_genesys_mode">GENESYS Mode</string>
<string name="switch_banlist_mode">BANLIST Mode</string>
</resources>
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