From 357d24ad7d57b35f5fad6c61963eee9a2f1e3899 Mon Sep 17 00:00:00 2001
From: maning <ning.ma@12301.cn>
Date: Sat, 27 May 2017 10:08:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7V1.6.2,?=
 =?UTF-8?q?=E5=85=B3=E4=BA=8E=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |  2 +-
 .../gankmm/ui/activity/AboutActivity.java     | 18 +++++++-
 app/src/main/res/layout/activity_about.xml    | 44 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  4 ++
 build.gradle                                  |  4 +-
 5 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index fbb6828..5d19981 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/maning/gankmm/ui/activity/AboutActivity.java b/app/src/main/java/com/maning/gankmm/ui/activity/AboutActivity.java
index 375ca7d..482c922 100644
--- a/app/src/main/java/com/maning/gankmm/ui/activity/AboutActivity.java
+++ b/app/src/main/java/com/maning/gankmm/ui/activity/AboutActivity.java
@@ -161,7 +161,23 @@ void tv_github16() {
     }
     @OnClick(R.id.tv_github17)
     void tv_github17() {
-        IntentUtils.startToWebActivity(this, null,getString(R.string.github), getString(R.string.github_16));
+        IntentUtils.startToWebActivity(this, null,getString(R.string.github), getString(R.string.github_17));
+    }
+    @OnClick(R.id.tv_github18)
+    void tv_github18() {
+        IntentUtils.startToWebActivity(this, null,getString(R.string.github), getString(R.string.github_18));
+    }
+    @OnClick(R.id.tv_github19)
+    void tv_github19() {
+        IntentUtils.startToWebActivity(this, null,getString(R.string.github), getString(R.string.github_19));
+    }
+    @OnClick(R.id.tv_github20)
+    void tv_github20() {
+        IntentUtils.startToWebActivity(this, null,getString(R.string.github), getString(R.string.github_20));
+    }
+    @OnClick(R.id.tv_github21)
+    void tv_github21() {
+        IntentUtils.startToWebActivity(this, null,getString(R.string.github), getString(R.string.github_21));
     }
 
 
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 5bd7c5a..d111ae4 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -336,6 +336,50 @@
                 android:textColor="?main_text_color"
                 android:textSize="14sp" />
 
+            <TextView
+                android:id="@+id/tv_github18"
+                android:layout_width="match_parent"
+                android:layout_height="44dp"
+                android:layout_marginTop="10dp"
+                android:background="?item_setting_bg"
+                android:gravity="center"
+                android:text="chuck"
+                android:textColor="?main_text_color"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_github19"
+                android:layout_width="match_parent"
+                android:layout_height="44dp"
+                android:layout_marginTop="10dp"
+                android:background="?item_setting_bg"
+                android:gravity="center"
+                android:text="scrollablepanel"
+                android:textColor="?main_text_color"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_github20"
+                android:layout_width="match_parent"
+                android:layout_height="44dp"
+                android:layout_marginTop="10dp"
+                android:background="?item_setting_bg"
+                android:gravity="center"
+                android:text="expandableTextView"
+                android:textColor="?main_text_color"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_github21"
+                android:layout_width="match_parent"
+                android:layout_height="44dp"
+                android:layout_marginTop="10dp"
+                android:background="?item_setting_bg"
+                android:gravity="center"
+                android:text="MNCalendar"
+                android:textColor="?main_text_color"
+                android:textSize="14sp" />
+
         </LinearLayout>
     </android.support.v4.widget.NestedScrollView>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ed61e34..5fd62a5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -24,6 +24,10 @@
     <string name="github_15">https://github.com/maning0303/SwitcherView</string>
     <string name="github_16">https://github.com/yavski/fab-speed-dial</string>
     <string name="github_17">https://github.com/wasabeef/Blurry</string>
+    <string name="github_18">https://github.com/jgilfelt/chuck</string>
+    <string name="github_19">https://github.com/Kelin-Hong/ScrollablePanel</string>
+    <string name="github_20">https://github.com/Manabu-GT/ExpandableTextView</string>
+    <string name="github_21">https://github.com/maning0303/MNCalendar</string>
 
 
     <string name="gank_update_apk">当前版本是最新版</string>
diff --git a/build.gradle b/build.gradle
index ce84e51..619879e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,8 +32,8 @@ ext {
     buildToolsVersion = "25.0.2"
     minSdkVersion = 16
     targetSdkVersion = 25
-    versionCode = 19
-    versionName = "1.6.1"
+    versionCode = 20
+    versionName = "1.6.2"
     storePassword = "123456"
     keyAlias = "Gank"
     keyPassword = "123456"