Przeglądaj źródła

我的资产界面优化

zengjiebin 7 lat temu
rodzic
commit
170d4fd2c9

+ 6 - 6
app/src/main/java/com/sheep/gamegroup/view/activity/ActMyMoney.java

@@ -85,21 +85,21 @@ public class ActMyMoney extends BaseActivity {
         new_tab();
     }
     private void new_tab(){
-        indicator.addTab(indicator.newTab().setCustomView(tab_icon("充值记录",R.drawable.selector_tab_my_money1)));
-        indicator.addTab(indicator.newTab().setCustomView(tab_icon("提现记录",R.drawable.selector_tab_my_money2)));
-        indicator.addTab(indicator.newTab().setCustomView(tab_icon("消费记录",R.drawable.selector_tab_my_money2)));
+        indicator.addTab(indicator.newTab().setCustomView(tab_icon("充值记录", true)));
+        indicator.addTab(indicator.newTab().setCustomView(tab_icon("提现记录", true)));
+        indicator.addTab(indicator.newTab().setCustomView(tab_icon("消费记录", false)));
         //Tablayout自定义view绑定ViewPager
         pager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(indicator));
         indicator.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(pager));
 
     }
 
-    private View tab_icon(String name,int iconID){
+    private View tab_icon(String name,boolean isShow){
         View newtab =  LayoutInflater.from(this).inflate(R.layout.tab_item,null);
         TextView tv = newtab.findViewById(R.id.tabtext);
+        View tab_line = newtab.findViewById(R.id.tab_line);
+        tab_line.setVisibility(isShow ? View.VISIBLE: View.INVISIBLE);
         tv.setText(name);
-        ImageView im = newtab.findViewById(R.id.tabicon);
-        im.setImageResource(iconID);
         return newtab;
     }
 

+ 0 - 10
app/src/main/res/color/selector_color_my_money_tab.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:color="@color/my_money_tab_activated" android:state_focused="true" />
-    <item android:color="@color/my_money_tab_activated" android:state_checked="true" />
-    <item android:color="@color/my_money_tab_activated" android:state_selected="true" />
-    <item android:color="@color/my_money_tab_activated" android:state_activated="true" />
-    <item android:color="@color/my_money_tab_activated" android:state_pressed="true" />
-    <item android:color="@color/my_money_tab" />
-</selector>

+ 15 - 0
app/src/main/res/drawable-hdpi/layer_triangle_white.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <!-- 正三角 -->
+        <rotate
+            android:fromDegrees="45"
+            android:toDegrees="45"
+            android:pivotX="-40%"
+            android:pivotY="80%">
+            <shape android:shape="rectangle">
+                <solid android:color="@color/white"/>
+            </shape>
+        </rotate>
+    </item>
+</layer-list>

+ 10 - 0
app/src/main/res/drawable/selector_tab_triangle.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/layer_triangle_white" android:state_focused="true" />
+    <item android:drawable="@drawable/layer_triangle_white" android:state_checked="true" />
+    <item android:drawable="@drawable/layer_triangle_white" android:state_selected="true" />
+    <item android:drawable="@drawable/layer_triangle_white" android:state_activated="true" />
+    <item android:drawable="@drawable/layer_triangle_white" android:state_pressed="true" />
+    <item android:drawable="@color/transparent" />
+</selector>

+ 6 - 0
app/src/main/res/drawable/shape_main_solid_rectangle_small_top.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:topLeftRadius="8dp" android:topRightRadius="8dp" />
+    <solid android:color="#4bc1fe" />
+</shape>

+ 2 - 3
app/src/main/res/layout/act_my_money.xml

@@ -206,12 +206,12 @@
         android:layout_marginTop="@dimen/content_padding_20"
         android:layout_marginEnd="@dimen/content_padding_10"
         android:layout_marginStart="@dimen/content_padding_10"
-        android:background="@drawable/shape_white_solid_rectangle_small"
+        android:background="@drawable/shape_main_solid_rectangle_small_top"
         app:tabGravity="fill"
         app:tabIndicatorColor="#4bc1fe"
         app:tabIndicatorHeight="0dp"
         app:tabMode="fixed"
-        app:tabSelectedTextColor="#4bc1fe"
+        app:tabSelectedTextColor="@android:color/white"
         app:tabTextAppearance="@android:style/TextAppearance.Holo.Medium"
         app:tabTextColor="#444444" />
 
@@ -219,7 +219,6 @@
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="0dip"
-        android:layout_marginTop="@dimen/content_padding_10"
         android:layout_weight="1" />
 
 </LinearLayout>

+ 37 - 0
app/src/main/res/layout/empty_view_bottom.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/download_mgr_empty_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="@dimen/content_padding_10"
+        android:background="@color/white"/>
+    <ImageView
+        android:id="@+id/img_list_empty"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="80dp"
+        android:background="@color/white"
+        android:gravity="center"
+        android:scaleType="centerInside"
+        android:src="@drawable/wushuju"
+        android:visibility="visible" />
+
+    <TextView
+        android:id="@+id/txt_list_empty"
+        style="@style/G3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/img_list_empty"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/content_padding_big"
+        android:text="暂无数据,稍后再试。" />
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/content_padding_10"
+        android:layout_alignParentBottom="true"
+        android:background="@drawable/shape_white_solid_rectangle_small_bottom"/>
+</RelativeLayout>

+ 1 - 0
app/src/main/res/layout/fgt_personacenter_item_top.xml

@@ -12,6 +12,7 @@
             android:id="@+id/icon_img_iv"
             android:layout_width="@dimen/view_size_60"
             android:layout_height="@dimen/view_size_60"
+            android:layout_marginStart="@dimen/content_padding_15"
             android:src="@drawable/icon"
             android:layout_centerVertical="true"/>
         <LinearLayout

+ 1 - 1
app/src/main/res/layout/fgt_personalcenter_layout.xml

@@ -6,7 +6,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:background="@color/bg_gray"
         android:orientation="vertical">
 

+ 8 - 3
app/src/main/res/layout/list_has_empty.xml

@@ -5,15 +5,20 @@
 
     <include
         android:id="@+id/empty_view"
-        layout="@layout/empty_view"
+        layout="@layout/empty_view_bottom"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:layout_marginStart="@dimen/content_padding_10"
+        android:layout_marginEnd="@dimen/content_padding_10"
+        android:layout_marginBottom="@dimen/content_padding_10"/>
 
     <com.sheep.gamegroup.view.customview.RefreshLayout
         android:id="@+id/swipe_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/content_padding_10">
+        android:layout_marginStart="@dimen/content_padding_10"
+        android:layout_marginEnd="@dimen/content_padding_10"
+        android:layout_marginBottom="@dimen/content_padding_10">
 
         <ListView
             android:id="@+id/list_view"

+ 32 - 21
app/src/main/res/layout/tab_item.xml

@@ -1,24 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="50dp"
-    android:gravity="center"
-    android:orientation="horizontal">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="50dp">
 
-    <ImageView
-        android:id="@+id/tabicon"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
-        android:layout_gravity="center"
-        android:src="@drawable/selector_tab_my_money1" />
-
-    <TextView
-        android:id="@+id/tabtext"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/content_padding_10"
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:gravity="center"
-        android:text="TAB"
-        android:textColor="@color/selector_color_my_money_tab"
-        android:textSize="13sp" />
-</LinearLayout>
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/tabtext"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="TAB"
+            android:textColor="@color/white"
+            android:textSize="18sp" />
+
+        <View
+            android:id="@+id/tab_line"
+            android:layout_width="1dp"
+            android:layout_height="20dp"
+            android:background="@color/white" />
+    </LinearLayout>
+    <View
+        android:id="@+id/tab_triangle"
+        android:layout_width="15dp"
+        android:layout_height="15dp"
+        android:background="@drawable/selector_tab_triangle"
+        android:layout_centerHorizontal="true"
+        android:layout_alignParentBottom="true"/>
+</RelativeLayout>

+ 2 - 2
app/src/main/res/values/dd_colors.xml

@@ -20,7 +20,7 @@
     <color name="main_tab">#AFAFAF</color>
     <color name="color_choose_head_tv_press">#ff2d4b</color>
     <color name="color_choose_head_tv">#444444</color>
-    <color name="my_money_tab_activated">#2ec0f3</color>
-    <color name="my_money_tab">#444444</color>
+    <color name="my_money_tab">@color/white</color>
+    <color name="my_money_tab_activated">#444444</color>
 
 </resources>