Fixes warnings

filterfix
Laurent 5 years ago
parent 42a55cd3da
commit beb1509388
  1. 8
      app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
  2. 4
      app/src/main/java/net/pokeranalytics/android/ui/activity/GraphActivity.kt
  3. 4
      app/src/main/java/net/pokeranalytics/android/ui/activity/components/ReportActivity.kt

@ -165,20 +165,24 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
private var startDateHourMinuteComponent: Double? = null private var startDateHourMinuteComponent: Double? = null
get() { get() {
if (field == null && startDate != null) { if (field == null && startDate != null) {
startDate?.let { date ->
val cal = Calendar.getInstance() val cal = Calendar.getInstance()
cal.time = startDate cal.time = date
field = cal.hourMinute() field = cal.hourMinute()
} }
}
return field return field
} }
private var endDateHourMinuteComponent: Double? = null private var endDateHourMinuteComponent: Double? = null
get() { get() {
if (field == null && endDate != null) { if (field == null && endDate != null) {
endDate?.let { date ->
val cal = Calendar.getInstance() val cal = Calendar.getInstance()
cal.time = endDate cal.time = date
field = cal.hourMinute() field = cal.hourMinute()
} }
}
return field return field
} }

@ -3,7 +3,7 @@ package net.pokeranalytics.android.ui.activity
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.ViewModelProvider
import com.github.mikephil.charting.data.BarDataSet import com.github.mikephil.charting.data.BarDataSet
import com.github.mikephil.charting.data.LineDataSet import com.github.mikephil.charting.data.LineDataSet
import kotlinx.android.synthetic.main.activity_graph.* import kotlinx.android.synthetic.main.activity_graph.*
@ -18,7 +18,7 @@ import net.pokeranalytics.android.ui.viewmodel.ViewModelHolder
class GraphActivity : BaseActivity(), ViewModelHolder { class GraphActivity : BaseActivity(), ViewModelHolder {
override val model: GraphViewModel by lazy { override val model: GraphViewModel by lazy {
ViewModelProviders.of(this).get(GraphViewModel::class.java) ViewModelProvider(this).get(GraphViewModel::class.java)
} }
companion object { companion object {

@ -4,7 +4,7 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.ViewModelProvider
import net.pokeranalytics.android.calculus.Report import net.pokeranalytics.android.calculus.Report
import net.pokeranalytics.android.calculus.Stat import net.pokeranalytics.android.calculus.Stat
import net.pokeranalytics.android.ui.viewmodel.ReportViewModel import net.pokeranalytics.android.ui.viewmodel.ReportViewModel
@ -15,7 +15,7 @@ class ReportParameters(var report: Report, var title: String, var stat: Stat? =
abstract class ReportActivity : BaseActivity(), ViewModelHolder { abstract class ReportActivity : BaseActivity(), ViewModelHolder {
override val model: ReportViewModel by lazy { override val model: ReportViewModel by lazy {
ViewModelProviders.of(this).get(ReportViewModel::class.java) ViewModelProvider(this).get(ReportViewModel::class.java)
} }
companion object { companion object {

Loading…
Cancel
Save