Remove refresh menu
This commit is contained in:
parent
75549c41e0
commit
6933159245
|
@ -17,7 +17,6 @@
|
||||||
package im.vector.riotx.features.settings.devtools
|
package im.vector.riotx.features.settings.devtools
|
||||||
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.MenuItem
|
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import com.airbnb.mvrx.fragmentViewModel
|
import com.airbnb.mvrx.fragmentViewModel
|
||||||
import com.airbnb.mvrx.withState
|
import com.airbnb.mvrx.withState
|
||||||
|
@ -40,8 +39,6 @@ class GossipingEventsPaperTrailFragment @Inject constructor(
|
||||||
|
|
||||||
override fun getLayoutResId() = R.layout.fragment_generic_recycler
|
override fun getLayoutResId() = R.layout.fragment_generic_recycler
|
||||||
|
|
||||||
override fun getMenuRes(): Int = R.menu.menu_common_gossiping
|
|
||||||
|
|
||||||
private val viewModel: GossipingEventsPaperTrailViewModel by fragmentViewModel(GossipingEventsPaperTrailViewModel::class)
|
private val viewModel: GossipingEventsPaperTrailViewModel by fragmentViewModel(GossipingEventsPaperTrailViewModel::class)
|
||||||
|
|
||||||
override fun invalidate() = withState(viewModel) { state ->
|
override fun invalidate() = withState(viewModel) { state ->
|
||||||
|
@ -60,15 +57,6 @@ class GossipingEventsPaperTrailFragment @Inject constructor(
|
||||||
epoxyController.interactionListener = null
|
epoxyController.interactionListener = null
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
|
||||||
if (item.itemId == R.id.refresh) {
|
|
||||||
viewModel.refresh()
|
|
||||||
return true
|
|
||||||
} else {
|
|
||||||
return super.onOptionsItemSelected(item)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun didTap(event: Event) {
|
override fun didTap(event: Event) {
|
||||||
if (event.isEncrypted()) {
|
if (event.isEncrypted()) {
|
||||||
event.toClearContentStringWithIndent()
|
event.toClearContentStringWithIndent()
|
||||||
|
|
|
@ -46,12 +46,10 @@ class IncomingKeyRequestListFragment @Inject constructor(
|
||||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
super.onViewCreated(view, savedInstanceState)
|
super.onViewCreated(view, savedInstanceState)
|
||||||
recyclerView.configureWith(epoxyController, showDivider = true)
|
recyclerView.configureWith(epoxyController, showDivider = true)
|
||||||
// epoxyController.interactionListener = this
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroyView() {
|
override fun onDestroyView() {
|
||||||
super.onDestroyView()
|
super.onDestroyView()
|
||||||
recyclerView.cleanup()
|
recyclerView.cleanup()
|
||||||
// epoxyController.interactionListener = null
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,6 @@ import javax.inject.Inject
|
||||||
class KeyRequestsFragment @Inject constructor() : VectorBaseFragment() {
|
class KeyRequestsFragment @Inject constructor() : VectorBaseFragment() {
|
||||||
|
|
||||||
override fun getLayoutResId(): Int = R.layout.fragment_devtool_keyrequests
|
override fun getLayoutResId(): Int = R.layout.fragment_devtool_keyrequests
|
||||||
override fun getMenuRes(): Int = R.menu.menu_common_gossiping
|
|
||||||
|
|
||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
super.onResume()
|
super.onResume()
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<menu xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<item
|
|
||||||
android:id="@+id/refresh"
|
|
||||||
android:icon="@drawable/ic_refresh_cw"
|
|
||||||
app:iconTint="?riotx_text_primary"
|
|
||||||
android:title="@string/refresh"
|
|
||||||
app:showAsAction="collapseActionView|ifRoom" />
|
|
||||||
</menu>
|
|
Loading…
Reference in New Issue