Fix: keystore file position.
Ui: Update System UI needn't recreate Activity. Conf: add EventBus proguard config.
This commit is contained in:
10
app/proguard-rules.pro
vendored
10
app/proguard-rules.pro
vendored
@ -28,3 +28,13 @@
|
|||||||
*;
|
*;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
-keepattributes *Annotation*
|
||||||
|
-keepclassmembers class ** {
|
||||||
|
@org.greenrobot.eventbus.Subscribe <methods>;
|
||||||
|
}
|
||||||
|
-keep enum org.greenrobot.eventbus.ThreadMode { *; }
|
||||||
|
|
||||||
|
# Only required if you use AsyncExecutor
|
||||||
|
-keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
|
||||||
|
<init>(java.lang.Throwable);
|
||||||
|
}
|
@ -67,15 +67,15 @@ object NeoPreference {
|
|||||||
return loadBoolean(context!!.getString(key), defaultValue)
|
return loadBoolean(context!!.getString(key), defaultValue)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun loadInt(key: String, defaultValue: Int): Int {
|
fun loadInt(key: String?, defaultValue: Int): Int {
|
||||||
return preference!!.getInt(key, defaultValue)
|
return preference!!.getInt(key, defaultValue)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun loadString(key: String, defaultValue: String?): String {
|
fun loadString(key: String?, defaultValue: String?): String {
|
||||||
return preference!!.getString(key, defaultValue)
|
return preference!!.getString(key, defaultValue)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun loadBoolean(key: String, defaultValue: Boolean): Boolean {
|
fun loadBoolean(key: String?, defaultValue: Boolean): Boolean {
|
||||||
return preference!!.getBoolean(key, defaultValue)
|
return preference!!.getBoolean(key, defaultValue)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -40,7 +40,6 @@ class NeoTermActivity : AppCompatActivity(), ServiceConnection, SharedPreference
|
|||||||
lateinit var fullScreenToggleButton: StatedControlButton
|
lateinit var fullScreenToggleButton: StatedControlButton
|
||||||
var systemShell = true
|
var systemShell = true
|
||||||
var termService: NeoTermService? = null
|
var termService: NeoTermService? = null
|
||||||
var restartRequired = false
|
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
@ -50,7 +49,6 @@ class NeoTermActivity : AppCompatActivity(), ServiceConnection, SharedPreference
|
|||||||
NeoPreference.init(this)
|
NeoPreference.init(this)
|
||||||
|
|
||||||
val fullscreen = NeoPreference.loadBoolean(R.string.key_ui_fullscreen, false)
|
val fullscreen = NeoPreference.loadBoolean(R.string.key_ui_fullscreen, false)
|
||||||
|
|
||||||
if (fullscreen) {
|
if (fullscreen) {
|
||||||
window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
|
window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
|
||||||
WindowManager.LayoutParams.FLAG_FULLSCREEN)
|
WindowManager.LayoutParams.FLAG_FULLSCREEN)
|
||||||
@ -107,10 +105,6 @@ class NeoTermActivity : AppCompatActivity(), ServiceConnection, SharedPreference
|
|||||||
|
|
||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
super.onResume()
|
super.onResume()
|
||||||
if (restartRequired) {
|
|
||||||
restartRequired = false
|
|
||||||
recreate()
|
|
||||||
}
|
|
||||||
PreferenceManager.getDefaultSharedPreferences(this)
|
PreferenceManager.getDefaultSharedPreferences(this)
|
||||||
.registerOnSharedPreferenceChangeListener(this)
|
.registerOnSharedPreferenceChangeListener(this)
|
||||||
tabSwitcher.addListener(object : TabSwitcherListener {
|
tabSwitcher.addListener(object : TabSwitcherListener {
|
||||||
@ -213,7 +207,11 @@ class NeoTermActivity : AppCompatActivity(), ServiceConnection, SharedPreference
|
|||||||
|
|
||||||
override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
|
override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
|
||||||
if (key == getString(R.string.key_ui_fullscreen)) {
|
if (key == getString(R.string.key_ui_fullscreen)) {
|
||||||
restartRequired = true
|
if (NeoPreference.loadBoolean(key, false)) {
|
||||||
|
tabSwitcher.systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN
|
||||||
|
} else {
|
||||||
|
tabSwitcher.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -439,6 +437,7 @@ class NeoTermActivity : AppCompatActivity(), ServiceConnection, SharedPreference
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Suppress("unused")
|
@Suppress("unused")
|
||||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||||
fun onTabCloseEvent(tabCloseEvent: TabCloseEvent) {
|
fun onTabCloseEvent(tabCloseEvent: TabCloseEvent) {
|
||||||
|
Binary file not shown.
@ -1,6 +0,0 @@
|
|||||||
version 1
|
|
||||||
program vi vim neovim
|
|
||||||
define :q true
|
|
||||||
define / false
|
|
||||||
define dd true
|
|
||||||
define :w true
|
|
Reference in New Issue
Block a user