convert webp & fix bug

yuxinabc · Mar 12, 2017 · e3a8996 · e3a8996
1 parent dc9406c
commit e3a8996
Show file tree

Hide file tree

Showing 97 changed files with 13 additions and 113 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'realm-android'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "24.0.1"
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         applicationId "com.codeest.geeknews"

diff --git a/app/src/main/java/com/codeest/geeknews/app/App.java b/app/src/main/java/com/codeest/geeknews/app/App.java
@@ -14,7 +14,6 @@
 import com.codeest.geeknews.di.component.DaggerAppComponent;
 import com.codeest.geeknews.di.module.AppModule;
 import com.codeest.geeknews.di.module.HttpModule;
-import com.codeest.geeknews.di.module.PageModule;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -105,7 +104,6 @@ public static AppComponent getAppComponent(){
             appComponent = DaggerAppComponent.builder()
                     .appModule(new AppModule(instance))
                     .httpModule(new HttpModule())
-                    .pageModule(new PageModule())
                     .build();
         }
         return appComponent;

diff --git a/app/src/main/java/com/codeest/geeknews/di/component/AppComponent.java b/app/src/main/java/com/codeest/geeknews/di/component/AppComponent.java
@@ -3,17 +3,8 @@
 import com.codeest.geeknews.app.App;
 import com.codeest.geeknews.di.module.AppModule;
 import com.codeest.geeknews.di.module.HttpModule;
-import com.codeest.geeknews.di.module.PageModule;
 import com.codeest.geeknews.model.db.RealmHelper;
 import com.codeest.geeknews.model.http.RetrofitHelper;
-import com.codeest.geeknews.ui.gank.fragment.GankMainFragment;
-import com.codeest.geeknews.ui.gold.fragment.GoldMainFragment;
-import com.codeest.geeknews.ui.main.fragment.AboutFragment;
-import com.codeest.geeknews.ui.main.fragment.LikeFragment;
-import com.codeest.geeknews.ui.main.fragment.SettingFragment;
-import com.codeest.geeknews.ui.vtex.fragment.VtexMainFragment;
-import com.codeest.geeknews.ui.wechat.fragment.WechatMainFragment;
-import com.codeest.geeknews.ui.zhihu.fragment.ZhihuMainFragment;
 
 import javax.inject.Singleton;
 
@@ -24,28 +15,12 @@
  */
 
 @Singleton
-@Component(modules = {AppModule.class, HttpModule.class, PageModule.class})
+@Component(modules = {AppModule.class, HttpModule.class})
 public interface AppComponent {
 
     App getContext();  // 提供App的Context
 
     RetrofitHelper retrofitHelper();  //提供http的帮助类
 
     RealmHelper realmHelper();    //提供数据库帮助类
-
-    ZhihuMainFragment zhihuMainFragment();
-
-    GankMainFragment gankMainFragment();
-
-    WechatMainFragment wechatMainFragment();
-
-    GoldMainFragment goldMainFragment();
-
-    VtexMainFragment vtexMainFragment();
-
-    LikeFragment likeFragment();
-
-    SettingFragment settingFragment();
-
-    AboutFragment aboutFragment();
 }
diff --git a/app/src/main/java/com/codeest/geeknews/di/module/PageModule.java b/app/src/main/java/com/codeest/geeknews/di/module/PageModule.java
diff --git a/app/src/main/java/com/codeest/geeknews/ui/main/activity/MainActivity.java b/app/src/main/java/com/codeest/geeknews/ui/main/activity/MainActivity.java
@@ -36,8 +36,6 @@
 import com.miguelcatalan.materialsearchview.MaterialSearchView;
 import com.tbruyelle.rxpermissions.RxPermissions;
 
-import javax.inject.Inject;
-
 import butterknife.BindView;
 import me.yokeyword.fragmentation.SupportFragment;
 
@@ -56,21 +54,13 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon
     @BindView(R.id.view_search)
     MaterialSearchView mSearchView;
 
-    @Inject
     ZhihuMainFragment mZhihuFragment;
-    @Inject
     GankMainFragment mGankFragment;
-    @Inject
     WechatMainFragment mWechatFragment;
-    @Inject
     GoldMainFragment mGoldFragment;
-    @Inject
     VtexMainFragment mVtexFragment;
-    @Inject
     LikeFragment mLikeFragment;
-    @Inject
     SettingFragment mSettingFragment;
-    @Inject
     AboutFragment mAboutFragment;
 
     MenuItem mLastMenuItem;
@@ -112,6 +102,14 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
     @Override
     protected void initEventAndData() {
         setToolBar(mToolbar,"知乎日报");
+        mZhihuFragment = new ZhihuMainFragment();
+        mGankFragment = new GankMainFragment();
+        mWechatFragment = new WechatMainFragment();
+        mGoldFragment = new GoldMainFragment();
+        mVtexFragment = new VtexMainFragment();
+        mLikeFragment = new LikeFragment();
+        mSettingFragment = new SettingFragment();
+        mAboutFragment = new AboutFragment();
         mDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout, mToolbar, R.string.drawer_open, R.string.drawer_close);
         mDrawerToggle.syncState();
         mDrawerLayout.addDrawerListener(mDrawerToggle);

diff --git a/app/src/main/res/mipmap-night-xxhdpi/ic_cache.png b/app/src/main/res/mipmap-night-xxhdpi/ic_cache.png
diff --git a/app/src/main/res/mipmap-night-xxhdpi/ic_cache.webp b/app/src/main/res/mipmap-night-xxhdpi/ic_cache.webp
diff --git a/app/src/main/res/mipmap-night-xxhdpi/ic_clear.png b/app/src/main/res/mipmap-night-xxhdpi/ic_clear.png
diff --git a/app/src/main/res/mipmap-night-xxhdpi/ic_clear.webp b/app/src/main/res/mipmap-night-xxhdpi/ic_clear.webp
diff --git a/app/src/main/res/mipmap-night-xxhdpi/ic_feedback.png b/app/src/main/res/mipmap-night-xxhdpi/ic_feedback.png
diff --git a/app/src/main/res/mipmap-night-xxhdpi/ic_feedback.webp b/app/src/main/res/mipmap-night-xxhdpi/ic_feedback.webp
diff --git a/app/src/main/res/mipmap-night-xxhdpi/ic_hot.png b/app/src/main/res/mipmap-night-xxhdpi/ic_hot.png
diff --git a/app/src/main/res/mipmap-night-xxhdpi/ic_hot.webp b/app/src/main/res/mipmap-night-xxhdpi/ic_hot.webp
diff --git a/app/src/main/res/mipmap-night-xxhdpi/ic_image.png b/app/src/main/res/mipmap-night-xxhdpi/ic_image.png
diff --git a/app/src/main/res/mipmap-night-xxhdpi/ic_image.webp b/app/src/main/res/mipmap-night-xxhdpi/ic_image.webp
diff --git a/app/src/main/res/mipmap-night-xxhdpi/ic_night.png b/app/src/main/res/mipmap-night-xxhdpi/ic_night.png
diff --git a/app/src/main/res/mipmap-night-xxhdpi/ic_night.webp b/app/src/main/res/mipmap-night-xxhdpi/ic_night.webp
diff --git a/app/src/main/res/mipmap-night-xxhdpi/ic_update.png b/app/src/main/res/mipmap-night-xxhdpi/ic_update.png
diff --git a/app/src/main/res/mipmap-night-xxhdpi/ic_update.webp b/app/src/main/res/mipmap-night-xxhdpi/ic_update.webp
diff --git a/app/src/main/res/mipmap-xhdpi/bg_splash.png b/app/src/main/res/mipmap-xhdpi/bg_splash.png
diff --git a/app/src/main/res/mipmap-xhdpi/bg_splash.webp b/app/src/main/res/mipmap-xhdpi/bg_splash.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/bg_about.png b/app/src/main/res/mipmap-xxhdpi/bg_about.png
diff --git a/app/src/main/res/mipmap-xxhdpi/bg_about.webp b/app/src/main/res/mipmap-xxhdpi/bg_about.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_android.png b/app/src/main/res/mipmap-xxhdpi/ic_android.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_android.webp b/app/src/main/res/mipmap-xxhdpi/ic_android.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_author.png b/app/src/main/res/mipmap-xxhdpi/ic_author.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_author.webp b/app/src/main/res/mipmap-xxhdpi/ic_author.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_cache.png b/app/src/main/res/mipmap-xxhdpi/ic_cache.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_cache.webp b/app/src/main/res/mipmap-xxhdpi/ic_cache.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_clear.png b/app/src/main/res/mipmap-xxhdpi/ic_clear.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_clear.webp b/app/src/main/res/mipmap-xxhdpi/ic_clear.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_close.png b/app/src/main/res/mipmap-xxhdpi/ic_close.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_close.webp b/app/src/main/res/mipmap-xxhdpi/ic_close.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_comment.png b/app/src/main/res/mipmap-xxhdpi/ic_comment.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_comment.webp b/app/src/main/res/mipmap-xxhdpi/ic_comment.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_daily_comment.png b/app/src/main/res/mipmap-xxhdpi/ic_daily_comment.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_daily_comment.webp b/app/src/main/res/mipmap-xxhdpi/ic_daily_comment.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_daily_like.png b/app/src/main/res/mipmap-xxhdpi/ic_daily_like.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_daily_like.webp b/app/src/main/res/mipmap-xxhdpi/ic_daily_like.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_daily_share.png b/app/src/main/res/mipmap-xxhdpi/ic_daily_share.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_daily_share.webp b/app/src/main/res/mipmap-xxhdpi/ic_daily_share.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_drag.png b/app/src/main/res/mipmap-xxhdpi/ic_drag.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_drag.webp b/app/src/main/res/mipmap-xxhdpi/ic_drag.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_drawer_about.png b/app/src/main/res/mipmap-xxhdpi/ic_drawer_about.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_drawer_about.webp b/app/src/main/res/mipmap-xxhdpi/ic_drawer_about.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_drawer_gank.png b/app/src/main/res/mipmap-xxhdpi/ic_drawer_gank.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_drawer_gank.webp b/app/src/main/res/mipmap-xxhdpi/ic_drawer_gank.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_drawer_gold.png b/app/src/main/res/mipmap-xxhdpi/ic_drawer_gold.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_drawer_gold.webp b/app/src/main/res/mipmap-xxhdpi/ic_drawer_gold.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_drawer_like.png b/app/src/main/res/mipmap-xxhdpi/ic_drawer_like.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_drawer_like.webp b/app/src/main/res/mipmap-xxhdpi/ic_drawer_like.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_drawer_setting.png b/app/src/main/res/mipmap-xxhdpi/ic_drawer_setting.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_drawer_setting.webp b/app/src/main/res/mipmap-xxhdpi/ic_drawer_setting.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_drawer_vtex.png b/app/src/main/res/mipmap-xxhdpi/ic_drawer_vtex.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_drawer_vtex.webp b/app/src/main/res/mipmap-xxhdpi/ic_drawer_vtex.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_drawer_wechat.png b/app/src/main/res/mipmap-xxhdpi/ic_drawer_wechat.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_drawer_wechat.webp b/app/src/main/res/mipmap-xxhdpi/ic_drawer_wechat.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_drawer_zhihu.png b/app/src/main/res/mipmap-xxhdpi/ic_drawer_zhihu.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_drawer_zhihu.webp b/app/src/main/res/mipmap-xxhdpi/ic_drawer_zhihu.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_fab_calendar.png b/app/src/main/res/mipmap-xxhdpi/ic_fab_calendar.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_fab_calendar.webp b/app/src/main/res/mipmap-xxhdpi/ic_fab_calendar.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_feedback.png b/app/src/main/res/mipmap-xxhdpi/ic_feedback.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_feedback.webp b/app/src/main/res/mipmap-xxhdpi/ic_feedback.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_gold_author.png b/app/src/main/res/mipmap-xxhdpi/ic_gold_author.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_gold_author.webp b/app/src/main/res/mipmap-xxhdpi/ic_gold_author.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_gold_like.png b/app/src/main/res/mipmap-xxhdpi/ic_gold_like.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_gold_like.webp b/app/src/main/res/mipmap-xxhdpi/ic_gold_like.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_gold_time.png b/app/src/main/res/mipmap-xxhdpi/ic_gold_time.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_gold_time.webp b/app/src/main/res/mipmap-xxhdpi/ic_gold_time.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_hot.png b/app/src/main/res/mipmap-xxhdpi/ic_hot.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_hot.webp b/app/src/main/res/mipmap-xxhdpi/ic_hot.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_image.png b/app/src/main/res/mipmap-xxhdpi/ic_image.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_image.webp b/app/src/main/res/mipmap-xxhdpi/ic_image.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_ios.png b/app/src/main/res/mipmap-xxhdpi/ic_ios.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_ios.webp b/app/src/main/res/mipmap-xxhdpi/ic_ios.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_menu.png b/app/src/main/res/mipmap-xxhdpi/ic_menu.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_menu.webp b/app/src/main/res/mipmap-xxhdpi/ic_menu.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_night.png b/app/src/main/res/mipmap-xxhdpi/ic_night.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_night.webp b/app/src/main/res/mipmap-xxhdpi/ic_night.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_time.png b/app/src/main/res/mipmap-xxhdpi/ic_time.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_time.webp b/app/src/main/res/mipmap-xxhdpi/ic_time.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_toolbar_copy.png b/app/src/main/res/mipmap-xxhdpi/ic_toolbar_copy.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_toolbar_copy.webp b/app/src/main/res/mipmap-xxhdpi/ic_toolbar_copy.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_toolbar_like_n.png b/app/src/main/res/mipmap-xxhdpi/ic_toolbar_like_n.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_toolbar_like_n.webp b/app/src/main/res/mipmap-xxhdpi/ic_toolbar_like_n.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_toolbar_like_p.png b/app/src/main/res/mipmap-xxhdpi/ic_toolbar_like_p.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_toolbar_like_p.webp b/app/src/main/res/mipmap-xxhdpi/ic_toolbar_like_p.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_toolbar_save.png b/app/src/main/res/mipmap-xxhdpi/ic_toolbar_save.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_toolbar_save.webp b/app/src/main/res/mipmap-xxhdpi/ic_toolbar_save.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_toolbar_share.png b/app/src/main/res/mipmap-xxhdpi/ic_toolbar_share.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_toolbar_share.webp b/app/src/main/res/mipmap-xxhdpi/ic_toolbar_share.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_update.png b/app/src/main/res/mipmap-xxhdpi/ic_update.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_update.webp b/app/src/main/res/mipmap-xxhdpi/ic_update.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_web.png b/app/src/main/res/mipmap-xxhdpi/ic_web.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_web.webp b/app/src/main/res/mipmap-xxhdpi/ic_web.webp
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath "io.realm:realm-gradle-plugin:1.1.1"
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Sun Mar 12 23:28:39 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip