Merge pull request #277 from wordpress-mobile/issue/toolbar-media-mode

issue/toolbar-media-mode

Author: theck13

aztec/src/main/kotlin/org/wordpress/aztec/toolbar/AztecToolbar.kt

@@ -26,6 +26,7 @@ class AztecToolbar : FrameLayout, OnMenuItemClickListener {
     private var headingMenu: PopupMenu? = null
     private var sourceEditor: SourceViewEditText? = null
     private var dialogShortcuts: AlertDialog? = null
+    private var isMediaModeEnabled: Boolean = false;
 
     constructor(context: Context) : super(context) {
         initView()
@@ -228,13 +229,15 @@ class AztecToolbar : FrameLayout, OnMenuItemClickListener {
         super.onRestoreInstanceState(savedState.superState)
         val restoredState = savedState.state
         toggleHtmlMode(restoredState.getBoolean("isSourceVisible"))
+        enableMediaMode(restoredState.getBoolean("isMediaMode"))
     }
 
     override fun onSaveInstanceState(): Parcelable {
         val superState = super.onSaveInstanceState()
         val savedState = SourceViewEditText.SavedState(superState)
         val bundle = Bundle()
         bundle.putBoolean("isSourceVisible", sourceEditor?.visibility == View.VISIBLE)
+        bundle.putBoolean("isMediaMode", isMediaModeEnabled)
         savedState.state = bundle
         return savedState
     }
@@ -408,6 +411,21 @@ class AztecToolbar : FrameLayout, OnMenuItemClickListener {
         }
     }
 
+    fun isMediaModeEnabled(): Boolean {
+        return isMediaModeEnabled;
+    }
+
+    fun enableMediaMode(isEnabled: Boolean) {
+        isMediaModeEnabled = isEnabled;
+        ToolbarAction.values().forEach { action ->
+            if (action == ToolbarAction.ADD_MEDIA) {
+                toggleButton(findViewById(action.buttonId), isEnabled)
+            } else {
+                toggleButtonState(findViewById(action.buttonId), !isEnabled)
+            }
+        }
+    }
+
     private fun showDialogShortcuts() {
         val layout = LayoutInflater.from(context).inflate(R.layout.dialog_shortcuts, null)
         val builder = AlertDialog.Builder(context)

aztec/src/main/res/drawable/format_bar_button_media_selector.xml

@@ -4,6 +4,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item android:drawable="@drawable/format_bar_button_media_disabled" android:state_enabled="false" />
+    <item android:drawable="@drawable/format_bar_button_media_highlighted" android:state_checked="true" />
     <item android:drawable="@drawable/format_bar_button_media_highlighted" android:state_pressed="true" />
     <item android:drawable="@drawable/format_bar_button_media_highlighted" android:state_focused="true" />
     <item android:drawable="@drawable/format_bar_button_media" />