commit introduction page

baoyunmian · Dec 24, 2015 · 8a2e8b1 · 8a2e8b1
1 parent 8a41bed
commit 8a2e8b1
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 4 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/reading_routine/reading_routine-release.apk b/reading_routine/reading_routine-release.apk
diff --git a/reading_routine/reading_routine.iml b/reading_routine/reading_routine.iml
@@ -67,7 +67,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />

diff --git a/reading_routine/src/main/java/com/agenthun/readingroutine/fragments/AboutFragment.java b/reading_routine/src/main/java/com/agenthun/readingroutine/fragments/AboutFragment.java
@@ -56,7 +56,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         updateVersionArea.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
+                Snackbar.make(updateVersionArea, R.string.text_app_already_the_latest_version, Snackbar.LENGTH_SHORT).show();
             }
         });
 

diff --git a/reading_routine/src/main/res/drawable-xxhdpi/r_login.png b/reading_routine/src/main/res/drawable-xxhdpi/r_login.png
diff --git a/reading_routine/src/main/res/drawable-xxhdpi/r_user.png b/reading_routine/src/main/res/drawable-xxhdpi/r_user.png
diff --git a/reading_routine/src/main/res/layout/dialog_introduction.xml b/reading_routine/src/main/res/layout/dialog_introduction.xml
@@ -163,6 +163,21 @@
             android:padding="@dimen/margin_horizontal_medium"
             android:scaleType="centerCrop"
             android:src="@drawable/r_shopping_product" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:fontFamily="sans-serif"
+            android:text="@string/text_introduction_title_login_user"
+            android:textColor="@color/text_dialog_color_subhead" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/margin_horizontal_medium"
+            android:scaleType="centerCrop"
+            android:src="@drawable/r_user" />
     </LinearLayout>
 
 </ScrollView>
diff --git a/reading_routine/src/main/res/values/strings.xml b/reading_routine/src/main/res/values/strings.xml
@@ -59,6 +59,7 @@
     <string name="text_about">关于</string>
     <string name="text_version">V1.0 Beta</string>
     <string name="text_app_new_version_update">版本更新</string>
+    <string name="text_app_already_the_latest_version">已是最新版本</string>
     <string name="text_new_app_version">新版本</string>
     <string name="text_app_introduction">功能介绍</string>
     <string name="text_thanks">致谢</string>
@@ -78,8 +79,10 @@
     <string name="text_introduction_content_reading">加入电子书阅读器的功能，可与读书计划安排进行关联。</string>
     <string name="text_introduction_title_notes">3.读书笔记</string>
     <string name="text_introduction_content_notes">你可以添加读书笔记，进行好句记录，书评，读后感等。</string>
-    <string name="text_introduction_title_shopping">4.好书推荐</string>
+    <string name="text_introduction_title_shopping">4.好书推荐, 源自豆瓣读书排名</string>
     <string name="text_introduction_content_shopping">来自豆瓣读书排行榜。</string>
+    <string name="text_introduction_title_login_user">5.数据同步</string>
+    <string name="text_introduction_content_login_user">个人数据及时与云端同步</string>
     <string name="error_invalid_network">网络出错</string>
     <string name="error_404_network">404 出错啦!</string>