Readding the relocated publish button

mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java

@@ -291,6 +291,19 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		emojiKeyboard.setListener(this::onCustomEmojiClick);
 
 		View view=inflater.inflate(R.layout.fragment_compose, container, false);
+
+		if(GlobalUserPreferences.relocatePublishButton){
+			publishButton=view.findViewById(R.id.publish);
+//			publishButton.setText(editingStatus==null || redraftStatus ? R.string.publish : R.string.save);
+			publishButton.setEllipsize(TextUtils.TruncateAt.END);
+			publishButton.setOnClickListener(this::onPublishClick);
+			publishButton.setSingleLine(true);
+			publishButton.setVisibility(View.VISIBLE);
+
+			draftsBtn=view.findViewById(R.id.drafts_btn);
+			draftsBtn.setVisibility(View.VISIBLE);
+		}
+
 		mainEditText=view.findViewById(R.id.toot_text);
 		mainEditTextWrap=view.findViewById(R.id.toot_text_wrap);
 		charCounter=view.findViewById(R.id.char_counter);
@@ -729,7 +742,16 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		item.setActionView(wrap);
 		item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 
-		draftsBtn = wrap.findViewById(R.id.drafts_btn);
+		if(!GlobalUserPreferences.relocatePublishButton){
+			publishButton = wrap.findViewById(R.id.publish_btn);
+			publishButton.setOnClickListener(this::onPublishClick);
+			publishButton.setVisibility(View.VISIBLE);
+
+			draftsBtn = wrap.findViewById(R.id.drafts_btn);
+			draftsBtn.setVisibility(View.VISIBLE);
+		}
+
+//		draftsBtn = wrap.findViewById(R.id.drafts_btn);
 		draftOptionsPopup = new PopupMenu(getContext(), draftsBtn);
 		draftOptionsPopup.inflate(R.menu.compose_more);
 		draftMenuItem = draftOptionsPopup.getMenu().findItem(R.id.draft);
@@ -746,12 +768,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		});
 		UiUtils.enablePopupMenuIcons(getContext(), draftOptionsPopup);
 
-		publishButton = wrap.findViewById(R.id.publish_btn);
+
 		languageButton = wrap.findViewById(R.id.language_btn);
 		sendProgress = wrap.findViewById(R.id.send_progress);
 		sendError = wrap.findViewById(R.id.send_error);
 
-		publishButton.setOnClickListener(this::onPublishClick);
 		draftsBtn.setOnClickListener(v-> draftOptionsPopup.show());
 		draftsBtn.setOnTouchListener(draftOptionsPopup.getDragToOpenListener());
 		updateScheduledAt(scheduledAt != null ? scheduledAt : scheduledStatus != null ? scheduledStatus.scheduledAt : null);
@@ -850,6 +871,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 	private void resetPublishButtonText() {
 		int publishText = editingStatus==null || redraftStatus ? R.string.publish : R.string.save;
+		if(GlobalUserPreferences.relocatePublishButton){
+			return;
+		}
 		if (publishText == R.string.publish && !GlobalUserPreferences.publishButtonText.isEmpty()) {
 			publishButton.setText(GlobalUserPreferences.publishButtonText);
 		} else {
@@ -1620,7 +1644,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				scheduleDraftText.setText(R.string.sk_compose_draft);
 				scheduleDraftText.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_fluent_drafts_20_regular, 0, 0, 0);
 				scheduleDraftDismiss.setContentDescription(getString(R.string.sk_compose_no_draft));
-				draftsBtn.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_fluent_drafts_20_filled, 0, 0, 0);
+				draftsBtn.setCompoundDrawablesWithIntrinsicBounds(GlobalUserPreferences.relocatePublishButton ? R.drawable.ic_fluent_drafts_24_filled : R.drawable.ic_fluent_drafts_20_filled, 0, 0, 0);
 				publishButton.setText(scheduledStatus != null && scheduledStatus.scheduledAt.isAfter(DRAFTS_AFTER_INSTANT)
 						? R.string.save : R.string.sk_draft);
 			} else {
@@ -1637,7 +1661,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 						? R.string.save : R.string.sk_schedule);
 			}
 		} else {
-			draftsBtn.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_fluent_clock_20_regular, 0, 0, 0);
+			draftsBtn.setCompoundDrawablesWithIntrinsicBounds(GlobalUserPreferences.relocatePublishButton ? R.drawable.ic_fluent_clock_24_regular : R.drawable.ic_fluent_clock_20_regular, 0, 0, 0);
 			resetPublishButtonText();
 		}
 	}

mastodon/src/main/res/layout/compose_action.xml

@@ -48,6 +48,7 @@
         android:drawableTint="?android:textColorSecondary"
         android:textColor="?android:textColorSecondary"
         android:background="@drawable/bg_text_button"
+        android:visibility="gone"
         android:contentDescription="@string/sk_schedule_or_draft"
         android:tooltipText="@string/sk_schedule_or_draft" />
 
@@ -56,6 +57,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:singleLine="true"
-        android:ellipsize="end" />
+        android:ellipsize="end"
+        android:visibility="gone"
+        />
 
 </LinearLayout>

mastodon/src/main/res/layout/fragment_compose.xml

@@ -381,6 +381,20 @@
 				android:tooltipText="@string/post_visibility"
 				android:src="@drawable/ic_fluent_earth_24_regular"/>
 
+			<Button
+				android:id="@+id/drafts_btn"
+				android:layout_width="24dp"
+				android:layout_height="24dp"
+				android:padding="0px"
+				android:layout_marginEnd="12dp"
+				android:drawableStart="@drawable/ic_fluent_clock_24_regular"
+				android:drawableTint="@color/compose_button"
+				android:textColor="?android:textColorSecondary"
+				android:background="?android:attr/selectableItemBackgroundBorderless"
+				android:visibility="gone"
+				android:contentDescription="@string/sk_schedule_or_draft"
+				android:tooltipText="@string/sk_schedule_or_draft" />
+
 			<Space
 				android:layout_width="0px"
 				android:layout_height="1px"
@@ -413,7 +427,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_marginStart="12dp"
-				android:visibility="visible"
+				android:visibility="gone"
 				android:tooltipText="@string/publish"
 				android:drawableStart="@drawable/ic_fluent_send_24_selector"
 				/>