updated l icons

improved compose screen

twidere/src/fdroid/res/menu/menu_osm_viewer.xml

@@ -3,7 +3,7 @@
 
 	<item
 		android:id="@id/center"
-		android:icon="@drawable/ic_action_mylocation"
+		android:icon="@drawable/ic_action_my_location"
 		android:showAsAction="always"
 		android:title="@string/center"/>
 

twidere/src/google/res/menu/menu_google_maps_viewer.xml

@@ -3,7 +3,7 @@
 
 	<item
 		android:id="@id/center"
-		android:icon="@drawable/ic_action_mylocation"
+		android:icon="@drawable/ic_action_my_location"
 		android:showAsAction="always"
 		android:title="@string/center"/>
 

twidere/src/main/java/org/mariotaku/twidere/Constants.java

@@ -109,6 +109,7 @@ public interface Constants extends TwidereConstants {
     public static final int MENU_OPEN_WITH_ACCOUNT = R.id.open_with_account;
     public static final int MENU_ACCOUNTS = R.id.accounts;
     public static final int MENU_INVERSE_SELECTION = R.id.inverse_selection;
+    public static final int MENU_EDIT_MEDIAS = R.id.edit_medias;
 
     public static final int LINK_ID_STATUS = 1;
     public static final int LINK_ID_USER = 2;

twidere/src/main/java/org/mariotaku/twidere/activity/support/ComposeActivity.java

@@ -100,6 +100,7 @@ import org.mariotaku.twidere.util.ParseUtils;
 import org.mariotaku.twidere.util.SharedPreferencesWrapper;
 import org.mariotaku.twidere.util.ThemeUtils;
 import org.mariotaku.twidere.util.TwidereValidator;
+import org.mariotaku.twidere.util.Utils;
 import org.mariotaku.twidere.util.accessor.ViewAccessor;
 import org.mariotaku.twidere.view.StatusTextCountView;
 import org.mariotaku.twidere.view.holder.StatusViewHolder;
@@ -222,11 +223,13 @@ public class ComposeActivity extends BaseSupportDialogActivity implements TextWa
 
     public boolean handleMenuItem(final MenuItem item) {
         switch (item.getItemId()) {
-            case MENU_TAKE_PHOTO: {
+            case MENU_TAKE_PHOTO:
+            case R.id.take_photo_sub_item: {
                 takePhoto();
                 break;
             }
-            case MENU_ADD_IMAGE: {
+            case MENU_ADD_IMAGE:
+            case R.id.add_image_sub_item: {
                 if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT || !openDocument()) {
                     pickImage();
                 }
@@ -647,7 +650,10 @@ public class ComposeActivity extends BaseSupportDialogActivity implements TextWa
         final Intent composeExtensionsIntent = new Intent(INTENT_ACTION_EXTENSION_COMPOSE);
         addIntentToMenu(this, menu, composeExtensionsIntent, MENU_GROUP_COMPOSE_EXTENSION);
         final Intent imageExtensionsIntent = new Intent(INTENT_ACTION_EXTENSION_EDIT_IMAGE);
-        addIntentToMenu(this, menu, imageExtensionsIntent, MENU_GROUP_IMAGE_EXTENSION);
+        final MenuItem mediasMenuItem = menu.findItem(R.id.medias_menu);
+        if (mediasMenuItem != null && mediasMenuItem.hasSubMenu()) {
+            addIntentToMenu(this, mediasMenuItem.getSubMenu(), imageExtensionsIntent, MENU_GROUP_IMAGE_EXTENSION);
+        }
         setMenu();
         updateAccountSelection();
         updateMediasPreview();
@@ -881,6 +887,10 @@ public class ComposeActivity extends BaseSupportDialogActivity implements TextWa
         return !mMediaPreviewAdapter.isEmpty();
     }
 
+    private int getMediaCount() {
+        return mMediaPreviewAdapter.getCount();
+    }
+
     private boolean isQuotingProtectedStatus() {
         if (INTENT_ACTION_QUOTE.equals(getIntent().getAction()) && mInReplyToStatus != null)
             return mInReplyToStatus.user_is_protected && mInReplyToStatus.account_id != mInReplyToStatus.user_id;
@@ -936,29 +946,7 @@ public class ComposeActivity extends BaseSupportDialogActivity implements TextWa
         // iconAddImage.clearColorFilter();
         // }
         // }
-        final MenuItem itemAttachLocation = menu.findItem(MENU_ADD_LOCATION);
-        if (itemAttachLocation != null) {
-            final boolean attachLocation = mPreferences.getBoolean(KEY_ATTACH_LOCATION, false);
-            if (attachLocation && getLocation()) {
-                itemAttachLocation.setChecked(true);
-            } else {
-                setProgressVisibility(false);
-                mPreferences.edit().putBoolean(KEY_ATTACH_LOCATION, false).apply();
-                itemAttachLocation.setChecked(false);
-            }
-        }
-        final MenuItem viewItem = menu.findItem(MENU_VIEW);
-        if (viewItem != null) {
-            viewItem.setVisible(mInReplyToStatus != null);
-        }
-        menu.setGroupEnabled(MENU_GROUP_IMAGE_EXTENSION, hasMedia);
-        menu.setGroupVisible(MENU_GROUP_IMAGE_EXTENSION, hasMedia);
-        final MenuItem itemToggleSensitive = menu.findItem(MENU_TOGGLE_SENSITIVE);
-        if (itemToggleSensitive != null) {
-            itemToggleSensitive.setVisible(hasMedia);
-            itemToggleSensitive.setEnabled(hasMedia);
-            itemToggleSensitive.setChecked(hasMedia && mIsPossiblySensitive);
-        }
+
     }
 
     private boolean setComposeTitle(final Intent intent) {
@@ -995,8 +983,43 @@ public class ComposeActivity extends BaseSupportDialogActivity implements TextWa
 
     private void setMenu() {
         if (mMenuBar == null) return;
-        final Menu bottomMenu = mMenuBar.getMenu();
-        setCommonMenu(bottomMenu);
+        final Menu menu = mMenuBar.getMenu();
+        final MenuItem itemAttachLocation = menu.findItem(MENU_ADD_LOCATION);
+        if (itemAttachLocation != null) {
+            final boolean attachLocation = mPreferences.getBoolean(KEY_ATTACH_LOCATION, false);
+            if (attachLocation && getLocation()) {
+                itemAttachLocation.setChecked(true);
+            } else {
+                setProgressVisibility(false);
+                mPreferences.edit().putBoolean(KEY_ATTACH_LOCATION, false).apply();
+                itemAttachLocation.setChecked(false);
+            }
+        }
+        final MenuItem viewItem = menu.findItem(MENU_VIEW);
+        if (viewItem != null) {
+            viewItem.setVisible(mInReplyToStatus != null);
+        }
+        final boolean hasMedia = hasMedia(), hasInReplyTo = mInReplyToStatus != null;
+
+        /*
+         * No media & Not reply: [Take photo][Add image][Attach location][Drafts]
+         * Has media & Not reply: [Take photo][Medias menu][Attach location][Drafts]
+         * Is reply: [Medias menu][View status][Attach location][Drafts]
+         */
+        Utils.setMenuItemAvailability(menu, MENU_TAKE_PHOTO, !hasInReplyTo);
+        Utils.setMenuItemAvailability(menu, R.id.take_photo_sub_item, hasInReplyTo);
+        Utils.setMenuItemAvailability(menu, MENU_ADD_IMAGE, !hasMedia && !hasInReplyTo);
+        Utils.setMenuItemAvailability(menu, MENU_VIEW, hasInReplyTo);
+        Utils.setMenuItemAvailability(menu, R.id.medias_menu, hasMedia || hasInReplyTo);
+        Utils.setMenuItemAvailability(menu, MENU_TOGGLE_SENSITIVE, hasMedia);
+        Utils.setMenuItemAvailability(menu, MENU_EDIT_MEDIAS, hasMedia);
+
+        menu.setGroupEnabled(MENU_GROUP_IMAGE_EXTENSION, hasMedia);
+        menu.setGroupVisible(MENU_GROUP_IMAGE_EXTENSION, hasMedia);
+        final MenuItem itemToggleSensitive = menu.findItem(MENU_TOGGLE_SENSITIVE);
+        if (itemToggleSensitive != null) {
+            itemToggleSensitive.setChecked(hasMedia && mIsPossiblySensitive);
+        }
         mMenuBar.show();
     }
 

twidere/src/main/java/org/mariotaku/twidere/fragment/support/AccountsDrawerFragment.java

@@ -470,7 +470,7 @@ public class AccountsDrawerFragment extends BaseSupportListFragment implements L
             add(new OptionItem(R.string.accounts, R.drawable.ic_action_accounts, MENU_ACCOUNTS));
             add(new OptionItem(R.string.drafts, R.drawable.ic_action_draft, MENU_DRAFTS));
             add(new OptionItem(R.string.filters, R.drawable.ic_action_speaker_muted, MENU_FILTERS));
-            add(new OptionItem(R.string.settings, R.drawable.ic_action_preferences, MENU_SETTINGS));
+            add(new OptionItem(R.string.settings, R.drawable.ic_action_settings, MENU_SETTINGS));
         }
 
     }

twidere/src/main/java/org/mariotaku/twidere/util/CustomTabUtils.java

@@ -103,7 +103,7 @@ public class CustomTabUtils implements Constants {
 		if (Utils.hasStaggeredTimeline()) {
 			CUSTOM_TABS_CONFIGURATION_MAP.put(TAB_TYPE_STAGGERED_HOME_TIMELINE, new CustomTabConfiguration(
 					StaggeredHomeTimelineFragment.class, R.string.staggered_home_timeline,
-					R.drawable.ic_action_staggered, CustomTabConfiguration.ACCOUNT_OPTIONAL,
+					R.drawable.ic_action_view_quilt, CustomTabConfiguration.ACCOUNT_OPTIONAL,
 					CustomTabConfiguration.FIELD_TYPE_NONE, 11, false));
 		}
 
@@ -116,7 +116,7 @@ public class CustomTabUtils implements Constants {
 		CUSTOM_TABS_ICON_NAME_MAP.put("message", R.drawable.ic_action_message);
 		CUSTOM_TABS_ICON_NAME_MAP.put("quote", R.drawable.ic_action_quote);
 		CUSTOM_TABS_ICON_NAME_MAP.put("search", R.drawable.ic_action_search);
-		CUSTOM_TABS_ICON_NAME_MAP.put("staggered", R.drawable.ic_action_staggered);
+		CUSTOM_TABS_ICON_NAME_MAP.put("staggered", R.drawable.ic_action_view_quilt);
 		CUSTOM_TABS_ICON_NAME_MAP.put("star", R.drawable.ic_action_star);
 		CUSTOM_TABS_ICON_NAME_MAP.put("trends", R.drawable.ic_action_trends);
 		CUSTOM_TABS_ICON_NAME_MAP.put("twidere", R.drawable.ic_action_twidere);