Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【光环助手V5.5.0】游戏单 UI 修复（1-4、6）https://git.shanqu.cc/pm/halo-app-issues/-/issues/1647

Browse Source
This commit is contained in:
leafwai
2021-12-03 18:30:05 +08:00
parent adaffbac77
commit f92490406e
14 changed files with 236 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt
View File

@ -5,6 +5,7 @@ import android.graphics.Typeface
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.widget.LinearLayout
import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.core.graphics.ColorUtils
@ -252,6 +253,12 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() {
mTabTitleList.add(tabViewBinding.tabTitle)
tab.customView = tabViewBinding.root
tab.view.setPadding(0, 0, 0, 0)
if (i == 0) {
tab.view.layoutParams = (tab.view.layoutParams as LinearLayout.LayoutParams).apply { setMargins(10F.dip2px(), 0, 0, 0) }
}
if (i == mBinding?.tabLayout?.tabCount!! - 1) {
tab.view.layoutParams = (tab.view.layoutParams as LinearLayout.LayoutParams).apply { setMargins(0, 0, 10F.dip2px(), 0) }
}
}
}
}

7
app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagAdapter.kt
View File

@ -18,7 +18,8 @@ class GameCollectionTagAdapter(
val singleChoice: Boolean = true,
val maxSelectCount: Int = 1,
val singleSelectedTag: TagInfoEntity? = null,
private val updateCallback: (() -> Unit)
private val updateCallback: (() -> Unit),
private val singleClickCallback: (() -> Unit)? = null
) :
BaseRecyclerAdapter<RecyclerView.ViewHolder>(context) {
@ -108,9 +109,7 @@ class GameCollectionTagAdapter(
if (tagTv.isChecked) {
selectedTagEntity = tag
selectedTagCategory = tagCategory
} else {
selectedTagEntity = null
selectedTagCategory = ""
singleClickCallback?.invoke()
}
}
}

4
app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt
View File

@ -12,7 +12,9 @@ class GameCollectionTagSelectActivity : NormalActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setNavigationTitle("选择标签")
setToolbarMenu(R.menu.menu_save)
if (intent.getBundleExtra(NORMAL_FRAGMENT_BUNDLE)?.getBoolean(KEY_IS_SINGLE_CHOICE) == false) {
setToolbarMenu(R.menu.menu_save)
}
}
companion object {

25
app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt
View File

@ -55,18 +55,10 @@ class GameCollectionTagSelectFragment : NormalFragment() {
override fun onMenuItemClick(menuItem: MenuItem?) {
if (menuItem?.itemId == R.id.layout_menu_save) {
if (mSingleChoice) {
if (mAdapter.selectedTagEntity != null) {
NewLogUtils.logFilterGameCollectionTag(mAdapter.selectedTagCategory, mAdapter.selectedTagEntity!!.name)
}
if (!mSingleChoice) {
requireActivity().setResult(
Activity.RESULT_OK,
Intent().putExtra(SELECTED_TAG, mAdapter.selectedTagEntity)
)
} else {
requireActivity().setResult(
Activity.RESULT_OK,
Intent().putExtra(SELECTED_TAG, mAdapter.selectedTagEntityList)
Activity.RESULT_OK,
Intent().putExtra(SELECTED_TAG, mAdapter.selectedTagEntityList)
)
}
requireActivity().finish()
@ -79,7 +71,16 @@ class GameCollectionTagSelectFragment : NormalFragment() {
mSelectedTag = arguments?.getParcelable(GameCollectionTagSelectActivity.KEY_SINGLE_SELECTED_TAG)
mMaxSelectCount = arguments?.getInt(GameCollectionTagSelectActivity.KEY_MAX_SELECT_COUNT_TAG, 1) ?: 1
mSelectedTags = arguments?.getParcelableArrayList(GameCollectionTagSelectActivity.KEY_SELECT_TAGS) ?: arrayListOf()
mAdapter = GameCollectionTagAdapter(requireContext(), mSingleChoice, mMaxSelectCount, mSelectedTag, updateSelectedTagView)
mAdapter = GameCollectionTagAdapter(requireContext(), mSingleChoice, mMaxSelectCount, mSelectedTag, updateSelectedTagView, {
if (mAdapter.selectedTagEntity != null) {
NewLogUtils.logFilterGameCollectionTag(mAdapter.selectedTagCategory, mAdapter.selectedTagEntity!!.name)
}
requireActivity().setResult(
Activity.RESULT_OK,
Intent().putExtra(SELECTED_TAG, mAdapter.selectedTagEntity)
)
requireActivity().finish()
})
if (!mSelectedTags.isNullOrEmpty()) {
mAdapter.selectedTagEntityList.addAll(mSelectedTags!!)
}