3-group-android/Musicoo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ocean 2024-07-15 16:04:42 +08:00
parent ae745858fc
commit e62daab99c
3 changed files with 66 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/melody/offline/music/activity/PrimaryActivity.kt
View File

@ -12,7 +12,7 @@ import melody.offline.music.fragment.SearchFragment
import kotlinx.coroutines.isActive import kotlinx.coroutines.isActive
import kotlinx.coroutines.selects.select import kotlinx.coroutines.selects.select
class PrimaryActivity : MoBaseActivity(), SearchFragment.SearchFragmentCancelClickListener { class PrimaryActivity : MoBaseActivity(), SearchFragment.SearchFragmentCancelClickListener ,MoHomeFragment.MoHomeFragmentToSearchClickListener{
/** /**
* musicResponsiveListItemRenderer * musicResponsiveListItemRenderer
* musicTwoRowItemRenderer * musicTwoRowItemRenderer
@ -60,7 +60,9 @@ class PrimaryActivity : MoBaseActivity(), SearchFragment.SearchFragmentCancelCli
private fun initFragment() { private fun initFragment() {
mFragments.clear() mFragments.clear()
mFragments.add(MoHomeFragment()) val homeFragment = MoHomeFragment()
homeFragment.setToSearchClickListener(this)
mFragments.add(homeFragment)
val searchFragment = SearchFragment() val searchFragment = SearchFragment()
searchFragment.setButtonClickListener(this) searchFragment.setButtonClickListener(this)
mFragments.add(searchFragment) mFragments.add(searchFragment)
@ -165,6 +167,10 @@ class PrimaryActivity : MoBaseActivity(), SearchFragment.SearchFragmentCancelCli
onBackPressed() onBackPressed()
} }
override fun onToSearchClick() {
updateBtnState(1)
changeFragment(1)
}
private var backPressedTime: Long = 0 private var backPressedTime: Long = 0
private val backToast: Toast by lazy { private val backToast: Toast by lazy {

17
app/src/main/java/melody/offline/music/fragment/MoHomeFragment.kt
View File

@ -21,6 +21,18 @@ import org.json.JSONObject
class MoHomeFragment : MoBaseFragment<FragmentMoHomeBinding>() { class MoHomeFragment : MoBaseFragment<FragmentMoHomeBinding>() {
interface MoHomeFragmentToSearchClickListener {
fun onToSearchClick()
}
fun setToSearchClickListener(listener: MoHomeFragmentToSearchClickListener) {
this.toSearchClickListener = listener
}
private var toSearchClickListener: MoHomeFragmentToSearchClickListener? = null
private val requests: Channel<Request> = Channel(Channel.UNLIMITED) private val requests: Channel<Request> = Channel(Channel.UNLIMITED)
enum class Request { enum class Request {
@ -69,6 +81,11 @@ class MoHomeFragment : MoBaseFragment<FragmentMoHomeBinding>() {
AnalysisUtil.logEvent(AnalysisUtil.HOME_B_MODULE_TRY_AGAIN_ACTION) AnalysisUtil.logEvent(AnalysisUtil.HOME_B_MODULE_TRY_AGAIN_ACTION)
requests.trySend(Request.TryAgain) requests.trySend(Request.TryAgain)
} }
binding.topSearchBtn.setOnClickListener {
if (toSearchClickListener != null) {
toSearchClickListener?.onToSearchClick()
}
}
} }
private suspend fun initData() { private suspend fun initData() {

43
app/src/main/res/layout/fragment_mo_home.xml
View File

@ -24,10 +24,10 @@
<ProgressBar <ProgressBar
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminateTint="@color/green" android:indeterminateTint="@color/green"
android:progressBackgroundTint="@color/green" android:progressBackgroundTint="@color/green"
android:progressTint="@color/green" android:progressTint="@color/green" />
android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
@ -98,6 +98,45 @@
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/topSearchBtn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_weight="1"
android:background="@drawable/drw_search_layout_bg"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="16dp"
android:src="@drawable/search_edit_icon" />
<TextView
android:id="@+id/searchEdit"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="8dp"
android:gravity="center_vertical"
android:layout_marginEnd="8dp"
android:focusable="true"
android:focusableInTouchMode="true"
android:hint="@string/enter_keywords"
android:singleLine="true"/>
</LinearLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/content_layout" android:id="@+id/content_layout"
android:layout_width="match_parent" android:layout_width="match_parent"