update image resource

baoyunmian · Nov 28, 2015 · d92b2a0 · d92b2a0
1 parent 0109f8d
commit d92b2a0
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 26 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Nov 19 19:26:25 CST 2015
+#Sat Nov 28 21:40:48 CST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
diff --git a/reading_routine/build.gradle b/reading_routine/build.gradle
@@ -25,7 +25,6 @@ dependencies {
     compile files('libs/Bmob_Push_V0.6beta_20150408.jar')
     compile 'com.jakewharton:butterknife:5.1.1'
     compile 'com.balysv.materialmenu:material-menu-toolbar:1.5.1'
-    compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'com.daimajia.swipelayout:library:1.2.0@aar'
     compile 'com.daimajia.androidanimations:library:1.1.3@aar'
     compile 'com.prolificinteractive:material-calendarview:0.4.0'
@@ -37,4 +36,6 @@ dependencies {
     compile 'com.android.support:recyclerview-v7:23.0.1'
     compile 'com.android.support:palette-v7:23.0.1'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
+    compile 'com.facebook.fresco:fresco:0.6.0+'
+    compile 'com.google.code.gson:gson:2.2.4'
 }
diff --git a/reading_routine/reading_routine.iml b/reading_routine/reading_routine.iml
@@ -80,6 +80,10 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.balysv.materialmenu/material-menu/1.5.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.daimajia.androidanimations/library/1.1.3/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.daimajia.swipelayout/library/1.2.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/drawee/0.6.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fbcore/0.6.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fresco/0.6.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline/0.6.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.prolificinteractive/material-calendarview/0.4.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
@@ -93,22 +97,27 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
     <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="palette-v7-23.0.1" level="project" />
-    <orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
     <orderEntry type="library" exported="" name="Bmob_Push_V0.6beta_20150408" level="project" />
     <orderEntry type="library" exported="" name="cardview-v7-23.0.1" level="project" />
     <orderEntry type="library" exported="" name="butterknife-5.1.1" level="project" />
     <orderEntry type="library" exported="" name="design-23.0.1" level="project" />
     <orderEntry type="library" exported="" name="universal-image-loader-1.9.4" level="project" />
     <orderEntry type="library" exported="" name="BmobSDK_V3.4.1_0710" level="project" />
+    <orderEntry type="library" exported="" name="fbcore-0.6.0" level="project" />
+    <orderEntry type="library" exported="" name="fresco-0.6.0" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-23.0.1" level="project" />
     <orderEntry type="library" exported="" name="material-menu-1.5.1" level="project" />
+    <orderEntry type="library" exported="" name="imagepipeline-0.6.0" level="project" />
     <orderEntry type="library" exported="" name="material-menu-toolbar-1.5.1" level="project" />
     <orderEntry type="library" exported="" name="library-1.2.0" level="project" />
+    <orderEntry type="library" exported="" name="bolts-android-1.1.4" level="project" />
     <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
     <orderEntry type="library" exported="" name="library-1.1.3" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="drawee-0.6.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
     <orderEntry type="library" exported="" name="material-calendarview-0.4.0" level="project" />
   </component>

diff --git a/reading_routine/src/main/java/com/agenthun/readingroutine/activities/BookActivity.java b/reading_routine/src/main/java/com/agenthun/readingroutine/activities/BookActivity.java
@@ -178,9 +178,20 @@ public void onAlarmTimeClick() {
             Calendar calendar = Calendar.getInstance();
             mDate = calendar.getTime();
         }
+
         CalendarDialogFragment calendarDialogFragment = new CalendarDialogFragment(mDate);
         calendarDialogFragment.show(getSupportFragmentManager(), TAG);
         calendarDialogFragment.setCalendarCallback(mCalendarFragmentCallback);
+
+/*        DatePickerDialog.OnDateSetListener mDateSetListener = new DatePickerDialog.OnDateSetListener() {
+            @Override
+            public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
+                Log.d(TAG, "onDateSet() returned: " + year);
+                Log.d(TAG, "onDateSet() returned: " + monthOfYear);
+                Log.d(TAG, "onDateSet() returned: " + dayOfMonth);
+            }
+        };
+        new DatePickerDialog(BookActivity.this, mDateSetListener, 2015, 11, 29).show();*/
     }
 
     @OnClick(R.id.delete)

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
@@ -57,7 +57,7 @@ public void onClick(View v) {
                 AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
                 View view = LayoutInflater.from(getContext()).inflate(R.layout.dialog_introduction, null);
                 builder.setView(view);
-                builder.setTitle(R.string.text_app_introduction).show();
+                builder.setTitle(R.string.text_app_introduction).setPositiveButton(R.string.text_ok, null).show();
             }
         });
 

diff --git a/reading_routine/src/main/res/drawable-xxhdpi/ic_book_3.png b/reading_routine/src/main/res/drawable-xxhdpi/ic_book_3.png
diff --git a/reading_routine/src/main/res/drawable-xxhdpi/introduction_notes.png b/reading_routine/src/main/res/drawable-xxhdpi/introduction_notes.png
diff --git a/reading_routine/src/main/res/drawable-xxhdpi/introduction_reading.png b/reading_routine/src/main/res/drawable-xxhdpi/introduction_reading.png
diff --git a/reading_routine/src/main/res/drawable-xxhdpi/introduction_routine.png b/reading_routine/src/main/res/drawable-xxhdpi/introduction_routine.png
diff --git a/reading_routine/src/main/res/layout/content_note_details.xml b/reading_routine/src/main/res/layout/content_note_details.xml
@@ -19,7 +19,7 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
@@ -33,7 +33,7 @@
             <EditText
                 android:id="@+id/edit_note_title"
                 style="@style/single_line_text_field"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:hint="title"
                 android:singleLine="true" />
 
@@ -42,8 +42,8 @@
             <EditText
                 android:id="@+id/edit_note_content"
                 style="@style/multiline_text_field"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:background="@color/color_white"
                 android:gravity="top"
                 android:hint="compose"

diff --git a/reading_routine/src/main/res/layout/dialog_introduction.xml b/reading_routine/src/main/res/layout/dialog_introduction.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -19,6 +21,11 @@
             android:layout_height="216dp"
             android:layout_marginTop="16dp"
             android:src="@drawable/introduction_routine" />
+        <!--        <com.facebook.drawee.view.SimpleDraweeView
+                    android:layout_width="123dp"
+                    android:layout_height="216dp"
+                    android:layout_marginTop="16dp"
+                    android:src="@drawable/introduction_routine" />-->
 
 
         <TextView
@@ -33,18 +40,18 @@
             android:layout_marginTop="16dp"
             android:src="@drawable/introduction_reading" />
 
-        <!--        <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="20dp"
-                    android:text="3.读书笔记" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:text="3.读书笔记" />
 
-                <ImageView
-                    android:layout_width="123dp"
-                    android:layout_height="216dp"
-                    android:layout_marginTop="16dp"
-                    android:src="@drawable/introduction_notes" />-->
+        <ImageView
+            android:layout_width="123dp"
+            android:layout_height="216dp"
+            android:layout_marginTop="16dp"
+            android:src="@drawable/introduction_notes" />
 
     </LinearLayout>
 
-</android.support.v4.widget.NestedScrollView>
+</ScrollView>
diff --git a/reading_routine/src/main/res/mipmap-hdpi/ic_rr_launcher.png b/reading_routine/src/main/res/mipmap-hdpi/ic_rr_launcher.png
diff --git a/reading_routine/src/main/res/mipmap-mdpi/ic_rr_launcher.png b/reading_routine/src/main/res/mipmap-mdpi/ic_rr_launcher.png
diff --git a/reading_routine/src/main/res/mipmap-xhdpi/ic_rr_launcher.png b/reading_routine/src/main/res/mipmap-xhdpi/ic_rr_launcher.png
diff --git a/reading_routine/src/main/res/mipmap-xxhdpi/ic_rr_launcher.png b/reading_routine/src/main/res/mipmap-xxhdpi/ic_rr_launcher.png
diff --git a/reading_routine/src/main/res/values/strings.xml b/reading_routine/src/main/res/values/strings.xml
@@ -57,10 +57,6 @@
     <string name="text_new_app_version">新版本</string>
     <string name="text_app_introduction">功能介绍</string>
     <string name="text_thanks">致谢</string>
-    <string name="text_app_introduction_content">1.读书计划安排/n
-        2.阅读本地电子书/n
-        3.读书笔记/n
-        4.好书推荐</string>
     <string name="text_ok">确认</string>
     <string name="text_copyright">Copyright \@2015 agenthun</string>