mirror of
https://github.com/Aviortheking/Neo-Store.git
synced 2025-04-24 03:42:15 +00:00
Remove: CursorOwner from Activities
This commit is contained in:
parent
cd74a6cf17
commit
2d0fe2fe61
@ -20,7 +20,6 @@ import com.looker.droidify.ContextWrapperX
|
|||||||
import com.looker.droidify.MainApplication
|
import com.looker.droidify.MainApplication
|
||||||
import com.looker.droidify.R
|
import com.looker.droidify.R
|
||||||
import com.looker.droidify.content.Preferences
|
import com.looker.droidify.content.Preferences
|
||||||
import com.looker.droidify.database.CursorOwner
|
|
||||||
import com.looker.droidify.databinding.ActivityMainXBinding
|
import com.looker.droidify.databinding.ActivityMainXBinding
|
||||||
import com.looker.droidify.installer.AppInstaller
|
import com.looker.droidify.installer.AppInstaller
|
||||||
import com.looker.droidify.screen.*
|
import com.looker.droidify.screen.*
|
||||||
@ -66,9 +65,6 @@ class MainActivityX : AppCompatActivity() {
|
|||||||
val db
|
val db
|
||||||
get() = (application as MainApplication).db
|
get() = (application as MainApplication).db
|
||||||
|
|
||||||
lateinit var cursorOwner: CursorOwner
|
|
||||||
private set
|
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
setTheme(Preferences[Preferences.Key.Theme].getResId(resources.configuration))
|
setTheme(Preferences[Preferences.Key.Theme].getResId(resources.configuration))
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
@ -82,16 +78,6 @@ class MainActivityX : AppCompatActivity() {
|
|||||||
}
|
}
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
|
|
||||||
if (savedInstanceState == null) {
|
|
||||||
cursorOwner = CursorOwner()
|
|
||||||
supportFragmentManager.beginTransaction()
|
|
||||||
.add(cursorOwner, CursorOwner::class.java.name)
|
|
||||||
.commit()
|
|
||||||
} else {
|
|
||||||
cursorOwner = supportFragmentManager
|
|
||||||
.findFragmentByTag(CursorOwner::class.java.name) as CursorOwner
|
|
||||||
}
|
|
||||||
|
|
||||||
setSupportActionBar(toolbar)
|
setSupportActionBar(toolbar)
|
||||||
|
|
||||||
if (Android.sdk(28) && !Android.Device.isHuaweiEmui) {
|
if (Android.sdk(28) && !Android.Device.isHuaweiEmui) {
|
||||||
|
@ -19,7 +19,6 @@ import com.looker.droidify.ContextWrapperX
|
|||||||
import com.looker.droidify.MainApplication
|
import com.looker.droidify.MainApplication
|
||||||
import com.looker.droidify.R
|
import com.looker.droidify.R
|
||||||
import com.looker.droidify.content.Preferences
|
import com.looker.droidify.content.Preferences
|
||||||
import com.looker.droidify.database.CursorOwner
|
|
||||||
import com.looker.droidify.databinding.ActivityPrefsXBinding
|
import com.looker.droidify.databinding.ActivityPrefsXBinding
|
||||||
import com.looker.droidify.installer.AppInstaller
|
import com.looker.droidify.installer.AppInstaller
|
||||||
import com.looker.droidify.service.Connection
|
import com.looker.droidify.service.Connection
|
||||||
@ -62,9 +61,6 @@ class PrefsActivityX : AppCompatActivity() {
|
|||||||
val db
|
val db
|
||||||
get() = (application as MainApplication).db
|
get() = (application as MainApplication).db
|
||||||
|
|
||||||
lateinit var cursorOwner: CursorOwner
|
|
||||||
private set
|
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
setTheme(Preferences[Preferences.Key.Theme].getResId(resources.configuration))
|
setTheme(Preferences[Preferences.Key.Theme].getResId(resources.configuration))
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
@ -78,16 +74,6 @@ class PrefsActivityX : AppCompatActivity() {
|
|||||||
}
|
}
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
|
|
||||||
if (savedInstanceState == null) {
|
|
||||||
cursorOwner = CursorOwner()
|
|
||||||
supportFragmentManager.beginTransaction()
|
|
||||||
.add(cursorOwner, CursorOwner::class.java.name)
|
|
||||||
.commit()
|
|
||||||
} else {
|
|
||||||
cursorOwner = supportFragmentManager
|
|
||||||
.findFragmentByTag(CursorOwner::class.java.name) as CursorOwner
|
|
||||||
}
|
|
||||||
|
|
||||||
setSupportActionBar(toolbar)
|
setSupportActionBar(toolbar)
|
||||||
|
|
||||||
toolbar.isFocusableInTouchMode = true
|
toolbar.isFocusableInTouchMode = true
|
||||||
|
Loading…
x
Reference in New Issue
Block a user