From 6aee2ae6b91f5216c2cac25140322774dde3853f Mon Sep 17 00:00:00 2001
From: kehaoyuan <kehaoyuan@ghzhushou.com>
Date: Mon, 8 May 2017 18:36:45 +0800
Subject: [PATCH] =?UTF-8?q?ProgressBar=E5=9B=BA=E5=AE=9A=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?(=E9=98=B2=E6=AD=A25.0=E4=BB=A5=E4=B8=8A=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E6=94=B9=E5=8F=98),=E4=BF=AE=E6=94=B9SwitchButton=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/gh/common/util/MessageShareUtils.java  | 2 +-
 .../gamecenter/adapter/viewholder/FooterViewHolder.java  | 4 ++--
 .../java/com/gh/gamecenter/libao/Libao1Fragment.java     | 2 +-
 app/src/main/res/drawable/switchbuttom_back_color.xml    | 6 ++++++
 app/src/main/res/layout/activity_clean_apk.xml           | 2 +-
 app/src/main/res/layout/activity_gamedetail_news.xml     | 2 +-
 app/src/main/res/layout/activity_kc_select_game.xml      | 2 +-
 app/src/main/res/layout/activity_setting.xml             | 8 ++++----
 app/src/main/res/layout/activity_share_gh_wifi.xml       | 2 +-
 app/src/main/res/layout/dialog_suggest_select_game.xml   | 2 +-
 app/src/main/res/layout/fm_search.xml                    | 2 +-
 app/src/main/res/layout/game_head_item.xml               | 2 +-
 app/src/main/res/layout/gameupdate.xml                   | 2 +-
 app/src/main/res/layout/news_footer_item.xml             | 2 +-
 app/src/main/res/layout/refresh_footerview.xml           | 4 ++--
 app/src/main/res/layout/reuse_loading.xml                | 2 +-
 app/src/main/res/values/styles.xml                       | 9 +++++++++
 17 files changed, 35 insertions(+), 20 deletions(-)
 create mode 100644 app/src/main/res/drawable/switchbuttom_back_color.xml

diff --git a/app/src/main/java/com/gh/common/util/MessageShareUtils.java b/app/src/main/java/com/gh/common/util/MessageShareUtils.java
index 44e05b9bdc..a585920a5c 100644
--- a/app/src/main/java/com/gh/common/util/MessageShareUtils.java
+++ b/app/src/main/java/com/gh/common/util/MessageShareUtils.java
@@ -129,7 +129,7 @@ public class MessageShareUtils {
 
         RelativeLayout contentView = new RelativeLayout(context);
         contentView.setLayoutParams(new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
-        contentView.setBackgroundColor(Color.YELLOW);
+        contentView.setBackgroundColor(0x8c000000);
         contentView.setFocusable(true);
         contentView.setFocusableInTouchMode(true);
 
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/FooterViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/FooterViewHolder.java
index f508ca0c98..375534f887 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/FooterViewHolder.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/FooterViewHolder.java
@@ -1,8 +1,8 @@
 package com.gh.gamecenter.adapter.viewholder;
 
-import android.support.v4.widget.ContentLoadingProgressBar;
 import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.view.View;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -18,7 +18,7 @@ import com.gh.gamecenter.R;
 public class FooterViewHolder extends ViewHolder {
 
     @BindView(R.id.footerview_loading)
-    public ContentLoadingProgressBar loading;
+    public ProgressBar loading;
     @BindView(R.id.footerview_hint)
     public TextView hint;
     @BindView(R.id.footerview_line_left)
diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java
index 53ddea7125..eda02c55a6 100644
--- a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java
+++ b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java
@@ -11,9 +11,9 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import butterknife.BindView;
 import butterknife.OnClick;
-import com.daimajia.swipe.SwipeLayout;
 import com.gc.materialdesign.views.ProgressBarCircularIndeterminate;
 import com.gh.base.BaseFragment;
+import com.gh.common.view.SwipeLayout;
 import com.gh.common.view.VerticalItemDecoration;
 import com.gh.gamecenter.LibaoActivity;
 import com.gh.gamecenter.R;
diff --git a/app/src/main/res/drawable/switchbuttom_back_color.xml b/app/src/main/res/drawable/switchbuttom_back_color.xml
new file mode 100644
index 0000000000..d55b3bb0c7
--- /dev/null
+++ b/app/src/main/res/drawable/switchbuttom_back_color.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#A6A6A6" android:state_enabled="false"/>
+    <item android:color="@color/theme" android:state_checked="true"/>
+    <item android:color="#A6A6A6" android:state_checked="false"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_clean_apk.xml b/app/src/main/res/layout/activity_clean_apk.xml
index afb136bd0c..2106fd1878 100644
--- a/app/src/main/res/layout/activity_clean_apk.xml
+++ b/app/src/main/res/layout/activity_clean_apk.xml
@@ -19,7 +19,7 @@
 
 			<ProgressBar
 					android:id = "@+id/scan_pb"
-					style = "?android:attr/progressBarStyle"
+					style = "@style/android:Widget.Holo.ProgressBar"
 					android:layout_width = "25dp"
 					android:layout_height = "25dp"
 					android:layout_marginRight = "10dp"
diff --git a/app/src/main/res/layout/activity_gamedetail_news.xml b/app/src/main/res/layout/activity_gamedetail_news.xml
index 693ecb11f2..ac1946aa8b 100644
--- a/app/src/main/res/layout/activity_gamedetail_news.xml
+++ b/app/src/main/res/layout/activity_gamedetail_news.xml
@@ -61,7 +61,7 @@
 				android:orientation = "horizontal" >
 
 			<ProgressBar
-					style = "?android:attr/progressBarStyle"
+				    style = "@style/android:Widget.Holo.ProgressBar"
 					android:layout_width = "25dp"
 					android:layout_height = "25dp" />
 
diff --git a/app/src/main/res/layout/activity_kc_select_game.xml b/app/src/main/res/layout/activity_kc_select_game.xml
index 9c1e2bf6da..b899ca5c8b 100644
--- a/app/src/main/res/layout/activity_kc_select_game.xml
+++ b/app/src/main/res/layout/activity_kc_select_game.xml
@@ -35,7 +35,7 @@
 			<ProgressBar
 					android:id = "@+id/select_game_pb"
 					android:layout_toRightOf = "@+id/install_count"
-					style = "?android:attr/progressBarStyle"
+				    style = "@style/android:Widget.Holo.ProgressBar"
 					android:layout_width = "25dp"
 					android:layout_height = "25dp"
 					android:layout_marginLeft = "5dp"
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index 56f1c4a761..1677c2af00 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -118,7 +118,7 @@
 
 					<com.kyleduo.switchbutton.SwitchButton
 							android:id = "@+id/setting_sb_autoinstall"
-							style = "@style/SwitchButtonMD"
+							style = "@style/MySwitchButtonMD"
 							android:layout_width = "wrap_content"
 							android:layout_height = "wrap_content"
 							android:layout_alignParentRight = "true"
@@ -148,7 +148,7 @@
 
 					<com.kyleduo.switchbutton.SwitchButton
 							android:id = "@+id/setting_sb_concerngame"
-							style = "@style/SwitchButtonMD"
+							style = "@style/MySwitchButtonMD"
 							android:layout_width = "wrap_content"
 							android:layout_height = "wrap_content"
 							android:layout_alignParentRight = "true"
@@ -178,7 +178,7 @@
 
 					<com.kyleduo.switchbutton.SwitchButton
 							android:id = "@+id/setting_sb_autodelete"
-							style = "@style/SwitchButtonMD"
+							style = "@style/MySwitchButtonMD"
 							android:layout_width = "wrap_content"
 							android:layout_height = "wrap_content"
 							android:layout_alignParentRight = "true"
@@ -208,7 +208,7 @@
 
 					<com.kyleduo.switchbutton.SwitchButton
 							android:id = "@+id/setting_sb_deletedata"
-							style = "@style/SwitchButtonMD"
+							style = "@style/MySwitchButtonMD"
 							android:layout_width = "wrap_content"
 							android:layout_height = "wrap_content"
 							android:layout_alignParentRight = "true"
diff --git a/app/src/main/res/layout/activity_share_gh_wifi.xml b/app/src/main/res/layout/activity_share_gh_wifi.xml
index e4450205cf..f2114bb0c7 100644
--- a/app/src/main/res/layout/activity_share_gh_wifi.xml
+++ b/app/src/main/res/layout/activity_share_gh_wifi.xml
@@ -63,7 +63,7 @@
 
 					<ProgressBar
 							android:id = "@+id/init_hotpost_pb"
-							style = "?android:attr/progressBarStyle"
+					     	style = "@style/android:Widget.Holo.ProgressBar"
 							android:layout_width = "22dp"
 							android:layout_height = "22dp"
 							android:layout_marginRight = "5dp"
diff --git a/app/src/main/res/layout/dialog_suggest_select_game.xml b/app/src/main/res/layout/dialog_suggest_select_game.xml
index 6f876c1c7a..6da8e15bdc 100644
--- a/app/src/main/res/layout/dialog_suggest_select_game.xml
+++ b/app/src/main/res/layout/dialog_suggest_select_game.xml
@@ -32,7 +32,7 @@
 
 		<ProgressBar
 				android:id = "@+id/dialog_suggest_game_load"
-				style = "?android:attr/progressBarStyle"
+			    style = "@style/android:Widget.Holo.ProgressBar"
 				android:layout_width = "30dp"
 				android:layout_height = "30dp"
 				android:layout_centerInParent = "true" />
diff --git a/app/src/main/res/layout/fm_search.xml b/app/src/main/res/layout/fm_search.xml
index 7ded05bb05..59d1186143 100644
--- a/app/src/main/res/layout/fm_search.xml
+++ b/app/src/main/res/layout/fm_search.xml
@@ -20,7 +20,7 @@
 			android:layout_centerInParent = "true"
 			android:orientation = "horizontal" >
 
-		<android.support.v4.widget.ContentLoadingProgressBar
+		<ProgressBar
 				android:id = "@+id/footerview_loading"
 				style = "?android:attr/progressBarStyleInverse"
 				android:layout_width = "25dp"
diff --git a/app/src/main/res/layout/game_head_item.xml b/app/src/main/res/layout/game_head_item.xml
index d2a3d7374f..211f7f54ac 100644
--- a/app/src/main/res/layout/game_head_item.xml
+++ b/app/src/main/res/layout/game_head_item.xml
@@ -46,7 +46,7 @@
 
 		<ProgressBar
 				android:id = "@+id/head_pb"
-				style = "?android:attr/progressBarStyle"
+			    style = "@style/android:Widget.Holo.ProgressBar"
 				android:layout_width = "25dp"
 				android:layout_height = "25dp"
 				android:layout_marginRight = "10dp"
diff --git a/app/src/main/res/layout/gameupdate.xml b/app/src/main/res/layout/gameupdate.xml
index 4911a53254..e3929e1c20 100644
--- a/app/src/main/res/layout/gameupdate.xml
+++ b/app/src/main/res/layout/gameupdate.xml
@@ -21,7 +21,7 @@
 			android:visibility = "gone" >
 
 		<ProgressBar
-				style = "?android:attr/progressBarStyle"
+			    style = "@style/android:Widget.Holo.ProgressBar"
 				android:layout_width = "25dp"
 				android:layout_height = "25dp" />
 
diff --git a/app/src/main/res/layout/news_footer_item.xml b/app/src/main/res/layout/news_footer_item.xml
index 9baec146bb..9241453a27 100644
--- a/app/src/main/res/layout/news_footer_item.xml
+++ b/app/src/main/res/layout/news_footer_item.xml
@@ -9,7 +9,7 @@
 
 	<ProgressBar
 			android:id = "@+id/news_footer_loading"
-			style = "?android:attr/progressBarStyle"
+	    	style = "@style/android:Widget.Holo.ProgressBar"
 			android:layout_width = "25dp"
 			android:layout_height = "25dp"
 			android:layout_margin = "5dp" />
diff --git a/app/src/main/res/layout/refresh_footerview.xml b/app/src/main/res/layout/refresh_footerview.xml
index d04e2f46ef..2d07c32276 100644
--- a/app/src/main/res/layout/refresh_footerview.xml
+++ b/app/src/main/res/layout/refresh_footerview.xml
@@ -16,9 +16,9 @@
 			android:visibility = "gone"
 			android:background = "@color/cutting_line" />
 
-	<android.support.v4.widget.ContentLoadingProgressBar
+	<ProgressBar
 			android:id = "@+id/footerview_loading"
-			style = "?android:attr/progressBarStyleInverse"
+		    style = "@style/android:Widget.Holo.ProgressBar"
 			android:layout_width = "25dp"
 			android:layout_height = "25dp"
 			android:layout_margin = "8dp" />
diff --git a/app/src/main/res/layout/reuse_loading.xml b/app/src/main/res/layout/reuse_loading.xml
index 12ecb13196..6e5f6606a4 100644
--- a/app/src/main/res/layout/reuse_loading.xml
+++ b/app/src/main/res/layout/reuse_loading.xml
@@ -7,7 +7,7 @@
               android:gravity = "center_vertical" >
 
 	<ProgressBar
-			style = "?android:attr/progressBarStyle"
+	    	style = "@style/android:Widget.Holo.ProgressBar"
 			android:layout_width = "25dp"
 			android:layout_height = "25dp" />
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1678e3434f..9eddbf591e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -73,4 +73,13 @@
 		<!--<item name="backgroundImage">@color/placeholder_bg</item>-->
 	</style >
 
+	<style name="MySwitchButtonMD" parent="SwitchButtonMD">
+		<item name="kswThumbDrawable">@drawable/md_switch_thumb_on_or_off</item>
+		<item name="kswBackRadius">0dp</item>
+		<item name="kswThumbMarginTop">-16dp</item>
+		<item name="kswThumbMarginBottom">-16dp</item>
+		<item name="kswBackMeasureRatio">1.60</item>
+		<item name="kswBackColor">@drawable/switchbuttom_back_color</item>
+	</style>
+
 </resources >
\ No newline at end of file