更新冬日装扮

woxingxiao · Feb 10, 2018 · d325c07 · d325c07
1 parent df58d6a
commit d325c07
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -16,9 +16,8 @@
 
 ## 升级日志  
 ### 最新：
-### 2.0.1 (Build 28)
-1. 精选秋日装扮；
-2. bug修复。
+### 2.0.2 (Build 29)
+精选冬日装扮。
 
 ### 历史：
 [**UpdateLog**](https://github.com/woxingxiao/GracefulMovies/blob/master/UpdateLog.md)  
@@ -76,7 +75,7 @@
 **作者保留权利**
 
 --------
-> **人生苦短，请选择科学上网。推荐一下本人正在使用的，稳定高速，便宜好用。[推介链接](https://portal.shadowsocks.com.hk/aff.php?aff=8881)**
+> **人生苦短，请选择科学上网。推荐一下本人正在使用的，稳定高速，便宜好用。[推介链接](https://portal.shadowsocks.la/aff.php?aff=8881)**
 
 # License
 ```

diff --git a/UpdateLog.md b/UpdateLog.md
@@ -1,3 +1,6 @@
+### 2.0.2 (Build 29)
+精选冬日装扮。
+
 ### 2.0.1 (Build 28)
 1. 精选秋日装扮；
 2. bug修复。

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.xw.project.gracefulmovies"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 28
-        versionName "2.0.1"
+        versionCode 29
+        versionName "2.0.2"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -113,7 +113,7 @@ dependencies {
         exclude group: 'org.androidannotations'
     }
     compile 'com.xw.repo:bubbleseekbar:3.8@aar'
-    compile 'com.github.woxingxiao:VectorCompatTextView:1.6'
+    compile 'com.github.woxingxiao:VectorCompatTextView:2.5'
     compile 'com.flaviofaria:kenburnsview:1.0.7'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     compile('com.yarolegovich:discrete-scrollview:1.3.0') {

diff --git a/app/src/main/java/com/xw/project/gracefulmovies/view/activity/SplashActivity.java b/app/src/main/java/com/xw/project/gracefulmovies/view/activity/SplashActivity.java
@@ -71,7 +71,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         RandomTransitionGenerator generator = new RandomTransitionGenerator(20000, new LinearInterpolator());
         mBgImg.setTransitionGenerator(generator);
-        Glide.with(this).load(R.drawable.pic_bg_fall).into(mBgImg);
+        Glide.with(this).load(R.drawable.pic_bg_main).into(mBgImg);
         mRootLayout.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
             @Override
             public void onLayoutChange(View view, int i, int i1, int i2, int i3, int i4, int i5, int i6, int i7) {
@@ -137,8 +137,8 @@ public void run() {
                 Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
 
                 Colorful.defaults()
-                        .primaryColor(Colorful.ThemeColor.DEEP_ORANGE)
-                        .accentColor(Colorful.ThemeColor.LIGHT_BLUE)
+                        .primaryColor(Colorful.ThemeColor.RED)
+                        .accentColor(Colorful.ThemeColor.AMBER)
                         .translucent(false)
                         .night(false);
                 Colorful.init(getApplicationContext());

diff --git a/app/src/main/java/com/xw/project/gracefulmovies/view/adapter/MovieListAdapter.java b/app/src/main/java/com/xw/project/gracefulmovies/view/adapter/MovieListAdapter.java
@@ -48,8 +48,8 @@ protected void onBind(final MovieVH holder, int position) {
         holder.mNameText.setAlpha(position == 0 ? 1 : 0);
         Glide.with(mContext)
                 .load(model.getPoster())
-                .placeholder(R.drawable.pic_bg_fall)
-                .error(R.drawable.pic_bg_fall)
+                .placeholder(R.drawable.pic_place_holder)
+                .error(R.drawable.pic_place_holder)
                 .into(holder.mPosterImg);
         holder.tagContainer.setTagData(model.getMovieTypeList(),
                 Colorful.getThemeDelegate().getAccentColor().getColorRes());

diff --git a/app/src/main/java/com/xw/project/gracefulmovies/view/fragment/MovieListFragment.java b/app/src/main/java/com/xw/project/gracefulmovies/view/fragment/MovieListFragment.java
@@ -76,7 +76,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
 
         mBlurTransformation = new BlurTransformation(getActivity(), 10);
         mBgImg1.setAlpha(0f);
-        mBgImg2.setImageResource(R.drawable.pic_bg_fall);
+        mBgImg2.setImageResource(R.drawable.pic_bg_main);
 
         return view;
     }
@@ -140,8 +140,8 @@ private void displayBgImage(int index, ImageView imageView) {
             Glide.with(activity)
                     .load(mMovieModels.get(index).getPoster())
                     .transform(mBlurTransformation)
-                    .placeholder(R.drawable.pic_bg_fall)
-                    .error(R.drawable.pic_bg_fall)
+                    .placeholder(R.drawable.pic_bg_main)
+                    .error(R.drawable.pic_bg_main)
                     .crossFade()
                     .into(imageView);
         }

diff --git a/app/src/main/res/drawable/pic_bg_fall.webp b/app/src/main/res/drawable/pic_bg_fall.webp
diff --git a/app/src/main/res/drawable/pic_bg_main.webp b/app/src/main/res/drawable/pic_bg_main.webp
diff --git a/app/src/main/res/drawable/pic_place_holder.webp b/app/src/main/res/drawable/pic_place_holder.webp
diff --git a/app/src/main/res/drawable/pic_red_leaves.webp b/app/src/main/res/drawable/pic_red_leaves.webp
diff --git a/app/src/main/res/drawable/svg_ic_movie.xml b/app/src/main/res/drawable/svg_ic_movie.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="1024.0"
         android:viewportWidth="1024.0">
     <path
-        android:fillColor="#03A9F4"
+        android:fillColor="#F44336"
         android:pathData="M512,107.5c-223.4,0 -404.5,181.1 -404.5,404.5s181.1,404.5 404.5,404.5 404.5,-181.1 404.5,-404.5S735.4,107.5 512,107.5zM289.6,608.7c-53.9,-0.2 -97.4,-44.1 -97.2,-98 0.2,-53.9 44.1,-97.4 98,-97.2 53.9,0.2 97.4,44.1 97.2,98S343.4,608.9 289.6,608.7zM510.7,831.6c-53.9,-0.2 -97.4,-44.1 -97.2,-98 0.2,-53.9 44.1,-97.4 98,-97.2s97.4,44.1 97.2,98C608.4,788.3 564.6,831.8 510.7,831.6zM469.3,512c0,-23.6 19.1,-42.7 42.7,-42.7s42.7,19.1 42.7,42.7 -19.1,42.7 -42.7,42.7S469.3,535.6 469.3,512zM512.5,387.6c-53.9,-0.2 -97.4,-44.1 -97.2,-98 0.2,-53.9 44.1,-97.4 98,-97.2 53.9,0.2 97.4,44.1 97.2,98C610.3,344.2 566.4,387.8 512.5,387.6zM733.6,610.5c-53.9,-0.2 -97.4,-44.1 -97.2,-98s44.1,-97.4 98,-97.2c53.9,0.2 97.4,44.1 97.2,98C831.4,567.2 787.5,610.7 733.6,610.5z"/>
 </vector>
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="fitCenter"
-        tools:src="@drawable/pic_bg_fall"/>
+        tools:src="@drawable/pic_bg_main"/>
 
     <TextView
         android:id="@+id/splash_app_name_text"

diff --git a/app/src/main/res/layout/item_movie.xml b/app/src/main/res/layout/item_movie.xml
@@ -21,7 +21,7 @@
             android:layout_height="match_parent"
             android:contentDescription="@null"
             android:scaleType="centerCrop"
-            tools:src="@drawable/pic_red_leaves"/>
+            tools:src="@drawable/pic_place_holder"/>
     </android.support.v7.widget.CardView>
 
     <com.xw.project.gracefulmovies.view.widget.AutoFitSizeTextView
@@ -100,4 +100,4 @@
             android:textSize="@dimen/text_size_12sp"
             tools:text="主演：xxx，xxx"/>
     </LinearLayout>
-</LinearLayout>
+</LinearLayout>