支持查看最新作品

h4ckm310n · Nov 12, 2019 · 6231e68 · 6231e68
1 parent 389d137
commit 6231e68
Show file tree

Hide file tree

Showing 66 changed files with 479 additions and 285 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -45,7 +45,7 @@
         </activity>
         <activity android:name=".activities.ViewPagerActivity" />
         <activity
-            android:name=".activities.TemplateFragmentActivity"
+            android:name=".activities.TemplateActivity"
             android:windowSoftInputMode="adjustPan" />
         <activity android:name=".activities.RankActivity" />
         <activity android:name=".activities.DownloadManageActivity" />

diff --git a/app/src/main/java/ceui/lisa/activities/BaseActivity.java b/app/src/main/java/ceui/lisa/activities/BaseActivity.java
@@ -6,7 +6,6 @@
 import android.os.Bundle;
 import android.view.View;
 
-import androidx.annotation.LayoutRes;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.databinding.DataBindingUtil;

diff --git a/app/src/main/java/ceui/lisa/activities/CollectionActivity.java b/app/src/main/java/ceui/lisa/activities/CollectionActivity.java
@@ -5,33 +5,31 @@
 import android.view.MenuItem;
 
 import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
 import com.ToxicBakery.viewpager.transforms.DrawerTransformer;
-import com.google.android.material.tabs.TabLayout;
 
 import ceui.lisa.R;
-import ceui.lisa.databinding.ActivityDownloadManageBinding;
+import ceui.lisa.databinding.ViewpagerWithTablayoutBinding;
 import ceui.lisa.fragments.FragmentFollowUser;
 import ceui.lisa.fragments.FragmentLikeIllust;
 
 import static ceui.lisa.activities.Shaft.sUserModel;
 
-public class CollectionActivity extends BaseActivity<ActivityDownloadManageBinding> {
+public class CollectionActivity extends BaseActivity<ViewpagerWithTablayoutBinding> {
 
     private static final String[] CHINESE_TITLES = new String[]{
-            Shaft.getContext().getString(R.string.public_like_illust), 
-            Shaft.getContext().getString(R.string.private_like_illust), 
-            Shaft.getContext().getString(R.string.public_like_user), 
+            Shaft.getContext().getString(R.string.public_like_illust),
+            Shaft.getContext().getString(R.string.private_like_illust),
+            Shaft.getContext().getString(R.string.public_like_user),
             Shaft.getContext().getString(R.string.private_like_user)};
     private Fragment[] allPages;
 
     @Override
     protected int initLayout() {
-        return R.layout.activity_download_manage;
+        return R.layout.viewpager_with_tablayout;
     }
 
     @Override
@@ -111,17 +109,17 @@ public boolean onCreateOptionsMenu(Menu menu) {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (baseBind.viewPager.getCurrentItem() == 0) {
-            Intent intent = new Intent(mContext, TemplateFragmentActivity.class);
-            intent.putExtra(TemplateFragmentActivity.EXTRA_KEYWORD,
+            Intent intent = new Intent(mContext, TemplateActivity.class);
+            intent.putExtra(TemplateActivity.EXTRA_KEYWORD,
                     FragmentLikeIllust.TYPE_PUBLUC);
-            intent.putExtra(TemplateFragmentActivity.EXTRA_FRAGMENT,
+            intent.putExtra(TemplateActivity.EXTRA_FRAGMENT,
                     mContext.getString(R.string.filter_by_bookmark));
             startActivity(intent);
         } else if (baseBind.viewPager.getCurrentItem() == 1) {
-            Intent intent = new Intent(mContext, TemplateFragmentActivity.class);
-            intent.putExtra(TemplateFragmentActivity.EXTRA_KEYWORD,
+            Intent intent = new Intent(mContext, TemplateActivity.class);
+            intent.putExtra(TemplateActivity.EXTRA_KEYWORD,
                     FragmentLikeIllust.TYPE_PRIVATE);
-            intent.putExtra(TemplateFragmentActivity.EXTRA_FRAGMENT,
+            intent.putExtra(TemplateActivity.EXTRA_FRAGMENT,
                     mContext.getString(R.string.filter_by_bookmark));
             startActivity(intent);
         }

diff --git a/app/src/main/java/ceui/lisa/activities/CoverActivity.java b/app/src/main/java/ceui/lisa/activities/CoverActivity.java
@@ -45,6 +45,7 @@
 import ceui.lisa.utils.Dev;
 import ceui.lisa.utils.GlideUtil;
 import ceui.lisa.utils.Local;
+import ceui.lisa.utils.Params;
 import ceui.lisa.utils.ReverseImage;
 import ceui.lisa.utils.ReverseWebviewCallback;
 import io.reactivex.disposables.Disposable;
@@ -99,7 +100,7 @@ protected void initView() {
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent(mContext, UActivity.class);
-                intent.putExtra("user id", sUserModel.getResponse().getUser().getId());
+                intent.putExtra(Params.USER_ID, sUserModel.getResponse().getUser().getId());
                 startActivity(intent);
             }
         });
@@ -185,25 +186,25 @@ public boolean onNavigationItemSelected(MenuItem item) {
             Intent intent = new Intent(mContext, DownloadManageActivity.class);
             startActivity(intent);
         } else if (id == R.id.nav_slideshow) {
-            Intent intent = new Intent(mContext, TemplateFragmentActivity.class);
-            intent.putExtra(TemplateFragmentActivity.EXTRA_FRAGMENT,
+            Intent intent = new Intent(mContext, TemplateActivity.class);
+            intent.putExtra(TemplateActivity.EXTRA_FRAGMENT,
                     mContext.getString(R.string.view_history));
             startActivity(intent);
         } else if (id == R.id.nav_manage) {
-            Intent intent = new Intent(mContext, TemplateFragmentActivity.class);
-            intent.putExtra(TemplateFragmentActivity.EXTRA_FRAGMENT,
+            Intent intent = new Intent(mContext, TemplateActivity.class);
+            intent.putExtra(TemplateActivity.EXTRA_FRAGMENT,
                     mContext.getString(R.string.app_settings));
             startActivity(intent);
         } else if (id == R.id.nav_share) {
-            Intent intent = new Intent(mContext, TemplateFragmentActivity.class);
-            intent.putExtra(TemplateFragmentActivity.EXTRA_FRAGMENT,
+            Intent intent = new Intent(mContext, TemplateActivity.class);
+            intent.putExtra(TemplateActivity.EXTRA_FRAGMENT,
                     mContext.getString(R.string.full_about_app));
             startActivity(intent);
 
         } else if (id == R.id.main_page) {
             Intent intent;
             intent = new Intent(mContext, UActivity.class);
-            intent.putExtra("user id", sUserModel.getResponse().getUser().getId());
+            intent.putExtra(Params.USER_ID, sUserModel.getResponse().getUser().getId());
             startActivity(intent);
 
         } else if (id == R.id.nav_reverse) {
@@ -218,12 +219,17 @@ public boolean onNavigationItemSelected(MenuItem item) {
 
         } else if (id == R.id.nav_send) {
 
-            Intent intent = new Intent(mContext, TemplateFragmentActivity.class);
-            intent.putExtra(TemplateFragmentActivity.EXTRA_FRAGMENT, "画廊");
+            Intent intent = new Intent(mContext, TemplateActivity.class);
+            intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "画廊");
             startActivity(intent);
         } else if (id == R.id.web_test) {
-            Intent intent = new Intent(mContext, TemplateFragmentActivity.class);
-            intent.putExtra(TemplateFragmentActivity.EXTRA_FRAGMENT, "一言");
+            Intent intent = new Intent(mContext, TemplateActivity.class);
+            intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "一言");
+            startActivity(intent);
+        } else if (id == R.id.nav_new_work) {
+            Intent intent = new Intent(mContext, TemplateActivity.class);
+            intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "最新作品");
+            intent.putExtra("hideStatusBar", false);
             startActivity(intent);
         }
 
@@ -301,7 +307,7 @@ public void onClick(DialogInterface dialog, int which) {
     @Override
     protected void onResume() {
         super.onResume();
-        if(Dev.refreshUser) {
+        if (Dev.refreshUser) {
             initDrawerHeader();
             Dev.refreshUser = false;
         }

diff --git a/app/src/main/java/ceui/lisa/activities/DownloadManageActivity.java b/app/src/main/java/ceui/lisa/activities/DownloadManageActivity.java
@@ -6,23 +6,21 @@
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
 import com.ToxicBakery.viewpager.transforms.DrawerTransformer;
-import com.google.android.material.tabs.TabLayout;
 
 import ceui.lisa.R;
 import ceui.lisa.database.AppDatabase;
-import ceui.lisa.databinding.ActivityDownloadManageBinding;
+import ceui.lisa.databinding.ViewpagerWithTablayoutBinding;
 import ceui.lisa.fragments.BaseFragment;
 import ceui.lisa.fragments.FragmentDownloadFinish;
 import ceui.lisa.fragments.FragmentNowDownload;
 import ceui.lisa.utils.Common;
 
-public class DownloadManageActivity extends BaseActivity<ActivityDownloadManageBinding> {
+public class DownloadManageActivity extends BaseActivity<ViewpagerWithTablayoutBinding> {
 
     private static final String[] CHINESE_TITLES = new String[]{
             Shaft.getContext().getString(R.string.now_downloading),
@@ -32,7 +30,7 @@ public class DownloadManageActivity extends BaseActivity<ActivityDownloadManageB
 
     @Override
     protected int initLayout() {
-        return R.layout.activity_download_manage;
+        return R.layout.viewpager_with_tablayout;
     }
 
     @Override

diff --git a/app/src/main/java/ceui/lisa/activities/FragmentActivity.java b/app/src/main/java/ceui/lisa/activities/FragmentActivity.java
@@ -1,9 +1,6 @@
 package ceui.lisa.activities;
 
 
-import android.graphics.Color;
-import android.view.View;
-
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 

diff --git a/app/src/main/java/ceui/lisa/activities/LoginActivity.java b/app/src/main/java/ceui/lisa/activities/LoginActivity.java
@@ -1,7 +1,6 @@
 package ceui.lisa.activities;
 
 import android.content.Intent;
-import android.graphics.Color;
 import android.text.TextUtils;
 import android.view.MenuItem;
 import android.view.View;
@@ -70,8 +69,8 @@ protected void initView() {
             @Override
             public boolean onMenuItemClick(MenuItem item) {
                 if (item.getItemId() == R.id.action_settings) {
-                    Intent intent = new Intent(mContext, TemplateFragmentActivity.class);
-                    intent.putExtra(TemplateFragmentActivity.EXTRA_FRAGMENT, "设置");
+                    Intent intent = new Intent(mContext, TemplateActivity.class);
+                    intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "设置");
                     startActivity(intent);
                     return true;
                 }

diff --git a/app/src/main/java/ceui/lisa/activities/OutWakeActivity.java b/app/src/main/java/ceui/lisa/activities/OutWakeActivity.java
@@ -1,13 +1,12 @@
 package ceui.lisa.activities;
 
 import android.content.Intent;
-import android.graphics.Color;
 import android.net.Uri;
 import android.text.TextUtils;
-import android.view.View;
 
 import ceui.lisa.R;
 import ceui.lisa.interfaces.Callback;
+import ceui.lisa.utils.Params;
 import ceui.lisa.utils.PixivOperate;
 
 public class OutWakeActivity extends BaseActivity {
@@ -53,7 +52,7 @@ public void doSomething(Void t) {
                         String userID = uri.getQueryParameter("id");
                         if (!TextUtils.isEmpty(userID)) {
                             Intent userIntent = new Intent(mContext, UActivity.class);
-                            userIntent.putExtra("user id", Integer.valueOf(userID));
+                            userIntent.putExtra(Params.USER_ID, Integer.valueOf(userID));
                             startActivity(userIntent);
                             finish();
                             return;
@@ -67,7 +66,7 @@ public void doSomething(Void t) {
                             if (host.contains("users")) {
                                 String path = uri.getPath();
                                 Intent userIntent = new Intent(mContext, UActivity.class);
-                                userIntent.putExtra("user id", Integer.valueOf(path.substring(1)));
+                                userIntent.putExtra(Params.USER_ID, Integer.valueOf(path.substring(1)));
                                 startActivity(userIntent);
                                 finish();
                                 return;

diff --git a/app/src/main/java/ceui/lisa/activities/Shaft.java b/app/src/main/java/ceui/lisa/activities/Shaft.java
@@ -3,7 +3,6 @@
 import android.app.Application;
 import android.content.Context;
 
-import com.liulishuo.okdownload.core.dispatcher.DownloadDispatcher;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
 import com.scwang.smartrefresh.layout.header.ClassicsHeader;

diff --git a/.../activities/TemplateFragmentActivity.java → ...eui/lisa/activities/TemplateActivity.java b/.../activities/TemplateFragmentActivity.java → ...eui/lisa/activities/TemplateActivity.java
@@ -11,12 +11,12 @@
 import ceui.lisa.fragments.FragmentBookTag;
 import ceui.lisa.fragments.FragmentComment;
 import ceui.lisa.fragments.FragmentFollowUser;
-import ceui.lisa.fragments.FragmentH;
 import ceui.lisa.fragments.FragmentLicense;
 import ceui.lisa.fragments.FragmentLikeIllust;
 import ceui.lisa.fragments.FragmentLocalUsers;
 import ceui.lisa.fragments.FragmentMetro;
 import ceui.lisa.fragments.FragmentMultiDownload;
+import ceui.lisa.fragments.FragmentNew;
 import ceui.lisa.fragments.FragmentNiceFriend;
 import ceui.lisa.fragments.FragmentPivision;
 import ceui.lisa.fragments.FragmentRecmdUser;
@@ -31,11 +31,12 @@
 import ceui.lisa.fragments.FragmentViewHistory;
 import ceui.lisa.fragments.FragmentWalkThrough;
 import ceui.lisa.fragments.FragmentWebView;
-import ceui.lisa.ui.fragment.FragmentQ;
+import ceui.lisa.fragments.FragmentWhoFollowThisUser;
 import ceui.lisa.ui.fragment.FragmentT;
+import ceui.lisa.utils.Params;
 import ceui.lisa.utils.ReverseResult;
 
-public class TemplateFragmentActivity extends FragmentActivity {
+public class TemplateActivity extends FragmentActivity {
 
     public static final String EXTRA_FRAGMENT = "dataType";
     public static final String EXTRA_OBJECT = "object";
@@ -106,7 +107,7 @@ protected Fragment createNewFragment() {
                     return new FragmentLicense();
                 case "正在关注":
                     return FragmentFollowUser.newInstance(
-                            getIntent().getIntExtra("user id", 0),
+                            getIntent().getIntExtra(Params.USER_ID, 0),
                             FragmentLikeIllust.TYPE_PUBLUC, true);
                 case "好P友":
                     return new FragmentNiceFriend();
@@ -116,14 +117,18 @@ protected Fragment createNewFragment() {
                     return new FragmentAboutUser();
                 case "一言":
                     return new FragmentT();
+                case "最新作品":
+                    return new FragmentNew();
+                case "粉丝":
+                    return FragmentWhoFollowThisUser.newInstance(intent.getIntExtra(Params.USER_ID, 0));
                 case "插画作品":
-                    return FragmentUserIllust.newInstance(intent.getIntExtra("user id", 0),
+                    return FragmentUserIllust.newInstance(intent.getIntExtra(Params.USER_ID, 0),
                             true);
                 case "漫画作品":
-                    return FragmentUserManga.newInstance(intent.getIntExtra("user id", 0),
+                    return FragmentUserManga.newInstance(intent.getIntExtra(Params.USER_ID, 0),
                             true);
                 case "插画/漫画收藏":
-                    return FragmentLikeIllust.newInstance(intent.getIntExtra("user id", 0),
+                    return FragmentLikeIllust.newInstance(intent.getIntExtra(Params.USER_ID, 0),
                             FragmentLikeIllust.TYPE_PUBLUC, true);
                 default:
                     return new FragmentBlank();
@@ -141,4 +146,9 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         }
         return super.onKeyDown(keyCode, event);
     }
+
+    @Override
+    public boolean hideStatusBar() {
+        return super.hideStatusBar() && getIntent().getBooleanExtra("hideStatusBar", true);
+    }
 }