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

fix pill-less navigation bar with labels

Browse Source
This commit is contained in:
sk
2023-07-21 11:41:34 +02:00
parent 8404c79148
commit 239b6f8202
4 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
View File

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
import android.app.Fragment; import android.app.Fragment;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.assist.AssistContent; import android.app.assist.AssistContent;
import android.graphics.drawable.RippleDrawable;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.service.notification.StatusBarNotification; import android.service.notification.StatusBarNotification;
@@ -126,15 +127,27 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
tabBarWrap=content.findViewById(R.id.tabbar_wrap); tabBarWrap=content.findViewById(R.id.tabbar_wrap);
// this one's for the pill haters (https://m3.material.io/components/navigation-bar/overview) // this one's for the pill haters (https://m3.material.io/components/navigation-bar/overview)
if (GlobalUserPreferences.disableM3PillActiveIndicator){ if(GlobalUserPreferences.disableM3PillActiveIndicator){
for(int i=0; i<tabBar.getChildCount(); i++){ tabBar.findViewById(R.id.tab_home_pill).setBackground(null);
ViewGroup f=(ViewGroup) tabBar.getChildAt(i); tabBar.findViewById(R.id.tab_search_pill).setBackground(null);
f.setBackgroundResource(R.drawable.bg_tabbar_tab_ripple); tabBar.findViewById(R.id.tab_notifications_pill).setBackground(null);
tabBar.findViewById(R.id.tab_profile_pill).setBackgroundResource(R.drawable.bg_tab_profile);
View[] tabs={
tabBar.findViewById(R.id.tab_home),
tabBar.findViewById(R.id.tab_search),
tabBar.findViewById(R.id.tab_notifications),
tabBar.findViewById(R.id.tab_profile)
};
for(View tab : tabs){
tab.setBackgroundResource(R.drawable.bg_tabbar_tab_ripple);
((RippleDrawable) tab.getBackground())
.setRadius(V.dp(GlobalUserPreferences.showNavigationLabels ? 56 : 42));
} }
tabBar.findViewById(R.id.tab_profile).setBackgroundResource(R.drawable.bg_tab_profile);
} }
if (!GlobalUserPreferences.showNavigationLabels){ if(!GlobalUserPreferences.showNavigationLabels){
tabBar.findViewById(R.id.tab_home_label).setVisibility(View.GONE); tabBar.findViewById(R.id.tab_home_label).setVisibility(View.GONE);
tabBar.findViewById(R.id.tab_search_label).setVisibility(View.GONE); tabBar.findViewById(R.id.tab_search_label).setVisibility(View.GONE);
tabBar.findViewById(R.id.tab_notifications_label).setVisibility(View.GONE); tabBar.findViewById(R.id.tab_notifications_label).setVisibility(View.GONE);

27
mastodon/src/main/res/drawable/bg_tab_profile.xml
View File

@@ -1,21 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item> <item android:state_selected="true">
<ripple <layer-list>
android:color="@color/m3_on_surface_variant_overlay" <item android:gravity="center" android:width="28dp" android:height="28dp">
android:radius="42dp" /> <shape android:shape="oval">
</item> <stroke android:color="?colorM3OnSecondaryContainer" android:width="2dp"/>
<item> </shape>
<selector>
<item android:state_selected="true">
<layer-list>
<item android:gravity="center" android:width="28dp" android:height="28dp">
<shape android:shape="oval">
<stroke android:color="?colorM3OnSecondaryContainer" android:width="2dp"/>
</shape>
</item>
</layer-list>
</item> </item>
</selector> </layer-list>
</item> </item>
</layer-list> </selector>

2
mastodon/src/main/res/drawable/bg_tabbar_tab_ripple.xml
View File

@@ -2,4 +2,4 @@
<ripple <ripple
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/m3_on_surface_variant_overlay" android:color="@color/m3_on_surface_variant_overlay"
android:radius="42dp" /> android:radius="56dp" />

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

@@ -26,6 +26,7 @@
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout <FrameLayout
android:id="@+id/tab_home_pill"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="32dp" android:layout_height="32dp"
android:background="@drawable/bg_tabbar_tab" android:background="@drawable/bg_tabbar_tab"
@@ -63,6 +64,7 @@
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout <FrameLayout
android:id="@+id/tab_search_pill"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="32dp" android:layout_height="32dp"
android:background="@drawable/bg_tabbar_tab" android:background="@drawable/bg_tabbar_tab"
@@ -100,6 +102,7 @@
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
android:id="@+id/tab_notifications_pill"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="32dp" android:layout_height="32dp"
android:background="@drawable/bg_tabbar_tab" android:background="@drawable/bg_tabbar_tab"
@@ -155,6 +158,7 @@
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout <FrameLayout
android:id="@+id/tab_profile_pill"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="32dp" android:layout_height="32dp"
android:background="@drawable/bg_tabbar_tab" android:background="@drawable/bg_tabbar_tab"