Clean Home Activity

dev
Aurelien Hubert 7 years ago
parent d3a65a1c7f
commit e52a1dca14
  1. 94
      app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt

@ -6,7 +6,6 @@ import android.content.Intent
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.view.Menu import android.view.Menu
import android.view.MenuItem
import com.google.android.material.bottomnavigation.BottomNavigationView import com.google.android.material.bottomnavigation.BottomNavigationView
import io.realm.RealmResults import io.realm.RealmResults
import kotlinx.android.synthetic.main.activity_home.* import kotlinx.android.synthetic.main.activity_home.*
@ -15,7 +14,6 @@ import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.realm.Currency import net.pokeranalytics.android.model.realm.Currency
import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
import net.pokeranalytics.android.ui.adapter.HomePagerAdapter import net.pokeranalytics.android.ui.adapter.HomePagerAdapter
import net.pokeranalytics.android.ui.interfaces.FilterHandler
import net.pokeranalytics.android.util.billing.AppGuard import net.pokeranalytics.android.util.billing.AppGuard
@ -29,24 +27,10 @@ class HomeActivity : PokerAnalyticsActivity() {
} }
} }
private var homeMenu: Menu? = null
private lateinit var currencies: RealmResults<Currency> private lateinit var currencies: RealmResults<Currency>
private val mOnNavigationItemSelectedListener = BottomNavigationView.OnNavigationItemSelectedListener { item -> private val mOnNavigationItemSelectedListener = BottomNavigationView.OnNavigationItemSelectedListener { item ->
when (item.itemId) { when (item.itemId) {
//CLEAN
/*
R.id.navigation_history -> {
displayFragment(0)
}
R.id.navigation_stats -> {
displayFragment(1)
}
R.id.navigation_settings -> {
displayFragment(2)
}
*/
R.id.navigation_history -> { R.id.navigation_history -> {
displayFragment(0) displayFragment(0)
} }
@ -90,22 +74,6 @@ class HomeActivity : PokerAnalyticsActivity() {
checkFirstLaunch() checkFirstLaunch()
} }
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
menu?.clear()
menuInflater.inflate(R.menu.toolbar_home, menu)
this.homeMenu = menu
//TODO: Change queryWith button visibility
homeMenu?.findItem(R.id.filter)?.isVisible = true
return super.onCreateOptionsMenu(menu)
}
override fun onOptionsItemSelected(item: MenuItem?): Boolean {
when (item?.itemId) {
R.id.filter -> manageFilters()
}
return super.onOptionsItemSelected(item)
}
private fun observeRealmObjects() { private fun observeRealmObjects() {
val realm = getRealm() val realm = getRealm()
@ -113,15 +81,12 @@ class HomeActivity : PokerAnalyticsActivity() {
// observe currency changes // observe currency changes
this.currencies = realm.where(Currency::class.java).findAll() this.currencies = realm.where(Currency::class.java).findAll()
this.currencies.addChangeListener { t, _ -> this.currencies.addChangeListener { t, _ ->
realm.executeTransaction { realm.executeTransaction {
t.forEach { t.forEach {
it.refreshRelatedRatedValues() it.refreshRelatedRatedValues()
} }
} }
} }
} }
/** /**
@ -129,8 +94,6 @@ class HomeActivity : PokerAnalyticsActivity() {
*/ */
private fun initUI() { private fun initUI() {
setSupportActionBar(toolbar)
navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener) navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener)
navigation.selectedItemId = R.id.navigation_history navigation.selectedItemId = R.id.navigation_history
@ -139,7 +102,6 @@ class HomeActivity : PokerAnalyticsActivity() {
viewPager.enablePaging = false viewPager.enablePaging = false
viewPager.adapter = homePagerAdapter viewPager.adapter = homePagerAdapter
updateToolbar(0)
} }
/** /**
@ -161,62 +123,6 @@ class HomeActivity : PokerAnalyticsActivity() {
*/ */
private fun displayFragment(index: Int) { private fun displayFragment(index: Int) {
viewPager.setCurrentItem(index, false) viewPager.setCurrentItem(index, false)
updateToolbar(index)
} }
/**
* Update toolbar
*/
private fun updateToolbar(index: Int) {
when (index) {
//CLEAN
/*
0 -> {
toolbar.titleResId = getString(R.string.feed)
homeMenu?.findItem(R.id.queryWith)?.isVisible = false
}
1 -> {
toolbar.titleResId = getString(R.string.statIds)
homeMenu?.findItem(R.id.queryWith)?.isVisible = false
}
2 -> {
toolbar.titleResId = getString(R.string.services)
homeMenu?.findItem(R.id.queryWith)?.isVisible = false
}
*/
0 -> {
toolbar.title = getString(R.string.feed)
homeMenu?.findItem(R.id.filter)?.isVisible = true
}
1 -> {
toolbar.title = getString(R.string.stats)
homeMenu?.findItem(R.id.filter)?.isVisible = true
}
2 -> {
toolbar.title = getString(R.string.calendar)
homeMenu?.findItem(R.id.filter)?.isVisible = false
}
3 -> {
toolbar.title = getString(R.string.reports)
homeMenu?.findItem(R.id.filter)?.isVisible = false
}
4 -> {
toolbar.title = getString(R.string.more)
homeMenu?.findItem(R.id.filter)?.isVisible = false
}
}
}
/**
* Manage filters
*/
private fun manageFilters() {
val fragment = supportFragmentManager.fragments[viewPager.currentItem]
if (fragment is FilterHandler) {
fragment.manageFilters(fragment = fragment)
}
}
} }

Loading…
Cancel
Save