diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index d673e0aa4..a96cd5ab2 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -818,11 +818,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
}
private void resetPublishButtonText() {
-// int publishText = editingStatus==null || redraftStatus ? R.string.publish : R.string.save;
+ int publishText = editingStatus==null || redraftStatus ? R.string.publish : R.string.save;
// if (publishText == R.string.publish && !GlobalUserPreferences.publishButtonText.isEmpty()) {
// publishButton.setText(GlobalUserPreferences.publishButtonText);
// } else {
-// publishButton.setText(publishText);
+ publishButton.setText(publishText);
// }
}
diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index db35a12f8..068c2c9a4 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -288,7 +288,7 @@
android:id="@+id/btn_media"
android:layout_width="24dp"
android:layout_height="24dp"
- android:layout_marginEnd="24dp"
+ android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:padding="0px"
android:tint="@color/compose_button"
@@ -301,7 +301,7 @@
android:id="@+id/btn_poll"
android:layout_width="24dp"
android:layout_height="24dp"
- android:layout_marginEnd="24dp"
+ android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:padding="0px"
android:tint="@color/compose_button"
@@ -314,7 +314,7 @@
android:id="@+id/btn_emoji"
android:layout_width="24dp"
android:layout_height="24dp"
- android:layout_marginEnd="24dp"
+ android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:padding="0px"
android:tint="@color/compose_button"
@@ -327,7 +327,7 @@
android:id="@+id/btn_spoiler"
android:layout_width="24dp"
android:layout_height="24dp"
- android:layout_marginEnd="24dp"
+ android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:padding="0px"
android:tint="@color/compose_button"
@@ -340,7 +340,7 @@
android:id="@+id/btn_visibility"
android:layout_width="24dp"
android:layout_height="24dp"
- android:layout_marginEnd="24dp"
+ android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:padding="0px"
android:tint="@color/compose_button"
@@ -375,16 +375,17 @@
android:textColor="?android:textColorSecondary"
tools:text="500"/>
+
+
-
diff --git a/mastodon/src/main/res/menu/profile_own.xml b/mastodon/src/main/res/menu/profile_own.xml
index 8793a967d..07acdf591 100644
--- a/mastodon/src/main/res/menu/profile_own.xml
+++ b/mastodon/src/main/res/menu/profile_own.xml
@@ -3,6 +3,6 @@
-
+
\ No newline at end of file