diff --git a/app/src/main/java/com/cyb3rko/logviewerforopenhab/Utils.kt b/app/src/main/java/com/cyb3rko/logviewerforopenhab/Utils.kt
index 4cd38e7..fd0202e 100644
--- a/app/src/main/java/com/cyb3rko/logviewerforopenhab/Utils.kt
+++ b/app/src/main/java/com/cyb3rko/logviewerforopenhab/Utils.kt
@@ -33,6 +33,7 @@ internal const val HOSTNAME_STRING = "hostname_string"
internal const val LINK = "link"
internal const val NIGHTMODE = "nightmode"
internal const val ORIENTATION = "orientation"
+internal const val OPENHAB_VERSION = "openhab_version"
internal const val PORT_CHECK = "port_check"
internal const val PORT_INT = "port_int"
internal const val TEXTSIZE_AUTO = "textsize_auto"
diff --git a/app/src/main/java/com/cyb3rko/logviewerforopenhab/fragments/PreferenceFragment.kt b/app/src/main/java/com/cyb3rko/logviewerforopenhab/fragments/PreferenceFragment.kt
index 6fcbe44..afd7d22 100644
--- a/app/src/main/java/com/cyb3rko/logviewerforopenhab/fragments/PreferenceFragment.kt
+++ b/app/src/main/java/com/cyb3rko/logviewerforopenhab/fragments/PreferenceFragment.kt
@@ -33,22 +33,25 @@ class PreferenceFragment : PreferenceFragmentCompat() {
private lateinit var mySPR: SharedPreferences
private lateinit var nightModeList: ListPreference
private lateinit var orientationList: ListPreference
+ private lateinit var openhabVersionList: ListPreference
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
addPreferencesFromResource(R.xml.preferences)
preferenceManager.sharedPreferencesName = SHARED_PREFERENCE
mySPR = preferenceManager.sharedPreferences
+ openhabVersionList = findPreference(OPENHAB_VERSION)!!
+ hideTopbarSwitch = findPreference(HIDE_TOPBAR)!!
orientationList = findPreference(ORIENTATION)!!
connectionOverviewSwitch = findPreference(CONNECTION_OVERVIEW_ENABLED)!!
nightModeList = findPreference(NIGHTMODE)!!
- hideTopbarSwitch = findPreference(HIDE_TOPBAR)!!
analyticsCollectionSwitch = findPreference(ANALYTICS_COLLECTION)!!
crashlyticsCollectionSwitch = findPreference(CRASHLYTICS_COLLECTION)!!
+ openhabVersionList.value = mySPR.getString(OPENHAB_VERSION, "3")
+ hideTopbarSwitch.isChecked = mySPR.getBoolean(HIDE_TOPBAR, false)
orientationList.value = mySPR.getString(ORIENTATION, ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED.toString())
connectionOverviewSwitch.isChecked = mySPR.getBoolean(CONNECTION_OVERVIEW_ENABLED, true)
nightModeList.value = mySPR.getString(NIGHTMODE, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM.toString())
- hideTopbarSwitch.isChecked = mySPR.getBoolean(HIDE_TOPBAR, false)
analyticsCollectionSwitch.isChecked = mySPR.getBoolean(ANALYTICS_COLLECTION, true)
crashlyticsCollectionSwitch.isChecked = mySPR.getBoolean(CRASHLYTICS_COLLECTION, true)
}
diff --git a/app/src/main/java/com/cyb3rko/logviewerforopenhab/fragments/WebViewFragment.kt b/app/src/main/java/com/cyb3rko/logviewerforopenhab/fragments/WebViewFragment.kt
index 85ace26..05dc13f 100644
--- a/app/src/main/java/com/cyb3rko/logviewerforopenhab/fragments/WebViewFragment.kt
+++ b/app/src/main/java/com/cyb3rko/logviewerforopenhab/fragments/WebViewFragment.kt
@@ -118,8 +118,14 @@ class WebViewFragment : Fragment() {
override fun onPageFinished(view: WebView?, url: String?) {
if (mySPR.getBoolean(HIDE_TOPBAR, false)) {
- view?.loadUrl("javascript:document.getElementsByClassName(\"topbar navbar navbar-inverse navbar-fixed-top\")[0].setAttribute" +
- "(\"style\",\"display:none;\");")
+ val command = when (mySPR.getString(OPENHAB_VERSION, "3")) {
+ "3" -> "javascript:document.getElementsByClassName(\"topbar navbar navbar-inverse fixed-top\")[0].setAttribute(\"style\"," +
+ "\"display:none;\");"
+ "2" -> "javascript:document.getElementsByClassName(\"topbar navbar navbar-inverse navbar-fixed-top\")[0].setAttribute" +
+ "(\"style\",\"display:none;\");"
+ else -> "javascript:"
+ }
+ view?.loadUrl(command)
}
}
}
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e2f4446..dc8089f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -52,6 +52,11 @@
About
End User Consent
+ openHAB Log
+ openHAB Version
+ Select the openHAB version you are using
+ Hide topbar
+ Hide the topbar of the log
User Experience
Data Collection
Orientation
@@ -60,8 +65,6 @@
En-/Disable the overview of recent connections in the Navigation Drawer
Night Mode
Toggle the dark appearance of the app (logview excluded)
- Hide topbar
- Hide the topbar of the log
Analytics Data Collection
En-/Disable data collection via Firebase Analytics
Crashlytics Data Collection
diff --git a/app/src/main/res/values/orientations.xml b/app/src/main/res/values/preference_data.xml
similarity index 56%
rename from app/src/main/res/values/orientations.xml
rename to app/src/main/res/values/preference_data.xml
index 2588b52..89277c0 100644
--- a/app/src/main/res/values/orientations.xml
+++ b/app/src/main/res/values/preference_data.xml
@@ -10,4 +10,13 @@
- 1
- 0
+
+
+ - openHAB 3
+ - openHAB 2
+
+
+ - 3
+ - 2
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e2f4446..dc8089f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -52,6 +52,11 @@
About
End User Consent
+ openHAB Log
+ openHAB Version
+ Select the openHAB version you are using
+ Hide topbar
+ Hide the topbar of the log
User Experience
Data Collection
Orientation
@@ -60,8 +65,6 @@
En-/Disable the overview of recent connections in the Navigation Drawer
Night Mode
Toggle the dark appearance of the app (logview excluded)
- Hide topbar
- Hide the topbar of the log
Analytics Data Collection
En-/Disable data collection via Firebase Analytics
Crashlytics Data Collection
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 562c55b..6b68dd8 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -2,6 +2,28 @@
+
+
+
+
+
+
+
+
@@ -31,13 +53,6 @@
android:entryValues="@array/night_modes_values"
android:key="nightmode"/>
-
-