From ef17d8c675b32bfce35873b45bec2c025f47579c Mon Sep 17 00:00:00 2001 From: HuanChengFly <609486518@qq.com> Date: Sat, 1 May 2021 21:07:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=9C=AC=E5=90=A7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 10 +++- .../tieba/post/activities/ForumActivity.kt | 3 ++ .../post/activities/ForumInfoActivity.kt | 54 +++++++++++++++++++ .../post/fragments/ForumInfoFragment.java | 5 +- .../main/res/layout/activity_forum_info.xml | 19 +++++++ .../main/res/layout/fragment_forum_info.xml | 1 + app/src/main/res/layout/layout_new_appbar.xml | 1 + app/src/main/res/menu/menu_ba_toolbar.xml | 9 +++- app/src/main/res/values/strings.xml | 1 + 9 files changed, 98 insertions(+), 5 deletions(-) create mode 100644 app/src/main/java/com/huanchengfly/tieba/post/activities/ForumInfoActivity.kt create mode 100644 app/src/main/res/layout/activity_forum_info.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3eed4cfe..56d00adc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -230,7 +230,15 @@ android:configChanges="screenSize|screenLayout|orientation|smallestScreenSize|keyboardHidden" android:theme="@style/AppTheme.Intro" android:windowSoftInputMode="adjustResize" /> - + + { + ForumInfoActivity.launch(this, forumName ?: "") + } R.id.menu_unfollow -> { if (mDataBean != null) { DialogUtil.build(this@ForumActivity) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/activities/ForumInfoActivity.kt b/app/src/main/java/com/huanchengfly/tieba/post/activities/ForumInfoActivity.kt new file mode 100644 index 00000000..482579c0 --- /dev/null +++ b/app/src/main/java/com/huanchengfly/tieba/post/activities/ForumInfoActivity.kt @@ -0,0 +1,54 @@ +package com.huanchengfly.tieba.post.activities + +import android.content.Context +import android.os.Bundle +import androidx.appcompat.widget.Toolbar +import butterknife.BindView +import com.google.android.material.appbar.CollapsingToolbarLayout +import com.huanchengfly.tieba.post.R +import com.huanchengfly.tieba.post.fragments.ForumInfoFragment +import com.huanchengfly.tieba.post.goToActivity +import com.huanchengfly.tieba.post.utils.ThemeUtil + +class ForumInfoActivity : BaseActivity() { + @BindView(R.id.toolbar) + lateinit var toolbar: Toolbar + + @BindView(R.id.collapsing_toolbar) + lateinit var collapsingToolbar: CollapsingToolbarLayout + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + ThemeUtil.setTranslucentThemeBackground(findViewById(R.id.background)) + setSupportActionBar(toolbar) + supportActionBar?.setDisplayHomeAsUpEnabled(true) + supportActionBar?.title = title + collapsingToolbar.title = title + + val forumName = intent.getStringExtra(EXTRA_FORUM_NAME) + if (forumName.isNullOrEmpty()) { + finish() + } else { + supportFragmentManager.beginTransaction() + .replace(R.id.container, ForumInfoFragment.newInstance(forumName), "ForumInfoFragment") + .commit() + } + } + + override fun getLayoutId(): Int { + return R.layout.activity_forum_info + } + + companion object { + const val EXTRA_FORUM_NAME = "forum_name" + + fun launch( + context: Context, + forumName: String + ) { + context.goToActivity { + putExtra(EXTRA_FORUM_NAME, forumName) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/huanchengfly/tieba/post/fragments/ForumInfoFragment.java b/app/src/main/java/com/huanchengfly/tieba/post/fragments/ForumInfoFragment.java index 0a7d0df2..e96ed908 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/fragments/ForumInfoFragment.java +++ b/app/src/main/java/com/huanchengfly/tieba/post/fragments/ForumInfoFragment.java @@ -67,10 +67,12 @@ public class ForumInfoFragment extends BaseFragment implements Refreshable, Scro View mManagersView; @BindView(R.id.friend_forums_view) RecyclerView friendForumsRecyclerView; + @BindView(R.id.refresh) + SwipeRefreshLayout mRefreshLayout; + private String forumName; private ForumPageBean mDataBean; private View content; - private SwipeRefreshLayout mRefreshLayout; public ForumInfoFragment() { } @@ -114,7 +116,6 @@ public class ForumInfoFragment extends BaseFragment implements Refreshable, Scro @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - mRefreshLayout = (SwipeRefreshLayout) view; ThemeUtil.setThemeForSwipeRefreshLayout(mRefreshLayout); mRefreshLayout.setOnRefreshListener(this::refresh); content = view.findViewById(R.id.content); diff --git a/app/src/main/res/layout/activity_forum_info.xml b/app/src/main/res/layout/activity_forum_info.xml new file mode 100644 index 00000000..5d9894a7 --- /dev/null +++ b/app/src/main/res/layout/activity_forum_info.xml @@ -0,0 +1,19 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_forum_info.xml b/app/src/main/res/layout/fragment_forum_info.xml index bb8e4577..928c6f7b 100644 --- a/app/src/main/res/layout/fragment_forum_info.xml +++ b/app/src/main/res/layout/fragment_forum_info.xml @@ -2,6 +2,7 @@ + \ No newline at end of file diff --git a/app/src/main/res/menu/menu_ba_toolbar.xml b/app/src/main/res/menu/menu_ba_toolbar.xml index 186abcf2..68db69b6 100644 --- a/app/src/main/res/menu/menu_ba_toolbar.xml +++ b/app/src/main/res/menu/menu_ba_toolbar.xml @@ -25,13 +25,18 @@ android:title="@string/title_unfollow" app:showAsAction="never" /> + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 40ef3ebd..b7191c21 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -445,4 +445,5 @@ 请稍候…… 正在获取吧列表 没有可签到的吧 + 关于本吧