Skip to content

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

arrange res

parent bdde3484
Hide whitespace changes
Inline Side-by-side
Showing with 828 additions and 875 deletions
mobile/src/main/java/cn/garymb/ygomobile/ui/mycard/mcchat/SplashActivity.java
View file @ e52eb3d3
......@@ -144,7 +144,6 @@ public class SplashActivity extends Activity {
try {
su.login(name, password);
} catch (Exception e) {
Log.e("登录失败", "登录失败" + e);
Message me = new Message();
me.obj = e;
me.what = 0;
......
mobile/src/main/res/anim/push_in.xml
View file @ e52eb3d3
......@@ -3,5 +3,5 @@
<alpha
android:duration="800"
android:fromAlpha="0.1"
android:toAlpha="1.0"/>
android:toAlpha="1.0" />
</set>
\ No newline at end of file
mobile/src/main/res/anim/push_out.xml
View file @ e52eb3d3
......@@ -3,5 +3,5 @@
<alpha
android:duration="500"
android:fromAlpha="1.0"
android:toAlpha="0.0"/>
android:toAlpha="0.0" />
</set>
\ No newline at end of file
mobile/src/main/res/anim/shake.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<translate xmlns:android="http://schemas.android.com/apk/res/android"
android:fromYDelta="0"
android:toYDelta="10"
android:duration="50000"
android:interpolator="@anim/cycle" />
\ No newline at end of file
android:fromYDelta="0"
android:interpolator="@anim/cycle"
android:toYDelta="10" />
\ No newline at end of file
mobile/src/main/res/anim/slide_left_in.xml
View file @ e52eb3d3
......@@ -4,6 +4,6 @@
<translate
android:duration="200"
android:fromXDelta="-100.0%p"
android:toXDelta="0.0"/>
android:toXDelta="0.0" />
</set>
\ No newline at end of file
mobile/src/main/res/anim/slide_left_out.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android" >
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate
android:duration="200"
......
mobile/src/main/res/anim/slide_right_in.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android" >
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate
android:duration="200"
......
mobile/src/main/res/anim/slide_right_out.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android" >
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate
android:duration="200"
......
mobile/src/main/res/drawable/background_lp_progress_bar.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:layout_width="match_parent">
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<!--item
android:id="@android:id/background"
android:drawable="@color/colorPrimary">
</item-->
<!--item
android:id="@android:id/background"
android:drawable="@color/colorPrimary">
</item-->
<!-- 设置进度条颜色 -->
<item
android:id="@android:id/progress" >
<clip
android:drawable="@drawable/veil2">
</clip>
</item>
<!-- 设置进度条颜色 -->
<item android:id="@android:id/progress">
<clip android:drawable="@drawable/veil2"></clip>
</item>
</layer-list>
\ No newline at end of file
mobile/src/main/res/drawable/button2_bg.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/button2_p" android:state_pressed="true"/>
<item android:drawable="@drawable/button2_n"/>
<item android:drawable="@drawable/button2_p" android:state_pressed="true" />
<item android:drawable="@drawable/button2_n" />
</selector>
\ No newline at end of file
mobile/src/main/res/drawable/button2_n.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="UTF-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="@color/colorPrimary" />
......@@ -10,9 +9,8 @@
<!-- padding：Button里面的文字与Button边界的间隔 -->
<padding
android:bottom="10dp"
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp"
/>
android:top="10dp" />
</shape>
\ No newline at end of file
mobile/src/main/res/drawable/button2_p.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="UTF-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="@color/colorPrimaryDark" />
......@@ -10,9 +9,8 @@
<!-- padding：Button里面的文字与Button边界的间隔 -->
<padding
android:bottom="10dp"
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp"
/>
android:top="10dp" />
</shape>
\ No newline at end of file
mobile/src/main/res/drawable/button_bg.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/button_p" android:state_pressed="true"/>
<item android:drawable="@drawable/button_n"/>
<item android:drawable="@drawable/button_p" android:state_pressed="true" />
<item android:drawable="@drawable/button_n" />
</selector>
\ No newline at end of file
mobile/src/main/res/drawable/chat_content_background.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape>
<corners android:radius="8dp"/>
<solid android:color="#FF2E5920"/>
<corners android:radius="8dp" />
<solid android:color="#FF2E5920" />
</shape>
</item>
<item>
<shape>
<corners android:radius="8dp"/>
<solid android:color="@android:color/white"/>
<corners android:radius="8dp" />
<solid android:color="@android:color/white" />
</shape>
</item>
</selector>
mobile/src/main/res/drawable/chat_edittext_background.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<corners android:radius="5dp"/>
<solid android:color="#ffffffff"/>
<corners android:radius="5dp" />
<solid android:color="#ffffffff" />
</shape>
</item>
</selector>
mobile/src/main/res/drawable/chat_message_background.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape>
<corners android:radius="5dp"/>
<solid android:color="#E3F2FD"/>
<corners android:radius="5dp" />
<solid android:color="#E3F2FD" />
</shape>
</item>
<item>
<shape>
<corners android:radius="5dp"/>
<solid android:color="@color/white"/>
<corners android:radius="5dp" />
<solid android:color="@color/white" />
</shape>
</item>
</selector>
\ No newline at end of file
mobile/src/main/res/drawable/chat_message_me_background.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape>
<corners android:radius="5dp"/>
<solid android:color="#B0BEC5"/>
<corners android:radius="5dp" />
<solid android:color="#B0BEC5" />
</shape>
</item>
<item>
<shape>
<corners android:radius="5dp"/>
<solid android:color="#cfd8dc"/>
<corners android:radius="5dp" />
<solid android:color="#cfd8dc" />
</shape>
</item>
</selector>
mobile/src/main/res/drawable/chat_send_button_background.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape>
<corners android:radius="5dp"/>
<solid android:color="#1183F3"/>
<corners android:radius="5dp" />
<solid android:color="#1183F3" />
</shape>
</item>
<item>
<shape>
<corners android:radius="5dp"/>
<solid android:color="#FF11B7F3"/>
<corners android:radius="5dp" />
<solid android:color="#FF11B7F3" />
</shape>
</item>
</selector>
mobile/src/main/res/drawable/color_bg.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="UTF-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/colorAccentDark" />
<corners android:radius="25dp" />
......
mobile/src/main/res/drawable/ic_about.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M12,19m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
android:pathData="M12,19m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
<path
android:fillColor="#FF000000"
android:pathData="M10,3h4v12h-4z"/>
android:pathData="M10,3h4v12h-4z" />
</vector>
mobile/src/main/res/drawable/ic_add.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/black"
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
</vector>
mobile/src/main/res/drawable/ic_add_circle.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/colorPrimaryDark"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z"/>
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z" />
</vector>
mobile/src/main/res/drawable/ic_add_color.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/colorPrimary"
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
</vector>
mobile/src/main/res/drawable/ic_add_white.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFF"
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
</vector>
mobile/src/main/res/drawable/ic_back.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/colorPrimary"
android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/>
android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z" />
</vector>
mobile/src/main/res/drawable/ic_back_white.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/white"
android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/>
android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z" />
</vector>
mobile/src/main/res/drawable/ic_close_black_24dp.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/colorAccentDark"
android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
</vector>
mobile/src/main/res/drawable/ic_collections.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/white"
android:pathData="M22,16L22,4c0,-1.1 -0.9,-2 -2,-2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zM11,12l2.03,2.71L16,11l4,5L8,16l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6L2,6z"/>
android:pathData="M22,16L22,4c0,-1.1 -0.9,-2 -2,-2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zM11,12l2.03,2.71L16,11l4,5L8,16l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6L2,6z" />
</vector>
mobile/src/main/res/drawable/ic_control_point.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/holo_blue_bright"
android:pathData="M13,7h-2v4L7,11v2h4v4h2v-4h4v-2h-4L13,7zM12,2C6.49,2 2,6.49 2,12s4.49,10 10,10 10,-4.49 10,-10S17.51,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
android:pathData="M13,7h-2v4L7,11v2h4v4h2v-4h4v-2h-4L13,7zM12,2C6.49,2 2,6.49 2,12s4.49,10 10,10 10,-4.49 10,-10S17.51,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
</vector>
mobile/src/main/res/drawable/ic_create_new_folder.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/colorPrimary"
android:pathData="M20,6h-8l-2,-2L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM19,14h-3v3h-2v-3h-3v-2h3L14,9h2v3h3v2z"/>
android:pathData="M20,6h-8l-2,-2L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM19,14h-3v3h-2v-3h-3v-2h3L14,9h2v3h3v2z" />
</vector>
mobile/src/main/res/drawable/ic_edit.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/black"
android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
</vector>
mobile/src/main/res/drawable/ic_edit_color.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/gold"
android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
</vector>
mobile/src/main/res/drawable/ic_edit_white.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/white"
android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
</vector>
mobile/src/main/res/drawable/ic_file_download_black_24dp.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z" />
</vector>
mobile/src/main/res/drawable/ic_folder_black.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/colorAccent"
android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z" />
</vector>
mobile/src/main/res/drawable/ic_folder_open.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/colorAccent"
android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8h16v10z"/>
android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8h16v10z" />
</vector>
mobile/src/main/res/drawable/ic_forum.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/colorAccent"
android:pathData="M21,6h-2v9L6,15v2c0,0.55 0.45,1 1,1h11l4,4L22,7c0,-0.55 -0.45,-1 -1,-1zM17,12L17,3c0,-0.55 -0.45,-1 -1,-1L3,2c-0.55,0 -1,0.45 -1,1v14l4,-4h10c0.55,0 1,-0.45 1,-1z"/>
android:pathData="M21,6h-2v9L6,15v2c0,0.55 0.45,1 1,1h11l4,4L22,7c0,-0.55 -0.45,-1 -1,-1zM17,12L17,3c0,-0.55 -0.45,-1 -1,-1L3,2c-0.55,0 -1,0.45 -1,1v14l4,-4h10c0.55,0 1,-0.45 1,-1z" />
</vector>
mobile/src/main/res/drawable/ic_highlight.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/colorAccent"
android:pathData="M6,14l3,3v5h6v-5l3,-3L18,9L6,9zM11,2h2v3h-2zM3.5,5.875L4.914,4.46l2.12,2.122L5.62,7.997zM16.96,6.585l2.123,-2.12 1.414,1.414L18.375,8z"/>
android:pathData="M6,14l3,3v5h6v-5l3,-3L18,9L6,9zM11,2h2v3h-2zM3.5,5.875L4.914,4.46l2.12,2.122L5.62,7.997zM16.96,6.585l2.123,-2.12 1.414,1.414L18.375,8z" />
</vector>
mobile/src/main/res/drawable/ic_home.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/colorAccent"
android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
</vector>
mobile/src/main/res/drawable/ic_home_black.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/black"
android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
</vector>
mobile/src/main/res/drawable/ic_insert_drive_file.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/white"
android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z"/>
android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z" />
</vector>
mobile/src/main/res/drawable/ic_live_help.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M19,2L5,2c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h4l3,3 3,-3h4c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM13,18h-2v-2h2v2zM15.07,10.25l-0.9,0.92C13.45,11.9 13,12.5 13,14h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,8c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
android:pathData="M19,2L5,2c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h4l3,3 3,-3h4c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM13,18h-2v-2h2v2zM15.07,10.25l-0.9,0.92C13.45,11.9 13,12.5 13,14h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,8c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z" />
</vector>
mobile/src/main/res/drawable/ic_live_help_white.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/white"
android:pathData="M12,19m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
android:pathData="M12,19m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
<path
android:fillColor="@color/white"
android:pathData="M10,3h4v12h-4z"/>
android:pathData="M10,3h4v12h-4z" />
</vector>
mobile/src/main/res/drawable/ic_mode_save.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/white"
android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z" />
</vector>
mobile/src/main/res/drawable/ic_mode_save_white.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/white"
android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z" />
</vector>
mobile/src/main/res/drawable/ic_refresh.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/white"
android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z"/>
android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z" />
</vector>
mobile/src/main/res/drawable/ic_search.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
</vector>
mobile/src/main/res/drawable/ic_search_white.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#ffffff"
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
</vector>
mobile/src/main/res/drawable/ic_send_black_24dp.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#1976D2"
android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
</vector>
mobile/src/main/res/drawable/ic_settings.xml
View file @ e52eb3d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z"/>
android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z" />
</vector>
mobile/src/main/res/drawable/item_bg.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="UTF-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/item_bg" />
<corners android:radius="10dp" />
......
mobile/src/main/res/drawable/progressbar.xml
View file @ e52eb3d3
......@@ -4,7 +4,7 @@
<shape>
<gradient
android:endColor="@color/white"
android:startColor="@color/white"/>
android:startColor="@color/white" />
</shape>
</clip>
</item>
......@@ -13,7 +13,7 @@
<shape>
<gradient
android:endColor="@color/colorPrimary"
android:startColor="@color/colorPrimary"/>
android:startColor="@color/colorPrimary" />
</shape>
</clip>
</item>
......@@ -22,7 +22,7 @@
<shape>
<gradient
android:endColor="@color/dark_purple"
android:startColor="@color/mediumPurpleLight"/>
android:startColor="@color/mediumPurpleLight" />
</shape>
</clip>
</item>
......
mobile/src/main/res/drawable/selected.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="UTF-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- 填充的颜色 -->
<stroke android:color="@color/brightgreen" android:width="2dp"/>
<stroke
android:width="2dp"
android:color="@color/brightgreen" />
</shape>
\ No newline at end of file
mobile/src/main/res/drawable/textview_border.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
android:shape="rectangle">
<stroke
android:width="1dp"
android:color="@color/white"/>
android:color="@color/white" />
</shape>
\ No newline at end of file
mobile/src/main/res/layout/activity_deck_cards2.xml
View file @ e52eb3d3
......@@ -12,8 +12,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<include
layout="@layout/content_toolbar_list"/>
<include layout="@layout/content_toolbar_list" />
<LinearLayout
android:id="@+id/layout_main"
......@@ -24,7 +23,7 @@
<View
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"/>
android:layout_height="?attr/actionBarSize" />
<cn.garymb.ygomobile.ui.widget.DeckGroupView
android:id="@+id/deck_group"
......@@ -33,16 +32,16 @@
<cn.garymb.ygomobile.ui.widget.DeckView
android:id="@+id/deckview"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:visibility="gone" />
<CheckBox
android:id="@+id/chk_autosort"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:text="自动排序"/>
android:text="自动排序" />
<LinearLayout
android:layout_width="match_parent"
......@@ -54,26 +53,29 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="删除模式"/>
android:text="删除模式" />
<Button
android:id="@+id/btn_edit_main2side"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="主卡组到副卡组"/>
android:text="主卡组到副卡组" />
<Button
android:id="@+id/btn_edit_side2main"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="副卡组到主卡组"/>
android:text="副卡组到主卡组" />
<Button
android:id="@+id/btn_delete"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:enabled="false"
android:text="完成"/>
android:text="完成" />
</LinearLayout>
</LinearLayout>
</FrameLayout>
......@@ -91,22 +93,21 @@
android:background="@drawable/left"
android:orientation="vertical"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:paddingTop="2dp">
android:paddingTop="2dp"
android:paddingRight="4dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/item_height"
android:layout_marginBottom="4dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="10dp"
android:layout_marginRight="30dp"
android:layout_marginTop="10dp">
android:layout_marginBottom="4dp">
<android.support.v7.widget.AppCompatSpinner
android:id="@+id/sp_limit_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
android:layout_height="match_parent" />
</LinearLayout>
<com.tubb.smrv.SwipeMenuRecyclerView
......@@ -116,7 +117,7 @@
android:divider="@android:color/transparent"
android:dividerHeight="4dp"
android:padding="2dp"
android:scrollbars="none"/>
android:scrollbars="none" />
</LinearLayout>
</LinearLayout>
......@@ -129,7 +130,7 @@
<include
android:id="@+id/nav_view_list"
layout="@layout/nav_card_search"/>
layout="@layout/nav_card_search" />
</LinearLayout>
</android.support.v4.widget.DrawerLayout>
......
mobile/src/main/res/layout/activity_deck_cards3.xml
View file @ e52eb3d3
......@@ -12,8 +12,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<include
layout="@layout/content_toolbar_list"/>
<include layout="@layout/content_toolbar_list" />
<LinearLayout
android:layout_width="match_parent"
......@@ -24,12 +23,12 @@
<View
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_marginBottom="5dp"/>
android:layout_marginBottom="5dp" />
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerview"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
......@@ -46,7 +45,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="refresh"/>
android:text="refresh" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
......@@ -65,22 +64,21 @@
android:background="@drawable/left"
android:orientation="vertical"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:paddingTop="2dp">
android:paddingTop="2dp"
android:paddingRight="4dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/item_height"
android:layout_marginBottom="4dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="10dp"
android:layout_marginRight="30dp"
android:layout_marginTop="10dp">
android:layout_marginBottom="4dp">
<android.support.v7.widget.AppCompatSpinner
android:id="@+id/sp_limit_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
android:layout_height="match_parent" />
</LinearLayout>
<com.tubb.smrv.SwipeMenuRecyclerView
......@@ -90,7 +88,7 @@
android:divider="@android:color/transparent"
android:dividerHeight="4dp"
android:padding="2dp"
android:scrollbars="none"/>
android:scrollbars="none" />
</LinearLayout>
</LinearLayout>
......@@ -103,7 +101,7 @@
<include
android:id="@+id/nav_view_list"
layout="@layout/nav_card_search"/>
layout="@layout/nav_card_search" />
</LinearLayout>
</android.support.v4.widget.DrawerLayout>
......
mobile/src/main/res/layout/activity_filebrowser.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
......
mobile/src/main/res/layout/activity_home.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg3"
......@@ -96,12 +95,12 @@
android:layout_width="150dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:background="@drawable/blue"
android:gravity="center"
android:text="@string/return_to_duel"
android:textColor="@color/item_title"
android:background="@drawable/blue"
android:visibility="gone"
android:textSize="20sp" />
android:textSize="20sp"
android:visibility="gone" />
</LinearLayout>
</LinearLayout>
</FrameLayout>
\ No newline at end of file
mobile/src/main/res/layout/activity_logo.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:id="@+id/activity_logo"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/activity_logo"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="400dp"
......
mobile/src/main/res/layout/activity_online_mycard.xml
View file @ e52eb3d3
......@@ -11,7 +11,6 @@
tools:openDrawer="left">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
......@@ -19,14 +18,13 @@
<cn.garymb.ygomobile.ui.mycard.MyCardWebView
android:id="@+id/webbrowser"
android:layout_width="match_parent"
android:layout_height="match_parent" >
android:layout_height="match_parent">
<ProgressBar
android:id="@+id/progressBar"
style="@style/StyleProgressBarMini"
android:layout_width="match_parent"
android:layout_height="5px"
/>
android:layout_height="5px" />
</cn.garymb.ygomobile.ui.mycard.MyCardWebView>
......@@ -44,5 +42,4 @@
app:menu="@menu/nav_mycard_menu" />
</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
mobile/src/main/res/layout/activity_photo.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include
layout="@layout/content_toolbar"/>
<include layout="@layout/content_toolbar" />
<uk.co.senab.photoview.PhotoView
android:id="@+id/photoview"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
</LinearLayout>
</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
mobile/src/main/res/layout/activity_search.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -18,8 +17,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include
layout="@layout/content_toolbar"/>
<include layout="@layout/content_toolbar" />
<com.tubb.smrv.SwipeMenuRecyclerView
android:id="@+id/list_cards"
......@@ -28,7 +27,7 @@
android:divider="@android:color/transparent"
android:dividerHeight="4dp"
android:padding="5dp"
android:scrollbars="none"/>
android:scrollbars="none" />
</LinearLayout>
<LinearLayout
......@@ -39,7 +38,7 @@
<include
android:id="@+id/nav_view_list"
layout="@layout/nav_card_search"/>
layout="@layout/nav_card_search" />
</LinearLayout>
</android.support.v4.widget.DrawerLayout>
</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
mobile/src/main/res/layout/activity_settings.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg3">
......@@ -11,8 +10,7 @@
android:background="#80000000"
android:orientation="vertical">
<include
layout="@layout/content_toolbar"/>
<include layout="@layout/content_toolbar" />
<FrameLayout
android:id="@+id/fragment"
......
mobile/src/main/res/layout/activity_splash.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:gravity="center"
android:id="@+id/sp_li"
android:background="@color/white">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/sp_li"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@color/white"
android:gravity="center"
android:orientation="horizontal">
<ProgressBar
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:id="@+id/sp_jz"/>
<ProgressBar
android:id="@+id/sp_jz"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/logining_in"
android:textColor="@color/dark_purple"
android:textSize="18sp"
android:id="@+id/sp_tv"/>
<TextView
android:id="@+id/sp_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/logining_in"
android:textColor="@color/dark_purple"
android:textSize="18sp" />
</LinearLayout>
mobile/src/main/res/layout/activity_webbrowser.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include
layout="@layout/content_toolbar"/>
<include layout="@layout/content_toolbar" />
<cn.garymb.ygomobile.ui.widget.WebViewPlus
android:id="@+id/webbrowser"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
</LinearLayout>
</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
mobile/src/main/res/layout/content_toolbar.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.AppBarLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.design.widget.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:background="@drawable/bar"
android:layout_height="wrap_content"
android:background="@drawable/bar"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
......@@ -12,5 +11,5 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:theme="@style/AppTheme.AppBarOverlay"/>
app:theme="@style/AppTheme.AppBarOverlay" />
</android.support.design.widget.AppBarLayout>
\ No newline at end of file
mobile/src/main/res/layout/content_toolbar_list.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.AppBarLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.design.widget.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
mobile/src/main/res/layout/debug_activity.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include
layout="@layout/content_toolbar"/>
<include layout="@layout/content_toolbar" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_list"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
</LinearLayout>
\ No newline at end of file
mobile/src/main/res/layout/dialog_alipay_or_wechat.xml
View file @ e52eb3d3
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
......@@ -7,14 +6,15 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_horizontal">
android:gravity="center_horizontal"
android:orientation="horizontal">
<Button
android:id="@+id/button_alipay"
android:layout_width="50dp"
android:layout_height="50dp"
android:background="@drawable/alipay" />
<TextView
android:layout_width="@dimen/label_width_middle"
android:layout_height="wrap_content"
......
mobile/src/main/res/layout/dialog_avatar_select.xml
View file @ e52eb3d3
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
......@@ -7,8 +6,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_horizontal">
android:gravity="center_horizontal"
android:orientation="horizontal">
<ImageView
android:id="@+id/me"
......
mobile/src/main/res/layout/dialog_bg_select.xml
View file @ e52eb3d3
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
......@@ -7,13 +6,13 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center">
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="@dimen/label_width_middle"
android:layout_height="wrap_content"
android:text="@string/bg"/>
android:text="@string/bg" />
<ImageView
android:id="@+id/bg"
......@@ -23,7 +22,7 @@
<TextView
android:layout_width="@dimen/label_width_middle"
android:layout_height="wrap_content"
android:text="@string/bg_menu"/>
android:text="@string/bg_menu" />
<ImageView
android:id="@+id/bg_menu"
......@@ -33,13 +32,14 @@
<TextView
android:layout_width="@dimen/label_width_middle"
android:layout_height="wrap_content"
android:text="@string/bg_deck"/>
android:text="@string/bg_deck" />
<ImageView
android:id="@+id/bg_deck"
android:layout_width="240dp"
android:layout_height="135dp" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
......
mobile/src/main/res/layout/dialog_cardinfo.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:orientation="horizontal">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:orientation="horizontal">
<Button
android:id="@+id/lastone"
android:layout_width="@dimen/brower_arrow_width"
android:layout_height="@dimen/brower_arrow_height"
android:layout_gravity="left|center"
android:background="@drawable/left_1"
/>
android:background="@drawable/left_1" />
<LinearLayout
android:id="@+id/detail"
......@@ -25,9 +24,9 @@
android:layout_weight="1"
android:background="@drawable/blue"
android:orientation="vertical"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:paddingRight="10dp">
android:paddingRight="10dp"
android:paddingBottom="10dp">
<LinearLayout
android:layout_width="match_parent"
......@@ -49,7 +48,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@color/colorAccentDark"
android:textSize="14sp"
android:textStyle="bold"/>
android:textStyle="bold" />
<TextView
android:id="@+id/btn_add_main"
......@@ -64,7 +63,7 @@
android:textSize="14sp"
android:textStyle="bold"
android:visibility="invisible"
tools:visibility="visible"/>
tools:visibility="visible" />
<TextView
android:id="@+id/btn_add_side"
......@@ -79,19 +78,19 @@
android:textSize="14sp"
android:textStyle="bold"
android:visibility="invisible"
tools:visibility="visible"/>
tools:visibility="visible" />
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1"/>
android:layout_weight="1" />
<ImageButton
android:id="@+id/btn_close"
android:layout_width="@dimen/button_width_small"
android:layout_height="@dimen/button_width_small"
android:background="@android:color/transparent"
app:srcCompat="@drawable/ic_close_black_24dp"/>
app:srcCompat="@drawable/ic_close_black_24dp" />
</LinearLayout>
<cn.garymb.ygomobile.ui.widget.AlwaysMarqueeTextView
......@@ -101,7 +100,6 @@
android:layout_marginTop="5dp"
android:gravity="center_vertical"
android:maxLines="1"
android:textIsSelectable="true"
android:minHeight="@dimen/label_height"
android:paddingLeft="4dp"
android:shadowColor="@color/black"
......@@ -111,7 +109,8 @@
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/item_title"
tools:text="name"/>
android:textIsSelectable="true"
tools:text="name" />
<TextView
android:id="@+id/card_level"
......@@ -123,7 +122,7 @@
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@color/star"
tools:text="★★★★"/>
tools:text="★★★★" />
<LinearLayout
android:layout_width="match_parent"
......@@ -141,7 +140,7 @@
android:layout_height="@dimen/card_height2"
android:layout_gravity="center_vertical"
android:scaleType="fitXY"
android:src="@drawable/unknown"/>
android:src="@drawable/unknown" />
<ImageView
android:id="@+id/image_control"
......@@ -169,7 +168,7 @@
android:layout_height="wrap_content"
android:text="@string/label_ot"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="@color/item_title"/>
android:textColor="@color/item_title" />
<TextView
android:id="@+id/card_ot"
......@@ -200,7 +199,7 @@
android:layout_height="wrap_content"
android:text="@string/label_attr"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="@color/item_title"/>
android:textColor="@color/item_title" />
<TextView
android:id="@+id/card_attribute"
......@@ -224,7 +223,7 @@
android:layout_height="wrap_content"
android:text="@string/label_race"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="@color/item_title"/>
android:textColor="@color/item_title" />
<TextView
android:id="@+id/card_race"
......@@ -238,12 +237,13 @@
tools:text="Test" />
</LinearLayout>
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/label_type"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="@color/item_title"/>
android:textColor="@color/item_title" />
<TextView
android:id="@+id/card_type"
......@@ -262,7 +262,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="@color/item_title"
android:visibility="invisible"
tools:visibility="visible"/>
tools:visibility="visible" />
<TextView
android:id="@+id/card_setname"
......@@ -314,7 +314,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="4dp"
android:background="@color/white"/>
android:background="@color/white" />
<FrameLayout
android:layout_width="match_parent"
......@@ -331,7 +331,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/holo_blue_bright"
android:textIsSelectable="true"
tools:text="12345678"/>
tools:text="12345678" />
<LinearLayout
android:id="@+id/layout_atkdef2"
......@@ -351,7 +351,7 @@
android:singleLine="true"
android:text="0"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/white"/>
android:textColor="@color/white" />
<TextView
android:layout_width="wrap_content"
......@@ -360,7 +360,7 @@
android:singleLine="true"
android:text="/"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/white"/>
android:textColor="@color/white" />
<TextView
android:id="@+id/card_def"
......@@ -372,7 +372,7 @@
android:singleLine="true"
android:text="0"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/white"/>
android:textColor="@color/white" />
</LinearLayout>
</FrameLayout>
......@@ -386,5 +386,5 @@
android:layout_width="@dimen/brower_arrow_width"
android:layout_height="@dimen/brower_arrow_height"
android:layout_gravity="right|center"
android:background="@drawable/right_1"/>
android:background="@drawable/right_1" />
</LinearLayout>
\ No newline at end of file
mobile/src/main/res/layout/dialog_cover_select.xml
View file @ e52eb3d3
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
......@@ -7,8 +6,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_horizontal">
android:gravity="center_horizontal"
android:orientation="horizontal">
<ImageView
android:id="@+id/cover1"
......
mobile/src/main/res/layout/dialog_deck.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="@string/label_limitlist"
android:textColor="@color/blackLinght"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@color/blackLinght" />
<android.support.v7.widget.AppCompatSpinner
android:id="@+id/sp_limit_list"
android:layout_width="match_parent"
android:layout_height="@dimen/item_height"/>
android:layout_height="@dimen/item_height" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="@string/deck_list"
android:textColor="@color/blackLinght"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@color/blackLinght" />
<android.support.v7.widget.AppCompatSpinner
android:id="@+id/sp_ydk_list"
android:layout_width="match_parent"
android:layout_height="@dimen/item_height"/>
android:layout_height="@dimen/item_height" />
</LinearLayout>
\ No newline at end of file
mobile/src/main/res/layout/dialog_deck_manager.xml
View file @ e52eb3d3
......@@ -18,8 +18,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="bottom">
android:layout_gravity="bottom"
android:orientation="vertical">
<ImageView
android:layout_width="100dp"
......@@ -50,10 +50,12 @@
android:layout_width="100dp"
android:layout_height="50dp"
android:background="@drawable/red" />
<ImageView
android:layout_width="100dp"
android:layout_height="50dp"
android:background="@drawable/blue" />
<ImageView
android:layout_width="100dp"
android:layout_height="50dp"
......
mobile/src/main/res/layout/dialog_plus_base.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/window" >
android:background="@drawable/window">
<RelativeLayout
android:id="@+id/layout_title"
......@@ -21,7 +20,7 @@
android:gravity="center_vertical"
android:text="@android:string/dialog_alert_title"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/item_title"/>
android:textColor="@color/item_title" />
<ImageButton
android:id="@+id/close"
......@@ -30,15 +29,15 @@
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:background="@android:color/transparent"
app:srcCompat="@drawable/ic_close_black_24dp"/>
app:srcCompat="@drawable/ic_close_black_24dp" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_below="@id/layout_title"
android:layout_centerVertical="true"
android:layout_marginTop="5dp"
android:orientation="vertical">
<LinearLayout
......@@ -48,17 +47,17 @@
android:layout_gravity="center_horizontal|center_vertical"
android:layout_marginBottom="5dp"
android:minWidth="200dp"
android:orientation="horizontal" >
android:orientation="horizontal">
<ProgressBar
android:id="@+id/pb1"
style="?android:attr/progressBarStyleSmall"
android:layout_width="@dimen/button_width_small"
android:layout_height="@dimen/button_width_small"
android:layout_marginLeft="10dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="10dp"
android:visibility="gone"
tools:visibility="visible"/>
tools:visibility="visible" />
<TextView
......@@ -67,26 +66,26 @@
android:layout_height="wrap_content"
android:layout_gravity="left|center_vertical"
android:layout_marginLeft="10dp"
android:minLines="1"
android:gravity="left|center_vertical"
android:minLines="1"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@color/holo_blue_bright"
android:visibility="gone"
tools:text="hello"
tools:visibility="visible"/>
tools:visibility="visible" />
</LinearLayout>
<ProgressBar
android:id="@+id/pb2"
android:progressDrawable="@drawable/background_lp_progress_bar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_gravity="center_horizontal|center_vertical"
android:layout_height="100px"
android:layout_gravity="center_horizontal|center_vertical"
android:progressDrawable="@drawable/background_lp_progress_bar"
android:visibility="gone"
tools:visibility="visible"/>
tools:visibility="visible" />
<LinearLayout
......@@ -109,9 +108,9 @@
android:layout_gravity="center"
android:background="@drawable/button_bg"
android:text="@android:string/ok"
android:visibility="gone"
android:textColor="@android:color/white"
tools:visibility="visible"/>
android:visibility="gone"
tools:visibility="visible" />
</FrameLayout>
<FrameLayout
......@@ -131,7 +130,7 @@
android:text="@android:string/cancel"
android:textColor="@android:color/white"
android:visibility="gone"
tools:visibility="visible"/>
tools:visibility="visible" />
</FrameLayout>
</LinearLayout>
</LinearLayout>
......
mobile/src/main/res/layout/dialog_room_name.xml
View file @ e52eb3d3
......@@ -11,14 +11,14 @@
android:layout_height="@dimen/item_height"
android:gravity="top|left"
android:hint="@string/intput_room_name"
android:textColorHint="@color/gray"
android:inputType="textNoSuggestions"
android:imeOptions="actionDone"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:textColor="@color/holo_blue_bright" />
android:textColor="@color/holo_blue_bright"
android:textColorHint="@color/gray" />
<ListView
android:id="@+id/room_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content" />
</LinearLayout>
\ No newline at end of file
mobile/src/main/res/layout/dialog_server_edit.xml
View file @ e52eb3d3
......@@ -3,6 +3,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -21,8 +22,8 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:hint="@string/must_info"
android:maxLines="1"
android:inputType="textNoSuggestions"
android:maxLines="1"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/holo_blue_bright" />
......@@ -101,36 +102,36 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:inputType="textNoSuggestions"
android:hint="@string/must_info"
android:inputType="textNoSuggestions"
android:maxLines="1"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@android:color/holo_green_light" />
</LinearLayout>
<!--
<LinearLayout
android:id="@+id/layout_more"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="@dimen/label_width_middle"
<!--
<LinearLayout
android:id="@+id/layout_more"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="1"
android:singleLine="true"
android:text="@string/server_user_pwd"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
android:orientation="horizontal">
<EditText
android:id="@+id/text_player_pwd"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:maxLines="1"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
tools:text="123456"/>
</LinearLayout>-->
<TextView
android:layout_width="@dimen/label_width_middle"
android:layout_height="wrap_content"
android:maxLines="1"
android:singleLine="true"
android:text="@string/server_user_pwd"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
<EditText
android:id="@+id/text_player_pwd"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:maxLines="1"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
tools:text="123456"/>
</LinearLayout>-->
</LinearLayout>
\ No newline at end of file
mobile/src/main/res/layout/duel_assistant_service.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical"
android:background="#00FFFFFF">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_horizontal"
android:background="@drawable/window">
<TextView
android:textColor="@color/gold"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="Text"
android:layout_margin="10dp"
android:id="@+id/tv_message" />
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="horizontal">
<Button
android:textColor="@color/white"
style="?android:attr/buttonBarButtonStyle"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/join_game"
android:layout_weight="1"
android:id="@+id/bt_join" />
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_margin="20dp" />
<Button
android:textColor="@color/white"
style="?android:attr/buttonBarButtonStyle"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/search_close"
android:layout_weight="1"
android:id="@+id/bt_close" />
</LinearLayout>
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textSize="20px"
android:text="@string/app_name"/>
</LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#00FFFFFF"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/window"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:id="@+id/tv_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:text="Text"
android:textColor="@color/gold" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button
android:id="@+id/bt_join"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/join_game"
android:textColor="@color/white" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="20dp" />
<Button
android:id="@+id/bt_close"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/search_close"
android:textColor="@color/white" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/app_name"
android:textSize="20px" />
</LinearLayout>
</LinearLayout>
mobile/src/main/res/layout/file_log_activity.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include
layout="@layout/content_toolbar"/>
<include layout="@layout/content_toolbar" />
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:textStyle="bold"
android:id="@+id/tv_log"
android:textColor="@color/white"
android:textSize="18sp"
android:padding="15dp"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</android.support.v4.widget.NestedScrollView>
<TextView
android:id="@+id/tv_log"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="15dp"
android:textColor="@color/white"
android:textSize="18sp"
android:textStyle="bold" />
</android.support.v4.widget.NestedScrollView>
</LinearLayout>
\ No newline at end of file
mobile/src/main/res/layout/head_view.xml
View file @ e52eb3d3
<?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="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@android:color/transparent"
android:orientation="horizontal">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/red"
android:gravity="center_vertical|center_horizontal"
android:text="@string/deck_delete_text"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
</LinearLayout>
\ No newline at end of file
mobile/src/main/res/layout/item_chat.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#00000000">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#00000000">
<cn.garymb.ygomobile.ui.mycard.mcchat.view.YuanImage
android:layout_height="35dp"
android:layout_width="35dp"
android:id="@+id/ic_avatar"
android:scaleType="centerCrop"
android:layout_marginTop="5dp"
android:layout_marginLeft="10dp"/>
<cn.garymb.ygomobile.ui.mycard.mcchat.view.YuanImage
android:id="@+id/ic_avatar"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="5dp"
android:scaleType="centerCrop" />
<LinearLayout
android:layout_alignTop="@id/ic_avatar"
android:layout_toRightOf="@id/ic_avatar"
android:descendantFocusability="blocksDescendants"
android:padding="8dp"
android:background="@drawable/chat_message_background"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:id="@+id/ic_dialog"
android:layout_marginRight="10dp"
android:layout_marginBottom="5dp"
android:layout_marginLeft="10dp">
<LinearLayout
android:id="@+id/ic_dialog"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/ic_avatar"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="5dp"
android:layout_toRightOf="@id/ic_avatar"
android:background="@drawable/chat_message_background"
android:descendantFocusability="blocksDescendants"
android:orientation="vertical"
android:padding="8dp">
<TextView
android:id="@+id/ic_name"
android:text="name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="4dp"
android:textSize="13sp"
android:textColor="#B8630C"
android:textStyle="bold"/>
<TextView
android:id="@+id/ic_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="4dp"
android:text="name"
android:textColor="#B8630C"
android:textSize="13sp"
android:textStyle="bold" />
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="message"
android:textColor="#000000"
android:id="@+id/ic_message"
android:textSize="16sp"/>
<TextView
android:id="@+id/ic_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="message"
android:textColor="#000000"
android:textSize="16sp" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
mobile/src/main/res/layout/item_chat_me.xml
View file @ e52eb3d3
......@@ -9,8 +9,8 @@
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:layout_marginTop="5dp"
android:layout_marginRight="10dp"
android:scaleType="centerCrop" />
<LinearLayout
......@@ -18,9 +18,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/icm_avatar"
android:layout_marginBottom="5dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="5dp"
android:layout_toLeftOf="@id/icm_avatar"
android:background="@drawable/chat_message_me_background"
android:descendantFocusability="blocksDescendants"
......
mobile/src/main/res/layout/item_deck_card.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/layout_label"
android:layout_width="match_parent"
......@@ -20,17 +21,17 @@
android:singleLine="true"
android:textColor="@color/white"
android:textSize="12sp"
tools:text="name"/>
tools:text="name" />
</LinearLayout>
<ImageView
android:id="@+id/card_image"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="1px"
android:layout_marginLeft="1px"
android:layout_marginRight="1px"
tools:src="@drawable/unknown"/>
android:layout_marginBottom="1px"
tools:src="@drawable/unknown" />
<ImageView
android:id="@+id/right_top"
......@@ -38,6 +39,6 @@
android:layout_height="@dimen/right_size2"
android:layout_alignParentRight="true"
android:visibility="visible"
app:srcCompat="@drawable/ic_close_black_24dp"/>
app:srcCompat="@drawable/ic_close_black_24dp" />
</RelativeLayout>
\ No newline at end of file
mobile/src/main/res/layout/item_deck_card2.xml
View file @ e52eb3d3
......@@ -20,18 +20,18 @@
android:singleLine="true"
android:textColor="@color/white"
android:textSize="12sp"
tools:text="name"/>
tools:text="name" />
</LinearLayout>
<ImageView
android:id="@+id/card_image"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="1px"
android:layout_marginLeft="1px"
android:layout_marginRight="1px"
android:layout_marginBottom="1px"
android:scaleType="fitCenter"
tools:src="@drawable/unknown"/>
tools:src="@drawable/unknown" />
<ImageView
android:id="@+id/right_top"
......@@ -39,7 +39,7 @@
android:layout_height="@dimen/right_size2"
android:layout_alignParentLeft="true"
android:visibility="gone"
tools:visibility="visible"
tools:srcCompat="@drawable/ic_close_black_24dp"/>
tools:srcCompat="@drawable/ic_close_black_24dp"
tools:visibility="visible" />
</RelativeLayout>
\ No newline at end of file
mobile/src/main/res/layout/item_search_card.xml
View file @ e52eb3d3
......@@ -3,8 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@drawable/blue"
android:orientation="horizontal"
android:padding="@dimen/padding2">
<RelativeLayout
......@@ -15,11 +15,11 @@
android:id="@+id/card_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_gravity="center_vertical"
android:scaleType="fitXY"
tools:src="@drawable/unknown"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true" />
tools:src="@drawable/unknown" />
<ImageView
android:id="@+id/right_top"
......@@ -27,15 +27,14 @@
android:layout_height="@dimen/right_size"
android:layout_alignParentRight="true"
android:visibility="visible"
tools:src="@drawable/ic_close_black_24dp"/>
tools:src="@drawable/ic_close_black_24dp" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:orientation="vertical"
>
android:orientation="vertical">
<TextView
android:id="@+id/card_name"
......@@ -50,7 +49,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/item_title"
android:textSize="18sp"
tools:text="Card Name"/>
tools:text="Card Name" />
<TextView
android:id="@+id/card_level"
......@@ -64,7 +63,7 @@
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/star"
tools:text="★★★★"/>
tools:text="★★★★" />
<TextView
android:id="@+id/card_type"
......@@ -75,21 +74,20 @@
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/holo_blue_bright"
android:textSize="15sp"
tools:text="[A/XYZ]"/>
tools:text="[A/XYZ]" />
<View
android:id="@+id/view_bar"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="3dp"
android:background="@color/gray"/>
android:background="@color/gray" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:orientation="horizontal"
>
android:orientation="horizontal">
<TextView
android:id="@+id/card_code"
......@@ -100,7 +98,7 @@
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="@color/holo_blue_bright"
tools:text="123456789"/>
tools:text="123456789" />
<TextView
android:layout_width="1px"
......@@ -108,13 +106,12 @@
android:text="A"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/colorPrimary"
android:visibility="invisible"/>
android:visibility="invisible" />
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1"
/>
android:layout_weight="1" />
<LinearLayout
android:id="@+id/layout_atk"
......@@ -139,12 +136,12 @@
android:minWidth="@dimen/label_width_small_32dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
tools:text="2500"
android:textColor="@color/holo_blue_bright" />
android:textColor="@color/holo_blue_bright"
tools:text="2500" />
<View
android:layout_width="5dp"
android:layout_height="1dp"/>
android:layout_height="1dp" />
</LinearLayout>
......@@ -173,10 +170,10 @@
android:minWidth="@dimen/label_width_small_32dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
tools:text="2500"
android:textColor="@color/holo_blue_bright" />
android:textColor="@color/holo_blue_bright"
tools:text="2500" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
mobile/src/main/res/layout/item_search_card2.xml
View file @ e52eb3d3
......@@ -16,10 +16,10 @@
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginLeft="1dp"
android:layout_marginRight="1dp"
android:layout_marginTop="1dp"
android:layout_marginRight="1dp"
android:scaleType="fitXY"
tools:src="@drawable/unknown"/>
tools:src="@drawable/unknown" />
<ImageView
android:id="@+id/right_top"
......@@ -27,15 +27,14 @@
android:layout_height="@dimen/right_size"
android:layout_alignParentRight="true"
android:visibility="visible"
tools:src="@drawable/ic_close_black_24dp"/>
tools:src="@drawable/ic_close_black_24dp" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:orientation="vertical"
>
android:orientation="vertical">
<TextView
android:id="@+id/card_name"
......@@ -50,7 +49,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/item_title"
android:textSize="18sp"
tools:text="Card Name"/>
tools:text="Card Name" />
<TextView
android:id="@+id/card_level"
......@@ -64,7 +63,7 @@
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/star"
tools:text="★★★★"/>
tools:text="★★★★" />
<TextView
android:id="@+id/card_type"
......@@ -75,21 +74,20 @@
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/colorPrimary"
android:textSize="15sp"
tools:text="[A/XYZ]"/>
tools:text="[A/XYZ]" />
<View
android:id="@+id/view_bar"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="3dp"
android:background="@color/white"/>
android:background="@color/white" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:orientation="horizontal"
>
android:orientation="horizontal">
<TextView
android:id="@+id/card_code"
......@@ -100,7 +98,7 @@
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="@color/white"
tools:text="123456789"/>
tools:text="123456789" />
<TextView
android:layout_width="1px"
......@@ -108,13 +106,12 @@
android:text="A"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/colorPrimary"
android:visibility="invisible"/>
android:visibility="invisible" />
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1"
/>
android:layout_weight="1" />
<LinearLayout
android:id="@+id/layout_atk"
......@@ -128,7 +125,7 @@
android:singleLine="true"
android:text="ATK/"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/white"/>
android:textColor="@color/white" />
<TextView
android:id="@+id/card_atk"
......@@ -140,12 +137,12 @@
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/white"
tools:text="2500"/>
tools:text="2500" />
<View
android:layout_width="5dp"
android:layout_height="1dp"/>
</LinearLayout>
android:layout_height="1dp" />
</LinearLayout>
<LinearLayout
android:id="@+id/layout_def"
......@@ -160,7 +157,7 @@
android:singleLine="true"
android:text="DEF/"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/white"/>
android:textColor="@color/white" />
<TextView
android:id="@+id/card_def"
......@@ -172,7 +169,7 @@
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/white"
tools:text="2500"/>
tools:text="2500" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
......
mobile/src/main/res/layout/item_search_card_swipe.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<com.tubb.smrv.SwipeHorizontalMenuLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<com.tubb.smrv.SwipeHorizontalMenuLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:sml="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/swipe_layout"
......@@ -22,10 +21,10 @@
android:layout_height="@dimen/item_menu_height"
android:layout_gravity="left|center_vertical"
android:background="@drawable/blue"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:gravity="center"
android:text="@string/card_add_main"
android:textColor="@color/white"/>
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/white" />
<TextView
android:id="@+id/btn_add_side"
......@@ -34,9 +33,9 @@
android:layout_gravity="right|center_vertical"
android:background="@drawable/red"
android:gravity="center"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:text="@string/card_add_side"
android:textColor="@color/white"/>
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/white" />
</LinearLayout>
......@@ -45,7 +44,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/padding"
android:orientation="horizontal" >
android:orientation="horizontal">
<RelativeLayout
android:layout_width="@dimen/card_small_width"
......@@ -59,7 +58,7 @@
android:layout_centerVertical="true"
android:layout_gravity="center_vertical"
android:scaleType="fitXY"
tools:src="@drawable/unknown"/>
tools:src="@drawable/unknown" />
<ImageView
android:id="@+id/right_top"
......@@ -67,15 +66,14 @@
android:layout_height="@dimen/right_size"
android:layout_alignParentRight="true"
android:visibility="visible"
tools:src="@drawable/ic_close_black_24dp"/>
tools:src="@drawable/ic_close_black_24dp" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:orientation="vertical"
>
android:orientation="vertical">
<cn.garymb.ygomobile.ui.widget.AlwaysMarqueeTextView
android:id="@+id/card_name"
......@@ -90,7 +88,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/item_title"
android:textSize="18sp"
tools:text="Card Name"/>
tools:text="Card Name" />
<TextView
android:id="@+id/card_level"
......@@ -104,7 +102,7 @@
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/star"
tools:text="★★★★"/>
tools:text="★★★★" />
<TextView
android:id="@+id/card_type"
......@@ -115,21 +113,20 @@
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/holo_blue_bright"
android:textSize="15sp"
tools:text="[A/XYZ]"/>
tools:text="[A/XYZ]" />
<View
android:id="@+id/view_bar"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="3dp"
android:background="@color/gray"/>
android:background="@color/gray" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:orientation="horizontal"
>
android:orientation="horizontal">
<TextView
android:id="@+id/card_code"
......@@ -140,7 +137,7 @@
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="@color/holo_blue_bright"
tools:text="123456789"/>
tools:text="123456789" />
<TextView
android:layout_width="1px"
......@@ -148,13 +145,12 @@
android:text="A"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/colorPrimary"
android:visibility="invisible"/>
android:visibility="invisible" />
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1"
/>
android:layout_weight="1" />
<LinearLayout
android:id="@+id/layout_atk"
......@@ -168,7 +164,7 @@
android:singleLine="true"
android:text="ATK/"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@android:color/holo_green_light"/>
android:textColor="@android:color/holo_green_light" />
<TextView
android:id="@+id/card_atk"
......@@ -180,11 +176,11 @@
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/holo_blue_bright"
tools:text="2500"/>
tools:text="2500" />
<View
android:layout_width="5dp"
android:layout_height="1dp"/>
android:layout_height="1dp" />
</LinearLayout>
......@@ -202,7 +198,7 @@
android:singleLine="true"
android:text="DEF/"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@android:color/holo_green_light"/>
android:textColor="@android:color/holo_green_light" />
<TextView
android:id="@+id/card_def"
......@@ -214,7 +210,7 @@
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/holo_blue_bright"
tools:text="2500"/>
tools:text="2500" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
......
mobile/src/main/res/layout/item_server_info_swipe.xml
View file @ e52eb3d3
......@@ -54,8 +54,8 @@
android:id="@+id/btn_edit_delete"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="20dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="20dp"
android:background="@drawable/rename"
android:gravity="right" />
......
mobile/src/main/res/layout/main.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/background"
android:gravity="center">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background"
android:gravity="center"
android:orientation="vertical">
<RelativeLayout
android:background="@color/mediumPurpleLight"
android:layout_height="wrap_content"
android:layout_width="match_parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/mediumPurpleLight">
<TextView
android:textColor="@color/white"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/mc_chat"
android:layout_margin="10dp"
android:textSize="20sp"
android:id="@+id/main_title"/>
<TextView
android:id="@+id/main_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:text="@string/mc_chat"
android:textColor="@color/white"
android:textSize="20sp" />
</RelativeLayout>
</RelativeLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/main_rec"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1000"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/main_rec"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1000" />
<LinearLayout
android:gravity="center"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal"
android:padding="7dp"
android:id="@+id/main_bottom_bar">
<LinearLayout
android:id="@+id/main_bottom_bar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center"
android:orientation="horizontal"
android:padding="7dp">
<EditText
android:background="@drawable/chat_edittext_background"
android:padding="7dp"
android:id="@+id/main_send_message"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="15sp"
android:textColor="@color/black"
android:layout_weight="10"
android:maxEms="3"/>
<EditText
android:id="@+id/main_send_message"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="10"
android:background="@drawable/chat_edittext_background"
android:maxEms="3"
android:padding="7dp"
android:textColor="@color/black"
android:textSize="15sp" />
<LinearLayout
android:layout_marginLeft="7dp"
android:layout_width="0dp"
android:layout_height="33dp"
android:gravity="center"
android:layout_weight="2"
android:orientation="vertical">
<LinearLayout
android:layout_width="0dp"
android:layout_height="33dp"
android:layout_marginLeft="7dp"
android:layout_weight="2"
android:gravity="center"
android:orientation="vertical">
<ImageButton
android:background="@drawable/chat_message_background"
android:src="@drawable/ic_send_black_24dp"
android:id="@+id/main_send"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/send"
android:gravity="center"
android:textSize="12sp"
/>
<ImageButton
android:id="@+id/main_send"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/chat_message_background"
android:gravity="center"
android:src="@drawable/ic_send_black_24dp"
android:text="@string/send"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
mobile/src/main/res/layout/nav_card_search.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/right"
android:orientation="vertical"
android:padding="10dp"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/right"
android:orientation="vertical"
android:padding="10dp"
android:theme="@style/AppTheme.PopupOverlay.Dark"
tools:showIn="@layout/activity_search">
android:theme="@style/AppTheme.PopupOverlay.Dark"
tools:showIn="@layout/activity_search">
<LinearLayout
android:layout_width="match_parent"
......@@ -20,7 +20,7 @@
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="18dp"/>
android:layout_marginLeft="18dp" />
<LinearLayout
android:layout_width="match_parent"
......@@ -43,7 +43,7 @@
android:inputType="textNoSuggestions"
android:maxLines="1"
android:singleLine="true"
android:textColorHint="@color/gold"/>
android:textColorHint="@color/gold" />
</android.support.design.widget.TextInputLayout>
<android.support.v7.widget.AppCompatButton
......@@ -52,7 +52,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@drawable/button_bg"
android:text="@string/search"/>
android:text="@string/search" />
</LinearLayout>
<LinearLayout
......@@ -75,7 +75,7 @@
android:inputType="textNoSuggestions"
android:maxLines="1"
android:singleLine="true"
android:textColorHint="@color/gold"/>
android:textColorHint="@color/gold" />
</android.support.design.widget.TextInputLayout>
<android.support.v7.widget.AppCompatButton
......@@ -84,7 +84,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@drawable/button_bg"
android:text="@string/reset"/>
android:text="@string/reset" />
</LinearLayout>
<LinearLayout
......@@ -101,7 +101,7 @@
android:id="@+id/sp_ot"
android:layout_width="0dp"
android:layout_height="@dimen/label_width_small"
android:layout_weight="1"/>
android:layout_weight="1" />
<android.support.v7.widget.AppCompatSpinner
......@@ -109,7 +109,7 @@
android:layout_width="0dp"
android:layout_height="@dimen/label_width_small"
android:layout_weight="1"
android:visibility="invisible"/>
android:visibility="invisible" />
</LinearLayout>
<LinearLayout
......@@ -121,14 +121,14 @@
android:id="@+id/sp_limit_list"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"/>
android:layout_weight="1" />
<android.support.v7.widget.AppCompatSpinner
android:id="@+id/sp_limit"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:visibility="invisible"/>
android:visibility="invisible" />
</LinearLayout>
<LinearLayout
......@@ -140,7 +140,7 @@
android:id="@+id/sp_category"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"/>
android:layout_weight="1" />
<Button
android:id="@+id/btn_linkmarker"
......@@ -149,7 +149,7 @@
android:layout_weight="1"
android:background="@drawable/button_bg"
android:text="@string/linkmarker"
android:visibility="visible"/>
android:visibility="visible" />
</LinearLayout>
......@@ -157,7 +157,7 @@
android:id="@+id/sp_setcode"
android:layout_width="match_parent"
android:layout_height="@dimen/label_width_small"
app:searchTitle="@string/label_set"/>
app:searchTitle="@string/label_set" />
<LinearLayout
......@@ -169,21 +169,21 @@
android:id="@+id/sp_type_card"
android:layout_width="0dp"
android:layout_height="@dimen/label_width_small"
android:layout_weight="1"/>
android:layout_weight="1" />
<android.support.v7.widget.AppCompatSpinner
android:id="@+id/sp_race"
android:layout_width="0dp"
android:layout_height="@dimen/label_width_small"
android:layout_weight="1"
android:visibility="gone"/>
android:visibility="gone" />
<android.support.v7.widget.AppCompatSpinner
android:id="@+id/sp_type_st"
android:layout_width="0dp"
android:layout_height="@dimen/label_width_small"
android:layout_weight="1"
android:visibility="invisible"/>
android:visibility="invisible" />
</LinearLayout>
<LinearLayout
......@@ -201,13 +201,13 @@
android:id="@+id/sp_level"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"/>
android:layout_weight="1" />
<android.support.v7.widget.AppCompatSpinner
android:id="@+id/sp_attribute"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"/>
android:layout_weight="1" />
</LinearLayout>
<LinearLayout
......@@ -219,13 +219,13 @@
android:id="@+id/sp_type_monster"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"/>
android:layout_weight="1" />
<android.support.v7.widget.AppCompatSpinner
android:id="@+id/sp_type_monster2"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"/>
android:layout_weight="1" />
</LinearLayout>
......@@ -247,7 +247,7 @@
android:hint="@string/hit_atk"
android:maxLines="1"
android:singleLine="true"
tools:text="100"/>
tools:text="100" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
......@@ -262,7 +262,7 @@
android:hint="@string/hit_def"
android:maxLines="1"
android:singleLine="true"
tools:text="100"/>
tools:text="100" />
</android.support.design.widget.TextInputLayout>
</LinearLayout>
</LinearLayout>
......
mobile/src/main/res/layout/nav_main_head.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/nav_head_height"
android:orientation="vertical"
android:paddingTop="24dp"
tools:showIn="@layout/activity_home">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/nav_head_height"
android:orientation="vertical"
android:paddingTop="24dp"
tools:showIn="@layout/activity_home">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -16,7 +17,7 @@
android:layout_height="@dimen/nav_icon_height"
android:layout_gravity="center_vertical"
android:layout_marginLeft="15dp"
android:src="@drawable/ic_icon"/>
android:src="@drawable/ic_icon" />
<LinearLayout
android:layout_width="wrap_content"
......@@ -29,7 +30,7 @@
android:layout_height="wrap_content"
android:text="@string/settings_about_author_pref"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white"/>
android:textColor="@color/white" />
<TextView
android:id="@+id/textView2"
......@@ -38,7 +39,7 @@
android:layout_marginTop="8dp"
android:text="@string/settings_author"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/white"/>
android:textColor="@color/white" />
<Button
android:id="@+id/nav_donation"
......@@ -50,7 +51,7 @@
android:gravity="center"
android:text="@string/donation"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="@color/white"/>
android:textColor="@color/white" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
mobile/src/main/res/layout/nav_mycard_head.xml
View file @ e52eb3d3
......@@ -34,18 +34,18 @@
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="@string/settings_about_author_pref"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/white" />
android:textColor="@color/white"
tools:text="@string/settings_about_author_pref" />
<TextView
android:id="@+id/tv_dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
tools:text="@string/settings_about_author_pref"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/white" />
android:textColor="@color/white"
tools:text="@string/settings_about_author_pref" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
mobile/src/main/res/layout/notification_view_duel_assistant.xml
View file @ e52eb3d3
......@@ -17,8 +17,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:orientation="vertical"
android:layout_weight="1">
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
......@@ -41,7 +41,7 @@
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_gravity="center|right"
android:text="@string/search_close"
android:gravity="center"
android:text="@string/search_close"
android:textColor="@color/colorAccent" />
</LinearLayout>
mobile/src/main/res/layout/preference_custom.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
xmlns:tools="http://schemas.android.com/tools"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingRight="?android:attr/scrollbarSize">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingRight="?android:attr/scrollbarSize">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="6dip"
android:layout_marginLeft="15dip"
android:layout_marginRight="6dip"
android:layout_marginTop="6dip"
android:layout_marginRight="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
<TextView
......@@ -21,24 +21,24 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
tools:text="Title"
android:fadingEdge="horizontal"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/holo_blue_bright"
android:textSize="16sp"/>
android:textSize="16sp"
tools:text="Title" />
<TextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_alignLeft="@android:id/title"
android:layout_below="@android:id/title"
android:layout_alignLeft="@android:id/title"
android:layout_marginTop="4dp"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="@color/white"
tools:text="Summary"
android:textSize="12sp"/>
android:textSize="12sp"
tools:text="Summary" />
</RelativeLayout>
......@@ -48,5 +48,5 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="vertical"/>
android:orientation="vertical" />
</LinearLayout>
\ No newline at end of file
mobile/src/main/res/layout/searchable_list_dialog.xml
View file @ e52eb3d3
<?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="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
......@@ -12,9 +11,9 @@
android:iconifiedByDefault="false" />
<ListView
android:id="@+id/listItems"
android:scrollbars="none"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:id="@+id/listItems"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="none" />
</LinearLayout>
\ No newline at end of file
mobile/src/main/res/menu/card_search.xml
View file @ e52eb3d3
<?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">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_search"
android:icon="@drawable/ic_search_white"
android:title="@string/search"
app:showAsAction="always"/>
app:showAsAction="always" />
<item
android:id="@+id/action_card_list"
android:icon="@drawable/ic_collections"
android:title="@string/card_result"
app:showAsAction="always"/>
app:showAsAction="always" />
</menu>
\ No newline at end of file
mobile/src/main/res/menu/card_search2.xml
View file @ e52eb3d3
<?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">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_search"
android:icon="@drawable/search"
android:title="@string/search"
app:showAsAction="always"/>
app:showAsAction="always" />
</menu>
\ No newline at end of file
mobile/src/main/res/menu/deck_menu.xml
View file @ e52eb3d3
......@@ -5,19 +5,19 @@
android:id="@+id/action_search"
android:icon="@drawable/search"
android:title="@string/search"
app:showAsAction="always"/>
app:showAsAction="always" />
<item
android:id="@+id/action_share_deck"
android:icon="@drawable/listicon"
android:title="@string/share_deck"
app:showAsAction="always"/>
app:showAsAction="always" />
<!--<item-->
<!--android:id="@+id/action_card_list"-->
<!--android:icon="@drawable/listicon"-->
<!--android:title="@string/card_result"-->
<!--app:showAsAction="always"/>-->
<!--android:id="@+id/action_card_list"-->
<!--android:icon="@drawable/listicon"-->
<!--android:title="@string/card_result"-->
<!--app:showAsAction="always"/>-->
<!--<item
android:id="@+id/action_refresh"
android:icon="@drawable/ic_refresh"
......@@ -29,7 +29,7 @@
<item
android:id="@+id/action_sort"
android:icon="@drawable/ic_refresh"
android:title="@string/sort"/>
android:title="@string/sort" />
<!-- <item
android:id="@+id/action_manager"
android:icon="@drawable/ic_edit_white"
......@@ -37,12 +37,12 @@
<item
android:id="@+id/action_save"
android:icon="@drawable/ic_mode_save_white"
android:title="@string/save_deck"/>
android:title="@string/save_deck" />
<!-- <item
android:id="@+id/action_save_as"
android:icon="@drawable/ic_mode_save_white"
android:title="@string/save_as_deck"/>-->
<!-- <item
android:id="@+id/action_save_as"
android:icon="@drawable/ic_mode_save_white"
android:title="@string/save_as_deck"/>-->
<!--<item
android:id="@+id/action_share_deck"
android:icon="@drawable/ic_refresh"
......@@ -50,16 +50,16 @@
<item
android:id="@+id/action_deck_new"
android:icon="@drawable/ic_edit_white"
android:title="@string/new_deck"/>
android:title="@string/new_deck" />
<item
android:id="@+id/action_delete_deck"
android:icon="@drawable/ic_edit_white"
android:title="@string/delete_deck"/>
android:title="@string/delete_deck" />
<item
android:id="@+id/action_clear_deck"
android:title="@string/clear_deck"/>
android:title="@string/clear_deck" />
<item
android:id="@+id/action_rename"
android:icon="@drawable/ic_edit_white"
android:title="@string/rename_deck"/>
android:title="@string/rename_deck" />
</menu>
\ No newline at end of file
mobile/src/main/res/menu/main.xml
View file @ e52eb3d3
<?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">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_game"
android:icon="@drawable/start"
android:title="@string/action_game"
app:showAsAction="always"/>
app:showAsAction="always" />
<item
android:id="@+id/action_card_search"
android:icon="@drawable/search"
android:title="@string/card_search"
app:showAsAction="always"
/>
app:showAsAction="always" />
<item
android:id="@+id/action_deck_manager"
android:icon="@drawable/deck"
android:title="@string/deck_manager"
app:showAsAction="always"
/>
app:showAsAction="always" />
</menu>
\ No newline at end of file
mobile/src/main/res/menu/nav_main_menu.xml
View file @ e52eb3d3
......@@ -3,45 +3,43 @@
<item
android:id="@+id/action_card_search"
android:icon="@drawable/ic_search"
android:title="@string/card_search"
/>
android:title="@string/card_search" />
<item
android:id="@+id/action_deck_manager"
android:icon="@drawable/ic_edit"
android:title="@string/deck_manager"
/>
android:title="@string/deck_manager" />
<item
android:id="@+id/action_add_server"
android:icon="@drawable/ic_add"
android:title="@string/action_add_server"/>
android:title="@string/action_add_server" />
<item
android:id="@+id/action_join_qq_group"
android:icon="@drawable/ic_home_black"
android:title="@string/mycard"/>
android:title="@string/mycard" />
<item
android:id="@+id/action_reset_game_res"
android:icon="@drawable/ic_file_download_black_24dp"
android:title="@string/reset_game_res"/>
android:title="@string/reset_game_res" />
<item android:title="@string/menu">
<menu>
<item
android:id="@+id/action_settings"
android:icon="@drawable/ic_settings"
android:title="@string/action_settings"/>
android:title="@string/action_settings" />
<item
android:id="@+id/action_help"
android:icon="@drawable/ic_live_help"
android:title="@string/help"/>
android:title="@string/help" />
<item
android:id="@+id/action_about"
android:icon="@drawable/ic_about"
android:title="@string/action_about"/>
android:title="@string/action_about" />
<item
android:id="@+id/action_quit"
android:icon="@drawable/ic_close_black_24dp"
android:title="@string/quit"/>
android:title="@string/quit" />
</menu>
</item>
</menu>
\ No newline at end of file
mobile/src/main/res/menu/nav_mycard_menu.xml
View file @ e52eb3d3
......@@ -3,8 +3,7 @@
<item
android:id="@+id/action_home"
android:icon="@drawable/ic_home"
android:title="@string/mc_home"
/>
android:title="@string/mc_home" />
<item
android:id="@+id/action_chat"
android:icon="?android:attr/textSelectHandleLeft"
......@@ -12,21 +11,18 @@
<item
android:id="@+id/action_bbs"
android:icon="@drawable/ic_forum"
android:title="@string/bbs"
/>
android:title="@string/bbs" />
<item
android:id="@+id/action_arena"
android:icon="@drawable/ic_highlight"
android:title="@string/arena"
/>
android:title="@string/arena" />
<item
android:id="@+id/action_deck_manager"
android:icon="@drawable/ic_edit"
android:title="@string/deck_manager"
/>
android:title="@string/deck_manager" />
<item
android:id="@+id/action_quit"
android:icon="@drawable/ic_close_black_24dp"
android:title="@string/quit"/>
android:title="@string/quit" />
</menu>
mobile/src/main/res/values-ko/strings.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<resources
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="StringFormatInvalid"
>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="StringFormatInvalid">
<string name="app_name">YGOMobile.kor</string>
<string name="action_settings">설정</string>
<string name="action_game">싱글 게임</string>
......
mobile/src/main/res/values-zh/strings.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<resources
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="StringFormatInvalid"
>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="StringFormatInvalid">
<string name="app_name">YGOMobile</string>
<string name="action_settings">设置</string>
<string name="action_game">单人游戏</string>
......
mobile/src/main/res/values/attrs.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="SearchableSpinner">
<attr name="hintText" format="string"/>
<attr name="searchTitle" format="string"/>
<attr name="hintText" format="string" />
<attr name="searchTitle" format="string" />
</declare-styleable>
<declare-styleable name="CardGroupView">
<attr name="lines" format="integer"/>
<attr name="card_width" format="integer"/>
<attr name="card_height" format="integer"/>
<attr name="line_limit" format="integer"/>
<attr name="line_max_count" format="integer"/>
<attr name="lines" format="integer" />
<attr name="card_width" format="integer" />
<attr name="card_height" format="integer" />
<attr name="line_limit" format="integer" />
<attr name="line_max_count" format="integer" />
</declare-styleable>
<declare-styleable name="ShimmerView">
<attr name="reflectionColor" format="color"/>
<attr name="reflectionColor" format="color" />
</declare-styleable>
</resources>
\ No newline at end of file
mobile/src/main/res/values/colors.xml
View file @ e52eb3d3
......@@ -23,7 +23,7 @@
<color name="holo_blue_light">#ff33b5e5</color>
<color name="holo_green_bright">#95d389</color>
<color name="holo_orange_bright">#ff982a</color>
<color name="colorMain">#2196F3</color>
<color name="background">#ECEFF1</color>
<color name="colorMain">#2196F3</color>
<color name="background">#ECEFF1</color>
</resources>
\ No newline at end of file
mobile/src/main/res/values/styles.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="BaseTheme" parent="Theme.AppCompat">
</style>
<style name="BaseTheme" parent="Theme.AppCompat"></style>
<style name="AppBaseTheme" parent="BaseTheme">
</style>
<style name="AppBaseTheme" parent="BaseTheme"></style>
<style name="AppTheme" parent="AppBaseTheme">
<item name="colorPrimary">@color/colorPrimary</item>
......@@ -52,9 +50,11 @@
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
</style>
<style name="AppTheme.Dialog" parent="Theme.AppCompat.Dialog.Alert">
</style>
<style name="ProcessDialog" parent="AppTheme.Dialog">
<item name="android:windowIsFloating">true</item><!--是否浮现在activity之上-->
<item name="android:windowFullscreen">true</item>
......@@ -74,14 +74,14 @@
<item name="android:windowBackground">@android:color/transparent</item><!--背景透明-->
<item name="android:backgroundDimEnabled">false</item><!--模糊-->
</style>
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark"/>
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark" />
<style name="AppTheme.PopupOverlay.Bule" parent="ThemeOverlay.AppCompat.Dark">
<item name="android:colorBackground">@color/colorPrimary</item>
</style>
<style name="AppTheme.PopupOverlay.Dark" parent="ThemeOverlay.AppCompat.Dark">
</style>
<style name="AppTheme.PopupOverlay.Dark" parent="ThemeOverlay.AppCompat.Dark"></style>
<style name="Link_Marker">
<item name="android:layout_width">match_parent</item>
......
mobile/src/main/res/xml/preference_about.xml
View file @ e52eb3d3
......@@ -5,21 +5,21 @@
<Preference
android:key="pref_key_about_author"
android:summary="@string/settings_author"
android:title="@string/settings_about_author_pref"/>
android:title="@string/settings_about_author_pref" />
<Preference
android:key="pref_key_about_version"
android:persistent="true"
android:title="@string/settings_about_version_pref"/>
android:title="@string/settings_about_version_pref" />
<Preference
android:key="pref_key_open_alipay"
android:persistent="true"
android:title="@string/donation"/>
android:title="@string/donation" />
<Preference
android:key="pref_key_about_check_update"
android:persistent="true"
android:title="@string/settings_about_check_update"/>
android:title="@string/settings_about_check_update" />
<Preference
android:key="pref_key_change_log"
android:title="@string/settings_about_change_log"/>
android:title="@string/settings_about_change_log" />
</PreferenceCategory>
</PreferenceScreen>
\ No newline at end of file
mobile/src/main/res/xml/preference_game.xml
View file @ e52eb3d3
......@@ -9,22 +9,22 @@
<Preference
android:key="pref_key_about_check_update"
android:persistent="true"
android:title="@string/settings_about_check_update"/>
android:title="@string/settings_about_check_update" />
<Preference
android:key="pref_key_change_log"
android:title="@string/settings_about_change_log"/>
android:title="@string/settings_about_change_log" />
<ListPreference
android:entries="@array/opengl_version"
android:entryValues="@array/opengl_version_value"
android:key="pref_key_game_ogles_config"
android:persistent="true"
android:title="@string/settings_game_opengl"/>
android:title="@string/settings_game_opengl" />
<ListPreference
android:entries="@array/card_quality"
android:entryValues="@array/card_quality_value"
android:key="pref_key_game_image_quality"
android:persistent="true"
android:title="@string/settings_game_card_quality"/>
android:title="@string/settings_game_card_quality" />
<!--CheckBoxPreference
android:key="pref_settings_only_game"
android:persistent="true"
......@@ -34,33 +34,33 @@
android:key="pref_key_start_serviceduelassistant"
android:persistent="true"
android:summary="@string/about_DuelAssistant"
android:title="@string/Start_ServiceDuelAssistant"/>
android:title="@string/Start_ServiceDuelAssistant" />
<CheckBoxPreference
android:key="pref_settings_read_ex"
android:persistent="true"
android:title="@string/title_use_ex"/>
android:title="@string/title_use_ex" />
<CheckBoxPreference
android:key="pref_key_game_sound_effect"
android:persistent="true"
android:title="@string/settings_game_enable_sound_effect"/>
android:title="@string/settings_game_enable_sound_effect" />
<CheckBoxPreference
android:key="pref_key_game_screen_orientation"
android:persistent="true"
android:title="@string/settings_game_screen_orientation"/>
android:title="@string/settings_game_screen_orientation" />
<CheckBoxPreference
android:key="pref_key_game_font_antialias"
android:persistent="true"
android:summary="@string/settings_game_font_antialias_summary"
android:title="@string/settings_game_font_antialias"/>
android:title="@string/settings_game_font_antialias" />
<CheckBoxPreference
android:key="pref_key_immersive_mode"
android:persistent="true"
android:summary="@string/about_immersive_mode"
android:title="@string/settings_game_immersive_mode"/>
android:title="@string/settings_game_immersive_mode" />
<CheckBoxPreference
android:key="pref_key_game_lab_pendulum_scale"
android:persistent="true"
android:title="@string/settings_game_lab_pendulum_scale"/>
android:title="@string/settings_game_lab_pendulum_scale" />
<!--<CheckBoxPreference
android:key="pref_settings_deck_manager_v2"
android:persistent="true"
......@@ -86,23 +86,23 @@
<Preference
android:key="settings_game_avatar"
android:persistent="true"
android:title="@string/settings_game_avatar"/>
android:persistent="true"
android:title="@string/settings_game_avatar" />
<Preference
android:key="settings_game_diy_card_cover"
android:persistent="true"
android:title="@string/settings_game_diy_card_back"/>
android:title="@string/settings_game_diy_card_back" />
<Preference
android:key="settings_game_diy_card_bg"
android:persistent="true"
android:title="@string/settings_game_diy_cover"/>
android:title="@string/settings_game_diy_cover" />
<Preference
android:key="pref_key_game_font_name"
android:persistent="true"
android:title="@string/settings_game_font_name"/>
android:title="@string/settings_game_font_name" />
<!--<CheckBoxPreference
android:key="settings_game_diy_card_db"
......
mobile/src/main/res/xml/shortcuts.xml
View file @ e52eb3d3
<?xml version="1.0" encoding="utf-8"?>
<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
<shortcut
android:shortcutId="short_mycard"
android:enabled="true"
android:icon="@drawable/mycard"
android:shortcutShortLabel="@string/mycard"
android:shortcutDisabledMessage="@string/invalid_shortcut"
android:shortcutId="short_mycard"
android:shortcutLongLabel="@string/mycard"
android:shortcutDisabledMessage="@string/invalid_shortcut">
android:shortcutShortLabel="@string/mycard">
<intent
android:action="android.intent.action.VIEW"
android:targetPackage="cn.garymb.ygomobile"
android:targetClass="cn.garymb.ygomobile.ui.mycard.MyCardActivity" />
<categories android:name="android.shortcut.conversation"/>
android:targetClass="cn.garymb.ygomobile.ui.mycard.MyCardActivity"
android:targetPackage="cn.garymb.ygomobile" />
<categories android:name="android.shortcut.conversation" />
</shortcut>
<shortcut
android:shortcutId="short_card_query"
android:enabled="true"
android:icon="@drawable/search"
android:shortcutShortLabel="@string/card_search"
android:shortcutDisabledMessage="@string/invalid_shortcut"
android:shortcutId="short_card_query"
android:shortcutLongLabel="@string/card_search"
android:shortcutDisabledMessage="@string/invalid_shortcut">
android:shortcutShortLabel="@string/card_search">
<intent
android:action="android.intent.action.VIEW"
android:targetPackage="cn.garymb.ygomobile"
android:targetClass="cn.garymb.ygomobile.ui.cards.CardSearchAcitivity" />
<categories android:name="android.shortcut.conversation"/>
android:targetClass="cn.garymb.ygomobile.ui.cards.CardSearchAcitivity"
android:targetPackage="cn.garymb.ygomobile" />
<categories android:name="android.shortcut.conversation" />
</shortcut>
<shortcut
android:shortcutId="short_deck_manager"
android:enabled="true"
android:icon="@drawable/deck"
android:shortcutShortLabel="@string/deck_manager"
android:shortcutDisabledMessage="@string/invalid_shortcut"
android:shortcutId="short_deck_manager"
android:shortcutLongLabel="@string/deck_manager"
android:shortcutDisabledMessage="@string/invalid_shortcut">
android:shortcutShortLabel="@string/deck_manager">
<intent
android:action="android.intent.action.VIEW"
android:targetPackage="cn.garymb.ygomobile"
android:targetClass="cn.garymb.ygomobile.ui.cards.DeckManagerActivity" />
<categories android:name="android.shortcut.conversation"/>
android:targetClass="cn.garymb.ygomobile.ui.cards.DeckManagerActivity"
android:targetPackage="cn.garymb.ygomobile" />
<categories android:name="android.shortcut.conversation" />
</shortcut>
</shortcuts>
\ No newline at end of file
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