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

Merge remote-tracking branch 'megalodon_main/main'

Browse Source 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/res/layout/fragment_compose.xml
This commit is contained in:
LucasGGamerM
2023-10-13 11:16:10 -03:00
parent 767312f71c 83786171a7
commit 4107169c73
63 changed files with 400 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mastodon/src/main/res/layout/tab_bar.xml
View File

@@ -55,6 +55,8 @@
android:layout_marginTop="4dp"
android:textColor="@color/m3_on_surface_selector"
android:tag="label"
android:ellipsize="end"
android:maxLines="1"
android:text="@string/sk_tab_home" />
</LinearLayout>
@@ -99,6 +101,8 @@
android:maxLines="1"
android:layout_marginTop="4dp"
android:tag="label"
android:ellipsize="end"
android:maxLines="1"
android:text="@string/sk_tab_search" />
</LinearLayout>
@@ -161,6 +165,8 @@
android:layout_marginTop="4dp"
android:textColor="@color/m3_on_surface_selector"
android:tag="label"
android:ellipsize="end"
android:maxLines="1"
android:text="@string/sk_tab_notifications" />
</LinearLayout>
@@ -211,6 +217,8 @@
android:layout_marginTop="4dp"
android:textColor="@color/m3_on_surface_selector"
android:tag="label"
android:ellipsize="end"
android:maxLines="1"
android:text="@string/sk_tab_profile" />
</LinearLayout>