Browse Source

ui tune up

billyyoyo 6 years ago
parent
commit
660014476d

+ 9 - 7
app/src/main/java/com/sheep/gamegroup/module/game/activity/ActGameGroupOrGameDetail.java

@@ -248,8 +248,10 @@ public class ActGameGroupOrGameDetail extends BaseActivity {
 
     //更新关注状态
     private void updateFocusTv() {
-        if (gc_game_app_detail_bt1 != null && gameEntity != null)
+        if (gc_game_app_detail_bt1 != null && gameEntity != null) {
             gc_game_app_detail_bt1.setText(gameEntity.isIs_focus_game() ? R.string.has_focus : R.string.focus);
+            gc_game_app_detail_bt1.setSelected(gameEntity.isIs_focus_game());
+        }
     }
 
     private int pingJiaIndex = 1;
@@ -401,7 +403,7 @@ public class ActGameGroupOrGameDetail extends BaseActivity {
 //            checkData(gameEntity);
 //            refreshData();
 //        } else {
-            initDetailFromNet();
+        initDetailFromNet();
 //        }
     }
 
@@ -418,11 +420,11 @@ public class ActGameGroupOrGameDetail extends BaseActivity {
 //        initDetailFromNet();
         boolean isRefresh = false;
 //        if (refreshDataCount != 0) {
-            Fragment item = mAdapter.getItem(position);
-            if (item instanceof IRefresh) {//可刷新,就调用当前fragment刷新数据
-                ((IRefresh) item).refreshData();
-                isRefresh = true;
-            }
+        Fragment item = mAdapter.getItem(position);
+        if (item instanceof IRefresh) {//可刷新,就调用当前fragment刷新数据
+            ((IRefresh) item).refreshData();
+            isRefresh = true;
+        }
 //        }
 //        refreshDataCount++;
         if (!isRefresh)

+ 0 - 2
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtFind.java

@@ -196,8 +196,6 @@ public class FgtFind extends BaseFragment {
                     }
                 });
                 CommonUtil.getInstance().reflex(indicator, activity);
-                pager.setOffscreenPageLimit(count);
-
             }
         });
     }

+ 2 - 2
app/src/main/res/color/selector_color_stoke_main_btn.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_enabled="false" android:color="@color/white" />
+    <item android:state_enabled="false" android:color="#666666" />
     <item android:state_activated="true" android:color="@color/main_tab_activated" />
     <item android:state_focused="true" android:color="@color/main_tab_activated" />
     <item android:state_checked="true" android:color="@color/main_tab_activated"/>
     <item android:state_selected="true" android:color="@color/main_tab_activated"/>
     <item android:state_pressed="true" android:color="@color/main_tab_activated"/>
-    <item android:color="#ff2ebef2"/>
+    <item android:color="#666666"/>
 </selector>

+ 8 - 0
app/src/main/res/drawable/btn_black_stroke_6.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="@dimen/radius_25" />
+    <stroke
+        android:width="1dp"
+        android:color="#666666" />
+</shape>

+ 2 - 2
app/src/main/res/drawable/selector_button_stroke_main.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-  <item android:state_enabled="false" android:drawable="@drawable/button_full_normal_gray" />
+  <item android:state_enabled="false" android:drawable="@drawable/btn_black_stroke_6" />
   <item android:state_focused="true" android:drawable="@drawable/btn_main_stroke_click" />
   <item android:state_checked="true" android:drawable="@drawable/btn_main_stroke_click"/>
   <item android:state_selected="true" android:drawable="@drawable/btn_main_stroke_click"/>
   <item android:state_pressed="true" android:drawable="@drawable/btn_main_stroke_click"/>
-  <item android:drawable="@drawable/btn_main_stroke"/>
+  <item android:drawable="@drawable/btn_black_stroke_6"/>
 </selector>

+ 2 - 2
app/src/main/res/drawable/shape_ash_solid_rectangle_top.xml

@@ -1,6 +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="10dp" android:topRightRadius="10dp" />
-    <solid android:color="@color/gray_bg" />
+    <corners android:topLeftRadius="15dp" android:topRightRadius="15dp" />
+    <solid android:color="@color/bg" />
 </shape>

+ 5 - 0
app/src/main/res/drawable/shape_oval_black_trans_pad.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#50000000" />
+</shape>

+ 10 - 4
app/src/main/res/layout/act_game_group_or_game_detail.xml

@@ -80,24 +80,30 @@
                         android:visibility="gone"
                         app:layout_constraintTop_toTopOf="parent"/>
                     <ImageView
-                        android:layout_width="?attr/actionBarSize"
-                        android:layout_height="?attr/actionBarSize"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:layout_marginLeft="16dp"
                         android:layout_marginTop="@dimen/status_bar_height"
                         android:gravity="center_vertical"
                         android:onClick="onClickBackImg"
                         android:scaleType="centerInside"
                         android:src="@drawable/narrow_back_black"
+                        android:tint="@color/white"
+                        android:background="@drawable/shape_oval_black_trans_pad"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
                     <ImageView
-                        android:layout_width="?attr/actionBarSize"
-                        android:layout_height="?attr/actionBarSize"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
                         android:layout_alignParentEnd="true"
                         android:layout_marginTop="@dimen/status_bar_height"
+                        android:layout_marginRight="16dp"
                         android:gravity="center_vertical"
                         android:onClick="onClickShareImg"
                         android:scaleType="centerInside"
+                        android:background="@drawable/shape_oval_black_trans_pad"
+                        android:tint="@color/white"
                         android:src="@mipmap/share"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent"/>

+ 3 - 9
app/src/main/res/layout/fgt_find.xml

@@ -1,18 +1,11 @@
 <?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="match_parent"
-    android:background="@color/bg">
-
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:adjustViewBounds="true"
-        android:scaleType="fitXY"
-        android:src="@drawable/skin_drawable_selector_bg_home_search" />
+    android:layout_height="match_parent">
 
     <android.support.design.widget.TabLayout
         android:id="@+id/indicator"
+        android:background="@drawable/shape_ash_solid_rectangle_top"
         style="@style/style_tab_3" />
 
     <View
@@ -23,6 +16,7 @@
 
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"
+        android:background="@color/bg"
         android:layout_marginTop="0.5dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"