Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing the icons on the bottom row of the compose fragment

This commit is contained in:
LucasGGamerM 2022-12-31 14:42:57 -03:00
parent 64d24f6002
commit c4d56179f3
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
View File

@ -818,11 +818,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
} }
private void resetPublishButtonText() { 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()) { // if (publishText == R.string.publish && !GlobalUserPreferences.publishButtonText.isEmpty()) {
// publishButton.setText(GlobalUserPreferences.publishButtonText); // publishButton.setText(GlobalUserPreferences.publishButtonText);
// } else { // } else {
// publishButton.setText(publishText); publishButton.setText(publishText);
// } // }
} }

29
mastodon/src/main/res/layout/fragment_compose.xml
View File

@ -288,7 +288,7 @@
android:id="@+id/btn_media" android:id="@+id/btn_media"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:padding="0px" android:padding="0px"
android:tint="@color/compose_button" android:tint="@color/compose_button"
@ -301,7 +301,7 @@
android:id="@+id/btn_poll" android:id="@+id/btn_poll"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:padding="0px" android:padding="0px"
android:tint="@color/compose_button" android:tint="@color/compose_button"
@ -314,7 +314,7 @@
android:id="@+id/btn_emoji" android:id="@+id/btn_emoji"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:padding="0px" android:padding="0px"
android:tint="@color/compose_button" android:tint="@color/compose_button"
@ -327,7 +327,7 @@
android:id="@+id/btn_spoiler" android:id="@+id/btn_spoiler"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:padding="0px" android:padding="0px"
android:tint="@color/compose_button" android:tint="@color/compose_button"
@ -340,7 +340,7 @@
android:id="@+id/btn_visibility" android:id="@+id/btn_visibility"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:padding="0px" android:padding="0px"
android:tint="@color/compose_button" android:tint="@color/compose_button"
@ -375,16 +375,17 @@
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
tools:text="500"/> tools:text="500"/>
<Button
android:id="@+id/publish"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:visibility="gone"
android:tooltipText="@string/publish"
android:drawableStart="@drawable/ic_fluent_send_24_selector"
/>
</LinearLayout> </LinearLayout>
<Button
android:id="@+id/publish"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:visibility="gone"
android:tooltipText="@string/publish"
android:drawableStart="@drawable/ic_fluent_send_24_selector"
/>
</LinearLayout> </LinearLayout>

2
mastodon/src/main/res/menu/profile_own.xml
View File

@ -3,6 +3,6 @@
<item android:id="@+id/followed_hashtags" android:title="@string/sk_hashtags_you_follow" android:icon="@drawable/ic_fluent_number_symbol_24_regular" android:showAsAction="always"/> <item android:id="@+id/followed_hashtags" android:title="@string/sk_hashtags_you_follow" android:icon="@drawable/ic_fluent_number_symbol_24_regular" android:showAsAction="always"/>
<item android:id="@+id/bookmarks" android:title="@string/bookmarks" android:icon="@drawable/ic_fluent_bookmark_multiple_24_regular" android:showAsAction="always"/> <item android:id="@+id/bookmarks" android:title="@string/bookmarks" android:icon="@drawable/ic_fluent_bookmark_multiple_24_regular" android:showAsAction="always"/>
<item android:id="@+id/favorites" android:title="@string/your_favorites" android:icon="@drawable/ic_fluent_star_24_regular" android:showAsAction="always"/> <item android:id="@+id/favorites" android:title="@string/your_favorites" android:icon="@drawable/ic_fluent_star_24_regular" android:showAsAction="always"/>
<item android:id="@+id/scheduled" android:title="@string/sk_unsent_posts" android:icon="@drawable/ic_fluent_drafts_24_regular"/> <item android:id="@+id/scheduled" android:title="@string/sk_unsent_posts" android:icon="@drawable/ic_fluent_drafts_24_regular" android:showAsAction="always"/>
<item android:id="@+id/share" android:title="@string/share_user" android:icon="@drawable/ic_fluent_share_24_regular" android:showAsAction="always"/> <item android:id="@+id/share" android:title="@string/share_user" android:icon="@drawable/ic_fluent_share_24_regular" android:showAsAction="always"/>
</menu> </menu>