Skip to content

Commit

Permalink
Showing 3 changed files with 12 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -27,21 +27,6 @@ open class BaseFragment : DaggerFragment() {

val disposable = CompositeDisposable()

override fun onAttach(context: Context?) {
super.onAttach(context)
}

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
}

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
}

override fun onActivityCreated(savedInstanceState: Bundle?) {
super.onActivityCreated(savedInstanceState)
}

override fun onDetach() {
super.onDetach()
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@ import androidx.preference.*
import android.text.TextUtils
import android.view.View
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity

import com.thanksmister.iot.mqtt.alarmpanel.R
import com.thanksmister.iot.mqtt.alarmpanel.persistence.Configuration
@@ -45,6 +46,14 @@ class DeviceSensorsSettingsFragment : PreferenceFragmentCompat(), SharedPreferen
super.onAttach(context)
}

override fun onActivityCreated(savedInstanceState: Bundle?) {
super.onActivityCreated(savedInstanceState)
if((activity as AppCompatActivity).supportActionBar != null) {
(activity as AppCompatActivity).supportActionBar!!.setDisplayHomeAsUpEnabled(true)
(activity as AppCompatActivity).supportActionBar!!.setDisplayShowHomeEnabled(true)
(activity as AppCompatActivity).supportActionBar!!.title = (getString(R.string.sensors_settings))
}
}
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
addPreferencesFromResource(R.xml.preference_device_sensors)
}
Original file line number Diff line number Diff line change
@@ -51,8 +51,11 @@ class SensorsFragment : BaseFragment(), SensorAdapter.OnItemClickListener {
@Inject lateinit var mqttOptions: MQTTOptions

override fun onActivityCreated(savedInstanceState: Bundle?) {

super.onActivityCreated(savedInstanceState)

observeViewModel(sensorViewModel)

if((activity as AppCompatActivity).supportActionBar != null) {
(activity as AppCompatActivity).supportActionBar!!.setDisplayHomeAsUpEnabled(true)
(activity as AppCompatActivity).supportActionBar!!.setDisplayShowHomeEnabled(true)

0 comments on commit b1337bc

Please sign in to comment.