diff --git a/app/src/main/java/com/coldmint/rust/pro/WebModInfoActivity.kt b/app/src/main/java/com/coldmint/rust/pro/WebModInfoActivity.kt index b15d91b..607e71a 100644 --- a/app/src/main/java/com/coldmint/rust/pro/WebModInfoActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/WebModInfoActivity.kt @@ -31,7 +31,7 @@ class WebModInfoActivity : BaseActivity() { lateinit var modId: String lateinit var tip: String - val targetFile: File by lazy { + private val targetFile: File by lazy { val modFolderPath = AppSettings.getValue( AppSettings.Setting.ModFolder, Environment.getExternalStorageDirectory().absolutePath + "/rustedWarfare/units/" @@ -51,6 +51,7 @@ class WebModInfoActivity : BaseActivity() { val modName: MutableLiveData by lazy { MutableLiveData() } + @SuppressLint("CommitTransaction") private fun initView() { setReturnButton() @@ -80,17 +81,21 @@ class WebModInfoActivity : BaseActivity() { if (Tools.isTabletMode(this)) { adapter = ModPageDetailsAdapter(this, modId) supportFragmentManager.beginTransaction() - .replace(R.id.fragment,webModDetailsFragment) + .replace(R.id.fragment, webModDetailsFragment) .commit() - viewBinding.viewPager2.adapter = adapter + viewBinding.viewPager2.adapter = adapter + TabLayoutMediator(viewBinding.tabLayout, viewBinding.viewPager2) { tab, i -> tab.text = when (i) { 0 -> { getString(R.string.insert_coins) } + 1 -> { getString(R.string.discussion) - }else -> { + } + + else -> { getString(R.string.title) } } @@ -136,7 +141,7 @@ class WebModInfoActivity : BaseActivity() { * 下载事件 * @param t WebModInfoData */ - fun downloadAction(link: String?) { + private fun downloadAction(link: String?) { if (link == null) { return } @@ -239,7 +244,7 @@ class WebModInfoActivity : BaseActivity() { * 下载工作 * @param fileLink String */ - fun downloadWork(fileLink: String) { + private fun downloadWork(fileLink: String) { GlobalMethod.requestStoragePermissions(this) { if (it) { viewBinding.button.setText(R.string.installation_ing) diff --git a/app/src/main/java/com/coldmint/rust/pro/fragments/CommunityFragment.kt b/app/src/main/java/com/coldmint/rust/pro/fragments/CommunityFragment.kt index 430dc59..32316ae 100644 --- a/app/src/main/java/com/coldmint/rust/pro/fragments/CommunityFragment.kt +++ b/app/src/main/java/com/coldmint/rust/pro/fragments/CommunityFragment.kt @@ -4,6 +4,7 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.viewpager2.widget.ViewPager2 import com.coldmint.rust.pro.R @@ -36,9 +37,9 @@ class CommunityFragment : Fragment() { private fun onViewCreated(view: View) { val navigationBarView : NavigationBarView = view.findViewById(R.id.bottomnavigationView) val pager : ViewPager2 = view.findViewById(R.id.pager) - if (Tools.isTabletMode(requireContext())) { -// var navigation = navigationBarView as NavigationRailView -// navigation.setonc +// 是否是平板模式 + val tabletMode = Tools.isTabletMode(requireContext()) + if (tabletMode){ } pager.adapter = CommunityAdapter(this) pager.isSaveEnabled = false @@ -63,16 +64,16 @@ class CommunityFragment : Fragment() { navigationBarView.setOnItemSelectedListener { when (it.itemId) { R.id.action_recommended -> { - pager.currentItem = 0 + pager.setCurrentItem(0, !tabletMode) } R.id.action_follow -> { - pager.currentItem = 1 + pager.setCurrentItem(1, !tabletMode) } R.id.action_ranking -> { - pager.currentItem = 2 + pager.setCurrentItem(2, !tabletMode) } R.id.action_my -> { - pager.currentItem = 3 + pager.setCurrentItem(3, !tabletMode) } } true diff --git a/app/src/main/java/com/coldmint/rust/pro/fragments/FollowFragment.kt b/app/src/main/java/com/coldmint/rust/pro/fragments/FollowFragment.kt index 4227091..032d947 100644 --- a/app/src/main/java/com/coldmint/rust/pro/fragments/FollowFragment.kt +++ b/app/src/main/java/com/coldmint/rust/pro/fragments/FollowFragment.kt @@ -34,7 +34,7 @@ class FollowFragment : BaseFragment() { /** * 加载视图如果需要更新的话 */ - fun loadViewIfNeed() { + private fun loadViewIfNeed() { val loginStatus = AppSettings.getValue(AppSettings.Setting.LoginStatus, false) if (loginStatus) { val account = AppSettings.getValue(AppSettings.Setting.Account, "") diff --git a/app/src/main/res/layout-land/activity_user_home_page.xml b/app/src/main/res/layout-land/activity_user_home_page.xml new file mode 100644 index 0000000..09d4101 --- /dev/null +++ b/app/src/main/res/layout-land/activity_user_home_page.xml @@ -0,0 +1,309 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +