Removed some useless settings and updated CHANGELOG

CHANGELOG.txt

@@ -2,9 +2,13 @@
 
 musikdroid:
 
+* added a new "offline" tab to the browse screen
+* moved settings and other overflow options to the left side of the main
+  screen's toolbar.
 * added settings > advanced > diagnostics screen to show app runtime, wakelock
   acquisition time and status, and service status.
 * added the ability to seek playback on secondary screens
+* removed some old settings that are no longer useful
 * updated to AndroidX
 
 --------------------------------------------------------------------------------

src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/websocket/WebSocketService.kt

@@ -552,9 +552,7 @@ class WebSocketService constructor(private val context: Context) {
                 socket = factory.createSocket(host, CONNECTION_TIMEOUT_MILLIS)
                 socket?.addListener(webSocketAdapter)
 
-                if (prefs.getBoolean(Prefs.Key.MESSAGE_COMPRESSION_ENABLED, Prefs.Default.MESSAGE_COMPRESSION_ENABLED)) {
                 socket.addExtension(WebSocketExtension.PERMESSAGE_DEFLATE)
-                }
 
                 socket.connect()
                 socket.pingInterval = PING_INTERVAL_MILLIS

src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/home/activity/MainActivity.kt

@@ -20,9 +20,6 @@ import io.casey.musikcube.remote.service.playback.RepeatMode
 import io.casey.musikcube.remote.service.playback.impl.remote.Metadata
 import io.casey.musikcube.remote.service.websocket.WebSocketService
 import io.casey.musikcube.remote.service.websocket.model.IDataProvider
-import io.casey.musikcube.remote.ui.albums.activity.AlbumBrowseActivity
-import io.casey.musikcube.remote.ui.category.activity.CategoryBrowseActivity
-import io.casey.musikcube.remote.ui.category.constant.NavigationType
 import io.casey.musikcube.remote.ui.home.fragment.InvalidPasswordDialogFragment
 import io.casey.musikcube.remote.ui.home.view.MainMetadataView
 import io.casey.musikcube.remote.ui.navigation.Navigate
@@ -30,12 +27,14 @@ import io.casey.musikcube.remote.ui.settings.activity.RemoteSettingsActivity
 import io.casey.musikcube.remote.ui.settings.activity.SettingsActivity
 import io.casey.musikcube.remote.ui.settings.constants.Prefs
 import io.casey.musikcube.remote.ui.shared.activity.BaseActivity
-import io.casey.musikcube.remote.ui.shared.extension.*
+import io.casey.musikcube.remote.ui.shared.extension.getColorCompat
+import io.casey.musikcube.remote.ui.shared.extension.setCheckWithoutEvent
+import io.casey.musikcube.remote.ui.shared.extension.showSnackbar
+import io.casey.musikcube.remote.ui.shared.extension.toolbar
 import io.casey.musikcube.remote.ui.shared.mixin.DataProviderMixin
 import io.casey.musikcube.remote.ui.shared.mixin.PlaybackMixin
 import io.casey.musikcube.remote.ui.shared.util.Duration
 import io.casey.musikcube.remote.ui.shared.util.UpdateCheck
-import io.casey.musikcube.remote.ui.tracks.activity.TrackListActivity
 
 class MainActivity : BaseActivity() {
     private val handler = Handler()
@@ -250,11 +249,6 @@ class MainActivity : BaseActivity() {
         repeatCb.setOnCheckedChangeListener(null)
     }
 
-    private val disableTabs
-        get() = prefs.getBoolean(
-            Prefs.Key.DISABLE_TABBED_BROWSING,
-            Prefs.Default.DISABLE_TABBED_BROWSING)
-
     private fun bindEventListeners() {
         mainLayout = findViewById(R.id.activity_main)
         metadataView = findViewById(R.id.main_metadata_view)
@@ -310,33 +304,19 @@ class MainActivity : BaseActivity() {
         })
 
         findViewById<View>(R.id.button_albums).setOnClickListener {
-            when (disableTabs) {
+            Navigate.toBrowse(this, Metadata.Category.ALBUM)
-                true -> startActivity(AlbumBrowseActivity.getStartIntent(this))
-                false -> Navigate.toBrowse(this, Metadata.Category.ALBUM)
-            }
         }
 
         findViewById<View>(R.id.button_artists).setOnClickListener {
-            when (disableTabs) {
+            Navigate.toBrowse(this, Metadata.Category.ALBUM_ARTIST)
-                true -> startActivity(CategoryBrowseActivity.getStartIntent(
-                    this, Metadata.Category.ALBUM_ARTIST))
-                false -> Navigate.toBrowse(this, Metadata.Category.ALBUM_ARTIST)
-            }
         }
 
         findViewById<View>(R.id.button_tracks).setOnClickListener {
-            when (disableTabs) {
+            Navigate.toBrowse(this, Metadata.Category.TRACKS)
-                true -> startActivity(TrackListActivity.getStartIntent(this))
-                false -> Navigate.toBrowse(this, Metadata.Category.TRACKS)
-            }
         }
 
         findViewById<View>(R.id.button_playlists).setOnClickListener {
-            when (disableTabs) {
+            Navigate.toBrowse(this, Metadata.Category.PLAYLISTS)
-                true -> startActivity(CategoryBrowseActivity.getStartIntent(
-                    this, Metadata.Category.PLAYLISTS, NavigationType.Tracks))
-                false -> Navigate.toBrowse(this, Metadata.Category.PLAYLISTS)
-            }
         }
 
         findViewById<View>(R.id.button_play_queue).setOnClickListener {

src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/settings/activity/SettingsActivity.kt

@@ -156,12 +156,6 @@ class SettingsActivity : BaseActivity() {
         albumArtCheckbox.isChecked = prefs.getBoolean(
             Keys.LASTFM_ENABLED, Defaults.LASTFM_ENABLED)
 
-        messageCompressionCheckbox.isChecked = prefs.getBoolean(
-            Keys.MESSAGE_COMPRESSION_ENABLED, Defaults.MESSAGE_COMPRESSION_ENABLED)
-
-        disableTabs.isChecked = prefs.getBoolean(
-            Keys.DISABLE_TABBED_BROWSING, Defaults.DISABLE_TABBED_BROWSING)
-
         softwareVolume.isChecked = prefs.getBoolean(
             Keys.SOFTWARE_VOLUME, Defaults.SOFTWARE_VOLUME)
 
@@ -209,7 +203,6 @@ class SettingsActivity : BaseActivity() {
         this.httpPortText = findViewById(R.id.http_port)
         this.passwordText = findViewById(R.id.password)
         this.albumArtCheckbox = findViewById(R.id.album_art_checkbox)
-        this.messageCompressionCheckbox = findViewById(R.id.message_compression)
         this.softwareVolume = findViewById(R.id.software_volume)
         this.bitrateSpinner = findViewById(R.id.transcoder_bitrate_spinner)
         this.cacheSpinner = findViewById(R.id.streaming_disk_cache_spinner)
@@ -217,7 +210,6 @@ class SettingsActivity : BaseActivity() {
         this.sslCheckbox = findViewById(R.id.ssl_checkbox)
         this.certCheckbox = findViewById(R.id.cert_validation)
         this.transferCheckbox = findViewById(R.id.transfer_on_disconnect_checkbox)
-        this.disableTabs = findViewById(R.id.disable_tabbed_browsing)
     }
 
     private fun bindListeners() {
@@ -284,7 +276,6 @@ class SettingsActivity : BaseActivity() {
                 .putInt(Keys.AUDIO_PORT, if (httpPort.isNotEmpty()) httpPort.toInt() else 0)
                 .putString(Keys.PASSWORD, password)
                 .putBoolean(Keys.LASTFM_ENABLED, albumArtCheckbox.isChecked)
-                .putBoolean(Keys.MESSAGE_COMPRESSION_ENABLED, messageCompressionCheckbox.isChecked)
                 .putBoolean(Keys.SOFTWARE_VOLUME, softwareVolume.isChecked)
                 .putBoolean(Keys.SSL_ENABLED, sslCheckbox.isChecked)
                 .putBoolean(Keys.CERT_VALIDATION_DISABLED, certCheckbox.isChecked)
@@ -292,7 +283,6 @@ class SettingsActivity : BaseActivity() {
                 .putInt(Keys.TRANSCODER_BITRATE_INDEX, bitrateSpinner.selectedItemPosition)
                 .putInt(Keys.DISK_CACHE_SIZE_INDEX, cacheSpinner.selectedItemPosition)
                 .putInt(Keys.TITLE_ELLIPSIS_MODE_INDEX, titleEllipsisSpinner.selectedItemPosition)
-                .putBoolean(Keys.DISABLE_TABBED_BROWSING, disableTabs.isChecked)
                 .apply()
 
             if (!softwareVolume.isChecked) {

src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/settings/constants/Prefs.kt

@@ -7,7 +7,6 @@ class Prefs {
         const val AUDIO_PORT = "http_port"
         const val PASSWORD = "password"
         const val LASTFM_ENABLED = "lastfm_enabled"
-        const val MESSAGE_COMPRESSION_ENABLED = "message_compression_enabled"
         const val STREAMING_PLAYBACK = "streaming_playback"
         const val SOFTWARE_VOLUME = "software_volume"
         const val SSL_ENABLED = "ssl_enabled"
@@ -18,7 +17,6 @@ class Prefs {
         const val UPDATE_DIALOG_SUPPRESSED_VERSION = "update_dialog_suppressed_version"
         const val TRANSFER_TO_SERVER_ON_HEADSET_DISCONNECT = "transfer_to_server_on_headset_disconnect"
         const val DEVICE_ID = "device_id"
-        const val DISABLE_TABBED_BROWSING = "disable_tabbed_browsing"
     }
 
     object Default {
@@ -27,7 +25,6 @@ class Prefs {
         const val AUDIO_PORT = 7906
         const val PASSWORD = ""
         const val LASTFM_ENABLED = true
-        const val MESSAGE_COMPRESSION_ENABLED = true
         const val STREAMING_PLAYBACK = false
         const val SOFTWARE_VOLUME = false
         const val SSL_ENABLED = false
@@ -36,7 +33,6 @@ class Prefs {
         const val TRANSFER_TO_SERVER_ON_HEADSET_DISCONNECT = false
         const val DISK_CACHE_SIZE_INDEX = 2
         const val TITLE_ELLIPSIS_SIZE_INDEX = 1
-        const val DISABLE_TABBED_BROWSING = false
     }
 
     companion object {

src/musikdroid/app/src/main/res/layout/settings_activity.xml

@@ -209,23 +209,6 @@
             android:layout_marginLeft="24dp"
             android:text="@string/settings_transfer_to_server_on_disconnect"/>
 
-        <CheckBox
-            android:id="@+id/disable_tabbed_browsing"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="@color/theme_foreground"
-            android:layout_marginLeft="24dp"
-            android:text="@string/settings_disabled_tabbed_browsing"/>
-
-        <CheckBox
-            android:id="@+id/message_compression"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="@color/theme_foreground"
-            android:layout_marginLeft="24dp"
-            android:visibility="gone"
-            android:text="@string/settings_enable_message_compression"/>
-
         <CheckBox
             android:id="@+id/software_volume"
             android:layout_width="match_parent"