首页重构

app/build.gradle

@@ -58,6 +58,7 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.google.code.findbugs'

app/src/main/AndroidManifest.xml

@@ -9,6 +9,7 @@
     <application
         android:name=".general.App"
         android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/DayTheme">

app/src/main/java/me/ghui/v2er/general/Navigator.java

@@ -5,11 +5,17 @@
 import android.content.Context;
 import android.content.Intent;
 import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.util.Pair;
+
 import android.view.View;
 
 import java.io.Serializable;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
 
 
 /**
@@ -75,6 +81,23 @@ public Navigator addFlag(int flag) {
         return this;
     }
 
+    public Navigator shareElement(View... sourceViews) {
+        Pair<View, String>[] sharedElements;
+        List<View> sourceViewList = new ArrayList<>(sourceViews.length);
+        Collections.addAll(sourceViewList, sourceViews);
+        sourceViewList.removeIf(sourceView -> sourceView.getTransitionName() == null || sourceView.getTransitionName().isEmpty());
+        sharedElements = new Pair[sourceViewList.size()];
+        for (int i = 0; i < sourceViewList.size(); i++) {
+            sharedElements[i] = new Pair<>(sourceViewList.get(i),
+                    sourceViewList.get(i).getTransitionName());
+        }
+        if (sharedElements.length > 0) {
+            mOptionsCompat = ActivityOptionsCompat.
+                    makeSceneTransitionAnimation((Activity) mFrom.get(), sharedElements);
+        }
+        return this;
+    }
+
     public Navigator shareElement(View sourceView) {
         if (sourceView != null && sourceView.getTransitionName() != null) {
             mOptionsCompat = ActivityOptionsCompat.

app/src/main/java/me/ghui/v2er/general/PageHost.java

@@ -8,6 +8,7 @@
 import me.ghui.v2er.module.settings.ContactFragment;
 import me.ghui.v2er.module.settings.SettingFragment;
 import me.ghui.v2er.util.Utils;
+import me.ghui.v2er.widget.BaseToolBar;
 
 public class PageHost extends BaseActivity {
     public static final String PAGE_ID = "PageHost.pageId";
@@ -21,7 +22,6 @@ protected int attachLayoutRes() {
     @Override
     protected void init() {
         super.init();
-        Utils.setPaddingForStatusBar(mRootView);
         mPage = (Page) getIntent().getSerializableExtra(PAGE_ID);
         if (mPage == null) {
             throw new RuntimeException("wrong page id");
@@ -38,6 +38,14 @@ public void reloadMode(int mode) {
                 .reload();
     }
 
+    @Override
+    protected void configToolBar(BaseToolBar toolBar) {
+        super.configToolBar(toolBar);
+        if (toolBar != null) {
+            toolBar.displayHomeAsUpButton(this);
+        }
+    }
+
     private Fragment getFragment(Page pageID) {
         Fragment fragment;
         String title;

app/src/main/java/me/ghui/v2er/helper/BottomNavigationViewHelper.java

@@ -0,0 +1,31 @@
+package me.ghui.v2er.helper;
+
+import android.widget.ImageView;
+
+import com.google.android.material.bottomnavigation.BottomNavigationItemView;
+import com.google.android.material.bottomnavigation.BottomNavigationMenuView;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+
+public class BottomNavigationViewHelper {
+
+    /**
+     * 设置图片尺寸
+     * @param view
+     * @param width
+     * @param height
+     */
+    public static void setImageSize(BottomNavigationView view, int width, int height) {
+        BottomNavigationMenuView menuView = (BottomNavigationMenuView) view.getChildAt(0);
+        try {
+            for (int i = 0; i < menuView.getChildCount(); i++) {
+                BottomNavigationItemView item = (BottomNavigationItemView) menuView.getChildAt(i);
+                ImageView imageView = item.findViewById(com.google.android.material.R.id.icon);
+                imageView.getLayoutParams().width = width;
+                imageView.getLayoutParams().height = height;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}

app/src/main/java/me/ghui/v2er/injector/component/MineComponent.java

@@ -0,0 +1,12 @@
+package me.ghui.v2er.injector.component;
+
+import dagger.Component;
+import me.ghui.v2er.injector.module.MineModule;
+import me.ghui.v2er.injector.scope.PerFragment;
+import me.ghui.v2er.module.home.MineFragment;
+
+@PerFragment
+@Component(dependencies = AppComponent.class, modules = MineModule.class)
+public interface MineComponent {
+    void inject(MineFragment fragment);
+}

app/src/main/java/me/ghui/v2er/injector/module/MineModule.java

@@ -0,0 +1,29 @@
+package me.ghui.v2er.injector.module;
+
+import dagger.Module;
+import dagger.Provides;
+import me.ghui.v2er.adapter.base.MultiItemTypeAdapter;
+import me.ghui.v2er.injector.scope.PerFragment;
+import me.ghui.v2er.module.home.MineContract;
+import me.ghui.v2er.module.home.MineFragment;
+import me.ghui.v2er.module.home.MinePresenter;
+import me.ghui.v2er.module.home.MsgContract;
+import me.ghui.v2er.module.home.MsgPresenter;
+import me.ghui.v2er.network.bean.UserPageInfo;
+
+@Module
+public class MineModule {
+
+    private MineFragment mView;
+
+    public MineModule(MineFragment mView) {
+        this.mView = mView;
+    }
+
+    @PerFragment
+    @Provides
+    public MineContract.IPresenter providePresenter() {
+        return new MinePresenter(mView);
+    }
+
+}

app/src/main/java/me/ghui/v2er/module/append/AppendTopicActivity.java

@@ -67,8 +67,6 @@ protected void configToolBar(BaseToolBar toolBar) {
         super.configToolBar(toolBar);
         //设置右上角的填充菜单
         toolBar.inflateMenu(R.menu.append_topic_menu);
-        Utils.setPaddingForStatusBar(toolBar);
-        Utils.setPaddingForNavbar(mRootView);
         toolBar.setOnMenuItemClickListener(item -> {
             String content = mContentET.getText().toString();
             if (Check.isEmpty(content)) {

app/src/main/java/me/ghui/v2er/module/base/BaseActivity.java

@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Color;
 import android.os.Bundle;
 
 import androidx.annotation.CallSuper;
@@ -12,6 +13,7 @@
 
 import com.google.android.material.appbar.AppBarLayout;
 
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import androidx.appcompat.app.AppCompatActivity;
@@ -24,14 +26,18 @@
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.widget.FrameLayout;
+import android.widget.ImageButton;
 import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toolbar;
 
 import com.r0adkll.slidr.model.SlidrInterface;
 import com.trello.rxlifecycle2.LifecycleTransformer;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.lang.reflect.Field;
 import java.util.Stack;
 
 import javax.inject.Inject;
@@ -87,7 +93,7 @@ public abstract class BaseActivity<T extends BaseContract.IPresenter> extends Rx
     @Nullable
     protected SlidrInterface mSlidrInterface;
     protected DayNightModeEvent mDayNightModeEvent;
-
+    private boolean displayStatusBarArea = true;
 
     protected static String KEY(String key) {
         return Utils.KEY(key);
@@ -105,6 +111,16 @@ public void setFirstLoadingDelay(long delay) {
     @LayoutRes
     protected abstract int attachLayoutRes();
 
+
+    /**
+     * 显示状态栏区域
+     * 在attachToolbar调用，或者之前
+     * @param displayStatusBarArea
+     */
+    public void displayStatusBarArea(boolean displayStatusBarArea) {
+        this.displayStatusBarArea = displayStatusBarArea;
+    }
+
     /**
      * Set a default Toolbar, if you don't want certain page to have a toolbar,
      * just return null;
@@ -343,6 +359,26 @@ protected void autoLoad() {
         }
     }
 
+    /**
+     * 查找Appbar
+     * @param viewGroup
+     */
+    private void findAppbar(ViewGroup viewGroup) {
+        if (viewGroup instanceof BaseToolBar) {
+            mToolbar = (BaseToolBar) viewGroup;
+        } else {
+            int childCount = viewGroup.getChildCount();
+            for (int i = 0; i < childCount; i++) {
+                View childView = viewGroup.getChildAt(i);
+                if (childView instanceof ViewGroup) {
+                    findAppbar((ViewGroup) childView);
+                } else {
+                    continue;
+                }
+            }
+        }
+    }
+
     protected ViewGroup onCreateRootView() {
         if ((mToolbar = attachToolbar()) != null) {
             LinearLayout rootView = new LinearLayout(this);
@@ -377,6 +413,15 @@ protected ViewGroup onCreateRootView() {
         mRootView.setId(R.id.act_root_view_framelayout);
         mRootView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
         mRootView.addView(mContentView, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        if (displayStatusBarArea) {
+            mRootView.setFitsSystemWindows(true);
+        } else {
+            mRootView.setFitsSystemWindows(false);
+            findAppbar(mRootView);
+            if (mToolbar != null) {
+                Utils.setPaddingForStatusBar(mToolbar);
+            }
+        }
         mRootView.setBackgroundColor(pageColor());
         return mRootView;
     }

app/src/main/java/me/ghui/v2er/module/create/CreateTopicActivity.java

@@ -107,8 +107,7 @@ protected void configToolBar(BaseToolBar toolBar) {
         super.configToolBar(toolBar);
         toolBar.inflateMenu(R.menu.post_topic_menu);//设置右上角的填充菜单
         toolBar.setOnMenuItemClickListener(this);
-        Utils.setPaddingForStatusBar(toolBar);
-        Utils.setPaddingForNavbar(mRootView);
+        toolBar.displayHomeAsUpButton(this);
     }
 
     @Override

app/src/main/java/me/ghui/v2er/module/drawer/care/SpecialCareActivity.java

@@ -55,7 +55,7 @@ protected void startInject() {
     @Override
     protected void configToolBar(BaseToolBar toolBar) {
         super.configToolBar(toolBar);
-        Utils.setPaddingForStatusBar(toolBar);
+        toolBar.displayHomeAsUpButton(this);
     }
 
     @Override

app/src/main/java/me/ghui/v2er/module/drawer/dailyhot/DailyHotActivity.java

@@ -62,7 +62,6 @@ protected SwipeRefreshLayout.OnRefreshListener attachOnRefreshListener() {
     @Override
     protected void configToolBar(BaseToolBar toolBar) {
         super.configToolBar(toolBar);
-        Utils.setPaddingForStatusBar(toolBar);
     }
 
     @Override

app/src/main/java/me/ghui/v2er/module/drawer/star/StarActivity.java

@@ -67,13 +67,12 @@ protected int attachLayoutRes() {
 
     protected void configToolBar() {
         mToolbar.setTitle(getTitle());
-        mToolbar.setElevation(0);
+        mToolbar.displayHomeAsUpButton(this);
         mToolbar.setOnDoubleTapListener(this);
         mToolbar.setNavigationOnClickListener(view -> {
             if (isTaskRoot()) finishToHome();
             else onBackPressed();
         });
-        Utils.setPaddingForStatusBar(mToolbar);
     }
 
     @Override

app/src/main/java/me/ghui/v2er/module/gallery/GalleryActivity.java

@@ -86,7 +86,6 @@ protected BaseToolBar attachToolbar() {
 
     @Override
     protected void init() {
-        Utils.setPaddingForStatusBar(mToolBar);
         mToolBar.inflateMenu(R.menu.gallery_toolbar_menu);
         mToolBar.setOverflowIcon(getDrawable(R.drawable.ic_more_vert_white));
         mToolBar.setOnMenuItemClickListener(this);

app/src/main/java/me/ghui/v2er/module/general/WapActivity.java

@@ -88,7 +88,6 @@ protected void configWebView(WebSettings settings) {
     @Override
     protected void configToolBar(BaseToolBar toolBar) {
         super.configToolBar(toolBar);
-        Utils.setPaddingForStatusBar(toolBar);
         mToolbar.inflateMenu(R.menu.wapview_menu);
         mToolbar.setOnMenuItemClickListener(menuItem -> {
             switch (menuItem.getItemId()) {