diff --git a/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt b/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt index 3997af53..ed1765a6 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt @@ -140,7 +140,7 @@ open class MainActivity : BaseActivity(), BottomNavigationView.OnNavigationItemS val personalizedFeedFragment = PersonalizedFeedFragment() mAdapter.addFragment(personalizedFeedFragment) } - mAdapter.addFragment(MessageFragment.newInstance(MessageFragment.TYPE_REPLY_ME)) + mAdapter.addFragment(MessageFragment.newInstance(MessageFragment.TYPE_REPLY_ME, true)) mAdapter.addFragment(MyInfoFragment()) mViewPager.isCanScroll = false mViewPager.adapter = mAdapter @@ -194,8 +194,7 @@ open class MainActivity : BaseActivity(), BottomNavigationView.OnNavigationItemS showDialog(DialogUtil.build(this) .setTitle(R.string.title_dialog_notice) .setMessage(R.string.message_dialog_notice) - .setPositiveButton(R.string.button_sure_default) { _: DialogInterface?, - _: Int -> + .setPositiveButton(R.string.button_sure_default) { _, _ -> SharedPreferencesUtil.put(this, SharedPreferencesUtil.SP_APP_DATA, "notice_dialog", true) } .setCancelable(false) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/activities/MessageActivity.java b/app/src/main/java/com/huanchengfly/tieba/post/activities/MessageActivity.java index ddf0c05f..92bcb8ab 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/activities/MessageActivity.java +++ b/app/src/main/java/com/huanchengfly/tieba/post/activities/MessageActivity.java @@ -37,7 +37,7 @@ public class MessageActivity extends BaseActivity { if (savedInstanceState == null) { getSupportFragmentManager().beginTransaction() .replace(R.id.activity_message_list_content, - MessageFragment.newInstance(getIntent().getIntExtra("type", MessageFragment.TYPE_REPLY_ME), true), MessageFragment.class.getSimpleName()).commit(); + MessageFragment.newInstance(getIntent().getIntExtra("type", MessageFragment.TYPE_REPLY_ME), false), MessageFragment.class.getSimpleName()).commit(); } } } \ No newline at end of file diff --git a/app/src/main/java/com/huanchengfly/tieba/post/fragments/MessageFragment.kt b/app/src/main/java/com/huanchengfly/tieba/post/fragments/MessageFragment.kt index cddb6ab3..9c693ee1 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/fragments/MessageFragment.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/fragments/MessageFragment.kt @@ -10,6 +10,7 @@ import androidx.recyclerview.widget.RecyclerView import androidx.viewpager.widget.ViewPager import butterknife.BindView import com.google.android.material.appbar.AppBarLayout +import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_NO_SCROLL import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayout.OnTabSelectedListener import com.huanchengfly.tieba.post.R @@ -52,7 +53,7 @@ class MessageFragment : BaseFragment(), Refreshable, OnTabSelectedListener, Tool private var atMe: MessageListHelper? = null var type = 0 private set - private var isFromNotification = false + private var isFromMain = false public override fun onFragmentVisibleChange(isVisible: Boolean) { if (isVisible) { refreshIfNeed() @@ -68,7 +69,7 @@ class MessageFragment : BaseFragment(), Refreshable, OnTabSelectedListener, Tool val args = arguments if (args != null) { type = args.getInt(PARAM_TYPE, TYPE_REPLY_ME) - isFromNotification = args.getBoolean(PARAM_FROM_NOTIFICATION, false) + isFromMain = args.getBoolean(PARAM_FROM_MAIN, false) } } @@ -78,7 +79,11 @@ class MessageFragment : BaseFragment(), Refreshable, OnTabSelectedListener, Tool override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - mToolbar!!.setOnMenuItemClickListener(this) + if (!isFromMain) { + mToolbar?.visibility = View.GONE + (mToolbar?.layoutParams as AppBarLayout.LayoutParams?)?.scrollFlags = SCROLL_FLAG_NO_SCROLL + } + mToolbar?.setOnMenuItemClickListener(this) val viewPager: ViewPager = view.findViewById(R.id.fragment_message_vp) val viewPagerAdapter = TabViewPagerAdapter() replyMe = MessageListHelper(attachContext, TYPE_REPLY_ME) @@ -89,7 +94,7 @@ class MessageFragment : BaseFragment(), Refreshable, OnTabSelectedListener, Tool tabLayout!!.setupWithViewPager(viewPager) tabLayout!!.addOnTabSelectedListener(this) viewPager.setCurrentItem(type, false) - if (isFromNotification) { + if (!isFromMain) { refreshIfNeed() } } @@ -251,15 +256,15 @@ class MessageFragment : BaseFragment(), Refreshable, OnTabSelectedListener, Tool const val TYPE_AT_ME = 1 val TAG = MessageFragment::class.java.simpleName private const val PARAM_TYPE = "type" - const val PARAM_FROM_NOTIFICATION = "from_notification" + const val PARAM_FROM_MAIN = "from_main" @JvmStatic @JvmOverloads - fun newInstance(type: Int, isFromNotification: Boolean = false): MessageFragment { + fun newInstance(type: Int, fromMain: Boolean = false): MessageFragment { return MessageFragment().apply { arguments = Bundle().apply { putInt(PARAM_TYPE, type) - putBoolean(PARAM_FROM_NOTIFICATION, isFromNotification) + putBoolean(PARAM_FROM_MAIN, fromMain) } } } diff --git a/app/src/main/res/layout/activity_message_list.xml b/app/src/main/res/layout/activity_message_list.xml index 41eca364..8d5eca17 100644 --- a/app/src/main/res/layout/activity_message_list.xml +++ b/app/src/main/res/layout/activity_message_list.xml @@ -5,6 +5,7 @@ android:id="@+id/background" android:layout_width="match_parent" android:layout_height="match_parent" + app:backgroundTint="@color/default_color_window_background" tools:context=".activities.MessageActivity">