diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/AudioContentMainFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/AudioContentMainFragment.kt index 06a9d03..da55fc5 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/AudioContentMainFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/AudioContentMainFragment.kt @@ -152,7 +152,6 @@ class AudioContentMainFragment : BaseFragment( } binding.flSearchChannel.setOnClickListener { - (requireActivity() as MainActivity).showSearchBar() } } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/home/AudioContentMainTabHomeFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/home/AudioContentMainTabHomeFragment.kt index 09f41f9..5483dd5 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/home/AudioContentMainTabHomeFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/home/AudioContentMainTabHomeFragment.kt @@ -154,7 +154,6 @@ class AudioContentMainTabHomeFragment : BaseFragment(ActivityMainBinding::inflate) { private val viewModel: MainViewModel by inject() - private val explorerViewModel: ExplorerViewModel by inject() - - private lateinit var searchChannelAdapter: SelectMessageRecipientAdapter - private lateinit var imm: InputMethodManager private lateinit var liveFragment: LiveFragment private lateinit var loadingDialog: LoadingDialog @@ -79,7 +63,6 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl private var mediaController: MediaController? = null private val handler = Handler(Looper.getMainLooper()) private val audioContentReceiver = AudioContentReceiver() - private var isShowSearchBar = false private val preferenceChangeListener = SharedPreferences.OnSharedPreferenceChangeListener { sharedPreferences, key -> @@ -196,9 +179,6 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - imm = getSystemService( - Service.INPUT_METHOD_SERVICE - ) as InputMethodManager checkPermissions() @@ -231,15 +211,6 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl handler.postDelayed({ executeDeeplink(intent) }, 1000) } - - onBackPressedDispatcher.addCallback { - if (isShowSearchBar) { - hideSearchBar() - } else { - isEnabled = false - onBackPressedDispatcher.onBackPressed() - } - } } override fun onDestroy() { @@ -292,7 +263,6 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl } setupBottomTabLayout() - setupSearchChannelView() } private fun executeDeeplink(intent: Intent) { @@ -603,97 +573,6 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl } } - @SuppressLint("NotifyDataSetChanged") - private fun setupSearchChannelView() { - searchChannelAdapter = SelectMessageRecipientAdapter { - hideKeyboard() - val intent = Intent(applicationContext, UserProfileActivity::class.java) - intent.putExtra(Constants.EXTRA_USER_ID, it.id) - startActivity(intent) - } - - binding.rvSearchChannel.layoutManager = LinearLayoutManager( - this, - LinearLayoutManager.VERTICAL, - false - ) - - binding.rvSearchChannel.addItemDecoration(object : RecyclerView.ItemDecoration() { - override fun getItemOffsets( - outRect: Rect, - view: View, - parent: RecyclerView, - state: RecyclerView.State - ) { - super.getItemOffsets(outRect, view, parent, state) - - outRect.left = 13.3f.dpToPx().toInt() - outRect.right = 13.3f.dpToPx().toInt() - outRect.top = 13.3f.dpToPx().toInt() - outRect.bottom = 13.3f.dpToPx().toInt() - } - }) - - binding.rvSearchChannel.adapter = searchChannelAdapter - - compositeDisposable.add( - binding.etSearchChannel.textChanges().skip(1) - .debounce(500, TimeUnit.MILLISECONDS) - .observeOn(AndroidSchedulers.mainThread()) - .subscribeOn(Schedulers.io()) - .subscribe { - if (it.length >= 2) { - explorerViewModel.searchChannel(it.toString()) - binding.rvSearchChannel.visibility = View.VISIBLE - binding.tvResultX.visibility = View.GONE - } else { - binding.rvSearchChannel.visibility = View.GONE - binding.tvResultX.visibility = View.VISIBLE - } - } - ) - - explorerViewModel.searchChannelLiveData.observe(this) { - searchChannelAdapter.items.clear() - if (it.isNotEmpty()) { - searchChannelAdapter.items.addAll(it) - binding.rvSearchChannel.visibility = View.VISIBLE - binding.tvResultX.visibility = View.GONE - } else { - binding.rvSearchChannel.visibility = View.GONE - binding.tvResultX.visibility = View.VISIBLE - } - searchChannelAdapter.notifyDataSetChanged() - } - } - - private fun hideKeyboard() { - handler.postDelayed({ - imm.hideSoftInputFromWindow( - window.decorView.applicationWindowToken, - InputMethodManager.HIDE_NOT_ALWAYS - ) - }, 100) - } - - private fun hideSearchBar() { - isShowSearchBar = false - binding.nsSearch.visibility = View.GONE - binding.etSearchChannel.setText("") - } - - fun showSearchBar() { - isShowSearchBar = true - binding.nsSearch.visibility = View.VISIBLE - binding.etSearchChannel.setText("") - - binding.etSearchChannel.requestFocus() - binding.etSearchChannel.post { - val imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager - imm.showSoftInput(binding.etSearchChannel, InputMethodManager.SHOW_IMPLICIT) - } - } - fun showLoginActivity() { if (SharedPreferenceManager.token.isBlank()) { val extras = intent.extras diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 9786237..5630178 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -190,71 +190,4 @@ android:layout_height="wrap_content" android:layout_weight="1" /> - - - - - - - - - - - - - - - - -