RaoMeng 9 lat temu
rodzic
commit
53b4ee0b7e

+ 3 - 2
WeiChat/src/main/AndroidManifest.xml

@@ -68,7 +68,7 @@
         android:allowBackup="true"
         android:icon="@drawable/uuu"
         android:label="@string/app_name"
-        android:theme="@style/StyledIndicators">
+        android:theme="@style/AppTheme">
         <meta-data
             android:name="UMENG_APPKEY"
             android:value="574504a167e58eec520017df" />
@@ -150,7 +150,8 @@
             android:name=".ui.message.AddContactsActivity"
             android:configChanges="orientation|keyboardHidden"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
-        <activity android:name=".ui.erp.activity.SubcribeManageActivity"/>
+        <activity android:name=".ui.erp.activity.SubcribeManageActivity"
+            android:theme="@style/StyledIndicators"/>
         <!-- 群聊 -->
         <activity android:name=".ui.groupchat.SelectContactsActivity" />
 

+ 19 - 0
WeiChat/src/main/res/color/selector_subscribe_manage.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Non focused states -->
+    <item android:state_focused="false" android:state_pressed="false" android:state_selected="false" android:color="@color/black" />
+    <item android:state_focused="false" android:state_pressed="false" android:state_selected="true" android:color="@color/orange"/>
+
+    <!-- Focused states -->
+    <item android:state_focused="true" android:state_pressed="false" android:state_selected="false"  android:color="@color/black"/>
+    <item android:state_focused="true" android:state_pressed="false" android:state_selected="true"  android:color="@color/orange"/>
+
+    <!-- Pressed -->
+    <!--    Non focused states -->
+    <item android:state_focused="false" android:state_pressed="true" android:state_selected="false"  android:color="@color/black"/>
+    <item android:state_focused="false" android:state_pressed="true" android:state_selected="true" android:color="@color/orange"/>
+
+    <!--    Focused states -->
+    <item android:state_focused="true" android:state_pressed="true" android:state_selected="false"  android:color="@color/black"/>
+    <item android:state_focused="true" android:state_pressed="true" android:state_selected="true"  android:color="@color/orange"/>
+</selector>

+ 0 - 19
WeiChat/src/main/res/drawable/selector_subscribe_manage.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Non focused states -->
-    <item android:drawable="@drawable/vpi__tab_unselected_holo" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/vpi__tab_selected_holo" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Focused states -->
-    <item android:drawable="@drawable/vpi__tab_unselected_focused_holo" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/vpi__tab_selected_focused_holo" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
-
-    <!-- Pressed -->
-    <!--    Non focused states -->
-    <item android:drawable="@drawable/vpi__tab_unselected_pressed_holo" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
-    <item android:drawable="@drawable/vpi__tab_selected_pressed_holo" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
-
-    <!--    Focused states -->
-    <item android:drawable="@drawable/vpi__tab_unselected_pressed_holo" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
-    <item android:drawable="@drawable/vpi__tab_selected_pressed_holo" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
-</selector>

+ 15 - 0
WeiChat/src/main/res/drawable/selector_subscribe_tab.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Non focused states -->
+    <item android:state_focused="false" android:state_pressed="false" android:state_selected="false" android:color="@color/black"/>
+    <item android:state_focused="false" android:state_pressed="false" android:state_selected="true" android:color="@color/orange"/>
+
+    <!-- Focused states -->
+    <item android:state_focused="true" android:state_pressed="false" android:state_selected="false" android:color="@color/black"/>
+    <item android:state_focused="true" android:state_pressed="false" android:state_selected="true" android:color="@color/orange"/>
+
+    <!-- Pressed -->
+    <item android:state_pressed="true" android:color="@color/black"/>
+
+</selector>

+ 1 - 1
WeiChat/src/main/res/layout/activity_subscribe_manage.xml

@@ -9,7 +9,7 @@
         android:id="@+id/subscribe_manage_tab"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
-    <com.viewpagerindicator.UnderlinePageIndicator
+    <com.viewpagerindicator.UnderlinePageIndicatorEx
         android:id="@+id/subscribe_manage_undertab"
         android:layout_width="match_parent"
         android:layout_height="3dp"/>

+ 4 - 2
WeiChat/src/main/res/values/styles.xml

@@ -817,10 +817,10 @@
         <!-- 分割线图片设置 -->
         <item name="android:divider">@drawable/dividing_line</item>
         <!-- 设置分割线的显示位置,或是不显示 -->
-        <item name="android:showDividers">none</item>
+        <item name="android:showDividers">middle</item>
 
         <item name="android:textAppearance">@style/CustomTabPageIndicator.Text</item>
-        <!--<item name="android:textColor">@drawable/selector_subscribe_manage</item>-->
+        <item name="android:textColor">@drawable/selector_subscribe_tab</item>
         <item name="android:textSize">16sp</item>
         <item name="android:dividerPadding">10dp</item>
         <item name="android:paddingLeft">8dp</item>
@@ -831,11 +831,13 @@
 
     <style name="CustomTabPageIndicator.Text" parent="android:TextAppearance.Medium">
         <item name="android:typeface">monospace</item>
+        <!--<item name="android:textColor">@color/selector_subscribe_manage</item>-->
     </style>
 
     <style name="CustomUnderlinePageIndicator">
         <item name="selectedColor">@color/orange</item>
         <item name="android:background">#FFCCCCCC</item>
+        <!--<item name="android:textColor">@drawable/selector_subscribe_tab</item>-->
         <!--<item name="fadeLength">1000</item>
         <item name="fadeDelay">1000</item>-->
     </style>

+ 3 - 3
library-viewpager-indicator/src/main/java/com/viewpagerindicator/UnderlinePageIndicator.java

@@ -41,12 +41,12 @@ public class UnderlinePageIndicator extends View implements PageIndicator {
 
     private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
 
-    private boolean mFades;
+    protected boolean mFades;
     private int mFadeDelay;
     private int mFadeLength;
     private int mFadeBy;
 
-    private ViewPager mViewPager;
+    protected ViewPager mViewPager;
     private ViewPager.OnPageChangeListener mListener;
     private int mScrollState;
     private int mCurrentPage;
@@ -57,7 +57,7 @@ public class UnderlinePageIndicator extends View implements PageIndicator {
     private int mActivePointerId = INVALID_POINTER;
     private boolean mIsDragging;
 
-    private final Runnable mFadeRunnable = new Runnable() {
+    protected final Runnable mFadeRunnable = new Runnable() {
       @Override public void run() {
         if (!mFades) return;
 

+ 49 - 0
library-viewpager-indicator/src/main/java/com/viewpagerindicator/UnderlinePageIndicatorEx.java

@@ -0,0 +1,49 @@
+package com.viewpagerindicator;
+
+import android.content.Context;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+
+public class UnderlinePageIndicatorEx extends UnderlinePageIndicator{
+    public UnderlinePageIndicatorEx(Context context) {
+        super(context, null);
+    }
+
+    public UnderlinePageIndicatorEx(Context context, AttributeSet attrs) {
+        super(context, attrs, R.attr.vpiUnderlinePageIndicatorStyle);
+    }
+
+    public UnderlinePageIndicatorEx(Context context, AttributeSet attrs,
+            int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    // 自身的 ViewPage传递过去
+    @Override
+    public void setViewPager(ViewPager viewPager) {
+        if (mViewPager == viewPager) {
+            return;
+        }
+//        if (mViewPager != null) {
+//            mViewPager.setOnPageChangeListener(null);
+//        }
+
+        if (viewPager.getAdapter() == null) {
+            throw new IllegalStateException(" pager 没有 加入 adapter");
+        }
+
+        mViewPager = viewPager;
+//         mViewPager.setOnPageChangeListener(this);
+        invalidate();
+
+        post(new Runnable() {
+            @Override
+            public void run() {
+                if (mFades) {
+                    post(mFadeRunnable);
+                }
+            }
+        });
+    }
+
+}