Skip to content

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

我的云卡组添加公开和自用切换状态

parent 44caa04a
Hide whitespace changes
Inline Side-by-side
Showing with 130 additions and 101 deletions
mobile/src/main/res/drawable/chat_message_me_background.xml → mobile/src/main/res/drawable/button_radius_black_transparents.xml
View file @ 90e3178a
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
<item android:state_pressed="true"> <item android:state_pressed="true">
<shape> <shape>
<corners android:radius="5dp" /> <corners android:radius="5dp" />
<solid android:color="#B0BEC5" /> <solid android:color="#FF000000" />
</shape> </shape>
</item> </item>
<item> <item>
<shape> <shape>
<corners android:radius="5dp" /> <corners android:radius="5dp" />
<solid android:color="#cfd8dc" /> <solid android:color="#80000000" />
</shape> </shape>
</item> </item>
</selector> </selector>
mobile/src/main/res/drawable/chat_content_background.xml → mobile/src/main/res/drawable/button_radius_n.xml
View file @ 90e3178a
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<item> <item>
<shape> <shape>
<corners android:radius="8dp" /> <corners android:radius="8dp" />
<solid android:color="@android:color/white" /> <solid android:color="@android:color/holo_green_dark" />
</shape> </shape>
</item> </item>
</selector> </selector>
mobile/src/main/res/drawable/chat_message_background.xml → mobile/src/main/res/drawable/button_radius_red.xml
View file @ 90e3178a
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
<item android:state_pressed="true"> <item android:state_pressed="true">
<shape> <shape>
<corners android:radius="5dp" /> <corners android:radius="5dp" />
<solid android:color="#E3F2FD" /> <solid android:color="#6A0101" />
</shape> </shape>
</item> </item>
<item> <item>
<shape> <shape>
<corners android:radius="5dp" /> <corners android:radius="5dp" />
<solid android:color="@color/blackLinght" /> <solid android:color="@color/colorAccentDark" />
</shape> </shape>
</item> </item>
</selector> </selector>
\ No newline at end of file
mobile/src/main/res/layout/item_deck_info.xml
View file @ 90e3178a
...@@ -18,23 +18,18 @@ ...@@ -18,23 +18,18 @@
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/box"/> android:src="@drawable/box"/>
<!-- <TextView
android:id="@+id/deck_id"
android:layout_width="match_parent"
android:layout_height="wrap_content" />-->
<LinearLayout <LinearLayout
android:layout_width="35dp" android:layout_width="35dp"
android:layout_height="10dp" android:layout_height="10dp"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:background="@drawable/chat_message_background" android:background="@drawable/button_radius_black_transparents"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
android:layout_width="10dp" android:layout_width="10dp"
android:layout_height="10dp" android:layout_height="10dp"
android:layout_marginLeft="1dp" android:layout_marginLeft="2dp"
android:src="@drawable/baseline_thumb_up_24"/> android:src="@drawable/baseline_thumb_up_24"/>
<TextView <TextView
...@@ -45,39 +40,47 @@ ...@@ -45,39 +40,47 @@
android:lines="1" android:lines="1"
android:gravity="center" android:gravity="center"
android:layout_marginLeft="1dp" android:layout_marginLeft="1dp"
android:layout_marginRight="1dp" android:layout_marginRight="5dp"
android:textSize="5sp"/> android:textSize="5sp"/>
</LinearLayout> </LinearLayout>
<TextView
android:id="@+id/deck_info_name" <LinearLayout
android:layout_width="57dp" android:layout_width="75dp"
android:layout_height="18dp" android:layout_height="wrap_content"
android:layout_marginLeft="28dp" android:layout_marginLeft="18dp"
android:layout_marginTop="98dp" android:layout_marginTop="15dp"
android:text="deck_name" android:orientation="vertical">
android:textColor="@color/white"
android:gravity="center"
android:textSize="7sp"/>
<TextView <TextView
android:id="@+id/deck_contributor" android:id="@+id/deck_contributor"
android:layout_width="72dp" android:layout_width="wrap_content"
android:layout_height="15dp" android:layout_height="15dp"
android:layout_marginLeft="21dp" android:layout_gravity="center"
android:layout_marginTop="15dp" android:gravity="center"
android:text="contributor_name"
android:lines="1" android:lines="1"
android:text="contributor_name"
android:textSize="6sp" />
<TextView
android:id="@+id/deck_info_name"
android:layout_width="57dp"
android:layout_height="18dp"
android:layout_marginTop="70dp"
android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:textSize="6sp"/> android:text="deck_name"
android:textColor="@color/white"
android:textSize="7sp" />
<TextView <TextView
android:id="@+id/deck_last_date" android:id="@+id/deck_last_date"
android:layout_width="74dp" android:layout_width="wrap_content"
android:layout_height="10dp" android:layout_height="wrap_content"
android:layout_marginLeft="18dp" android:layout_gravity="center|bottom"
android:layout_marginTop="117dp"
android:text="1900-02-03"
android:lines="1"
android:gravity="center" android:gravity="center"
android:textSize="6sp"/> android:lines="1"
android:text="1900-02-03"
android:textSize="6sp" />
</LinearLayout>
</FrameLayout> </FrameLayout>
\ No newline at end of file
mobile/src/main/res/layout/item_my_deck.xml
View file @ 90e3178a
...@@ -16,75 +16,101 @@ ...@@ -16,75 +16,101 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/box"/> android:src="@drawable/box" />
<!-- <TextView
android:id="@+id/my_deck_id"
android:layout_width="match_parent"
android:layout_height="wrap_content" />-->
<LinearLayout <LinearLayout
android:layout_width="35dp" android:id="@+id/btn_download"
android:layout_height="10dp" android:layout_width="wrap_content"
android:layout_marginLeft="10dp" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_margin="5dp"
android:background="@drawable/chat_message_background" android:layout_gravity="start"
android:background="@drawable/button_radius_n"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
android:id="@+id/show_on_deck_square" android:layout_width="12dp"
android:layout_width="10dp" android:layout_height="11dp"
android:layout_height="10dp" android:layout_marginLeft="5dp"
android:layout_marginLeft="1dp" android:layout_marginTop="2dp"
android:src="@drawable/baseline_remove_red_eye_24"/> android:layout_marginRight="5dp"
android:layout_marginBottom="2dp"
android:src="@drawable/ic_file_download_black_24dp" />
<TextView <TextView
android:id="@+id/change_show_or_hide" android:layout_width="wrap_content"
android:layout_width="20dp" android:layout_height="wrap_content"
android:layout_height="10dp" android:layout_gravity="center"
android:text="公开中" android:layout_marginRight="5dp"
android:lines="1"
android:gravity="center" android:gravity="center"
android:layout_marginLeft="1dp" android:lines="1"
android:layout_marginRight="1dp" android:text="@string/Download"
android:textSize="5sp"/> android:textColor="@color/white"
android:textSize="8sp" />
</LinearLayout> </LinearLayout>
<ImageView
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_gravity="end"
android:layout_margin="5dp"
android:background="@drawable/button_radius_red"
android:rotation="48"
android:src="@drawable/ic_add_white" />
<LinearLayout <LinearLayout
android:layout_width="35dp" android:layout_width="75dp"
android:layout_height="10dp" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginLeft="18dp"
android:layout_marginTop="5dp" android:layout_marginTop="15dp"
android:background="@drawable/chat_message_background" android:orientation="vertical">
android:orientation="horizontal">
<ImageView <LinearLayout
android:id="@+id/btn_download" android:layout_width="wrap_content"
android:layout_width="10dp" android:layout_height="wrap_content"
android:layout_height="10dp" android:layout_gravity="center"
android:layout_marginLeft="1dp" android:layout_marginTop="75dp"
android:src="@drawable/ic_server_download"/> android:background="@drawable/button_radius_red"
android:orientation="horizontal">
<ImageView
android:id="@+id/show_on_deck_square"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_marginLeft="5dp"
android:src="@drawable/baseline_remove_red_eye_24" />
<TextView
android:id="@+id/change_show_or_hide"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="1dp"
android:layout_marginRight="5dp"
android:lines="1"
android:text="@string/in_public"
android:textSize="5sp" />
</LinearLayout>
<TextView <TextView
android:layout_width="20dp" android:id="@+id/my_deck_name"
android:layout_height="10dp" android:layout_width="57dp"
android:text="@string/Download" android:layout_height="18dp"
android:lines="1" android:layout_gravity="center"
android:gravity="center"
android:text="deck_name"
android:textColor="@color/white"
android:textSize="7sp" />
<TextView
android:id="@+id/deck_update_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:layout_marginLeft="1dp" android:lines="1"
android:layout_marginRight="1dp" android:text="1900-02-03"
android:textSize="5sp"/> android:textSize="6sp" />
</LinearLayout> </LinearLayout>
<TextView
android:id="@+id/my_deck_name"
android:layout_width="57dp"
android:layout_height="18dp"
android:layout_marginLeft="28dp"
android:layout_marginTop="99dp"
android:text="deck_name"
android:textColor="@color/white"
android:gravity="center"
android:textSize="7sp"/>
<!--<TextView <!--<TextView
android:id="@+id/my_deck_id" android:id="@+id/my_deck_id"
...@@ -96,15 +122,4 @@ ...@@ -96,15 +122,4 @@
android:lines="1" android:lines="1"
android:gravity="center" android:gravity="center"
android:textSize="6sp"/> --> android:textSize="6sp"/> -->
<TextView
android:id="@+id/deck_update_date"
android:layout_width="74dp"
android:layout_height="10dp"
android:layout_marginLeft="18dp"
android:layout_marginTop="117dp"
android:text="1900-02-03"
android:lines="1"
android:gravity="center"
android:textSize="6sp"/>
</FrameLayout> </FrameLayout>
\ No newline at end of file
mobile/src/main/res/values-es/strings.xml
View file @ 90e3178a
...@@ -373,5 +373,7 @@ ...@@ -373,5 +373,7 @@
<string name="web_warn_save_deck">Abrir el Deck cerrará la página web que estás viendo actualmente. ¿Deseas cerrar la página web y abrir el Deck?</string> <string name="web_warn_save_deck">Abrir el Deck cerrará la página web que estás viendo actualmente. ¿Deseas cerrar la página web y abrir el Deck?</string>
<string name="go_to">pasar a</string> <string name="go_to">pasar a</string>
<string name="local_deck">mis mazos</string> <string name="local_deck">mis mazos</string>
<string name="in_public">Público</string>
<string name="in_personal_use">En Uso Personal</string>
</resources> </resources>
mobile/src/main/res/values-jp/strings.xml
View file @ 90e3178a
...@@ -367,4 +367,6 @@ ...@@ -367,4 +367,6 @@
<string name="web_warn_save_deck">デッキを開くと、現在閲覧しているウェブページが閉じられます。ウェブページを閉じてデッキを開きますか？</string> <string name="web_warn_save_deck">デッキを開くと、現在閲覧しているウェブページが閉じられます。ウェブページを閉じてデッキを開きますか？</string>
<string name="go_to">移る</string> <string name="go_to">移る</string>
<string name="local_deck">私のデッキ</string> <string name="local_deck">私のデッキ</string>
<string name="in_public">公開中</string>
<string name="in_personal_use">私用中</string>
</resources> </resources>
mobile/src/main/res/values-ko/strings.xml
View file @ 90e3178a
...@@ -368,4 +368,6 @@ ...@@ -368,4 +368,6 @@
<string name="web_warn_save_deck">덱을 열면 현재 보고 있는 웹 페이지가 닫힙니다. 웹 페이지를 닫고 덱을 열까요?</string> <string name="web_warn_save_deck">덱을 열면 현재 보고 있는 웹 페이지가 닫힙니다. 웹 페이지를 닫고 덱을 열까요?</string>
<string name="go_to">이동하다 로</string> <string name="go_to">이동하다 로</string>
<string name="local_deck">내 덱들</string> <string name="local_deck">내 덱들</string>
<string name="in_public">공개 중</string>
<string name="in_personal_use">개인 사용 중</string>
</resources> </resources>
mobile/src/main/res/values-pt/strings.xml
View file @ 90e3178a
...@@ -357,5 +357,7 @@ ...@@ -357,5 +357,7 @@
<string name="about_user_privacy_policy">Explicação das permissões utilizadas pelo YGOMobile</string> <string name="about_user_privacy_policy">Explicação das permissões utilizadas pelo YGOMobile</string>
<string name="go_to">pasar a</string> <string name="go_to">pasar a</string>
<string name="local_deck">meus decks</string> <string name="local_deck">meus decks</string>
<string name="in_public">Público</string>
<string name="in_personal_use">Em Uso Personal</string>
</resources> </resources>
mobile/src/main/res/values-zh/strings.xml
View file @ 90e3178a
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
<string name="search_open">过滤</string> <string name="search_open">过滤</string>
<string name="search_close">关闭</string> <string name="search_close">关闭</string>
<string name="reset">重置</string> <string name="reset">重置</string>
<string name="hit_keyword1">关键词(空格隔开)</string> <string name="hit_keyword1">关键词</string>
<string name="hit_atk">ATK</string> <string name="hit_atk">ATK</string>
<string name="hit_def">DEF</string> <string name="hit_def">DEF</string>
<string name="label_race">种族</string> <string name="label_race">种族</string>
...@@ -370,7 +370,8 @@ ...@@ -370,7 +370,8 @@
<string name="go_to">转到</string> <string name="go_to">转到</string>
<string name="web_warn_save_deck">打开卡组将关闭正在浏览的网页，是否关闭网页并打开卡组</string> <string name="web_warn_save_deck">打开卡组将关闭正在浏览的网页，是否关闭网页并打开卡组</string>
<string name="local_deck">我的卡组</string> <string name="local_deck">我的卡组</string>
<string name="in_public">公开中</string>
<string name="in_personal_use">自用中</string>
<string name="down_complete">下载完成</string> <string name="down_complete">下载完成</string>
<string name="upload">上传</string> <string name="upload">上传</string>
......
mobile/src/main/res/values/strings.xml
View file @ 90e3178a
...@@ -437,4 +437,6 @@ ...@@ -437,4 +437,6 @@
<string name="upload">upload</string> <string name="upload">upload</string>
<string name="go_to">go to</string> <string name="go_to">go to</string>
<string name="local_deck">my decks</string> <string name="local_deck">my decks</string>
<string name="in_public">in Public</string>
<string name="in_personal_use">in Personal Use</string>
</resources> </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