Replace kotlin synthetic by new view bindings

kmm
Laurent 5 years ago
parent c59d041d0f
commit 191fc606a2
  1. 12
      app/src/main/java/net/pokeranalytics/android/ui/activity/GDPRActivity.kt
  2. 10
      app/src/main/java/net/pokeranalytics/android/ui/activity/GraphActivity.kt
  3. 15
      app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt

@ -3,12 +3,13 @@ package net.pokeranalytics.android.ui.activity
import android.content.Context
import android.content.Intent
import android.os.Bundle
import kotlinx.android.synthetic.main.activity_gdpr.*
import net.pokeranalytics.android.R
import net.pokeranalytics.android.databinding.ActivityGdprBinding
import net.pokeranalytics.android.ui.activity.components.BaseActivity
class GDPRActivity : BaseActivity() {
private lateinit var binding: ActivityGdprBinding
companion object {
fun newInstance(context: Context) {
val intent = Intent(context, GDPRActivity::class.java)
@ -18,7 +19,8 @@ class GDPRActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_gdpr)
binding = ActivityGdprBinding.inflate(layoutInflater)
setContentView(binding.root)
initUI()
}
@ -27,10 +29,8 @@ class GDPRActivity : BaseActivity() {
* Init UI
*/
private fun initUI() {
setSupportActionBar(toolbar)
setSupportActionBar(binding.toolbar)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
}
}

@ -6,8 +6,8 @@ import android.os.Bundle
import androidx.lifecycle.ViewModelProvider
import com.github.mikephil.charting.data.BarDataSet
import com.github.mikephil.charting.data.LineDataSet
import kotlinx.android.synthetic.main.activity_graph.*
import net.pokeranalytics.android.R
import net.pokeranalytics.android.databinding.ActivityGraphBinding
import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.ui.activity.components.BaseActivity
import net.pokeranalytics.android.ui.fragment.GraphFragment
@ -54,12 +54,16 @@ class GraphActivity : BaseActivity(), ViewModelHolder {
}
private lateinit var binding: ActivityGraphBinding
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_graph)
binding = ActivityGraphBinding.inflate(layoutInflater)
setContentView(binding.root)
initUI()
}
/**
* Init UI
*/
@ -68,7 +72,7 @@ class GraphActivity : BaseActivity(), ViewModelHolder {
this.model.title = activityTitle
this.model.title?.let {
setSupportActionBar(toolbar)
setSupportActionBar(binding.toolbar)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
title = activityTitle
activityTitle = null

@ -7,9 +7,9 @@ import android.os.Build
import android.os.Bundle
import com.google.android.material.bottomnavigation.BottomNavigationView
import io.realm.RealmResults
import kotlinx.android.synthetic.main.activity_home.*
import net.pokeranalytics.android.BuildConfig
import net.pokeranalytics.android.R
import net.pokeranalytics.android.databinding.ActivityHomeBinding
import net.pokeranalytics.android.model.realm.Currency
import net.pokeranalytics.android.ui.activity.components.BaseActivity
import net.pokeranalytics.android.ui.adapter.HomePagerAdapter
@ -56,6 +56,8 @@ class HomeActivity : BaseActivity() {
this.homePagerAdapter?.activityResumed()
}
private lateinit var binding: ActivityHomeBinding
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@ -68,7 +70,8 @@ class HomeActivity : BaseActivity() {
}
}
setContentView(R.layout.activity_home)
binding = ActivityHomeBinding.inflate(layoutInflater)
setContentView(binding.root)
observeRealmObjects()
initUI()
@ -141,10 +144,12 @@ class HomeActivity : BaseActivity() {
*/
private fun initUI() {
navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener)
navigation.selectedItemId = R.id.navigation_history
binding.navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener)
binding.navigation.selectedItemId = R.id.navigation_history
homePagerAdapter = HomePagerAdapter(supportFragmentManager)
val viewPager = binding.viewPager
viewPager.offscreenPageLimit = 5
viewPager.enablePaging = false
viewPager.adapter = homePagerAdapter
@ -168,7 +173,7 @@ class HomeActivity : BaseActivity() {
* Display a new fragment
*/
private fun displayFragment(index: Int) {
viewPager.setCurrentItem(index, false)
binding.viewPager.setCurrentItem(index, false)
}
}

Loading…
Cancel
Save