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

Undoing all the stuff that was broken

Browse Source
This commit is contained in:
LucasGGamerM
2022-12-11 15:55:28 -03:00
parent be3c12dfb3
commit cce6ba0746
4 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,6 @@ import me.grishka.appkit.views.FragmentRootLinearLayout;
public class HomeFragment extends AppKitFragment implements OnBackPressedListener{ public class HomeFragment extends AppKitFragment implements OnBackPressedListener{
private FragmentRootLinearLayout content; private FragmentRootLinearLayout content;
private HomeTimelineFragment homeTimelineFragment; private HomeTimelineFragment homeTimelineFragment;
private ListTimelinesFragment listTimelinesFragment;
private NotificationsFragment notificationsFragment; private NotificationsFragment notificationsFragment;
private DiscoverFragment searchFragment; private DiscoverFragment searchFragment;
private ProfileFragment profileFragment; private ProfileFragment profileFragment;
@@ -73,8 +72,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
args.putBoolean("noAutoLoad", true); args.putBoolean("noAutoLoad", true);
searchFragment=new DiscoverFragment(); searchFragment=new DiscoverFragment();
searchFragment.setArguments(args); searchFragment.setArguments(args);
listTimelinesFragment =new ListTimelinesFragment();
listTimelinesFragment.setArguments(args);
notificationsFragment=new NotificationsFragment(); notificationsFragment=new NotificationsFragment();
notificationsFragment.setArguments(args); notificationsFragment.setArguments(args);
args=new Bundle(args); args=new Bundle(args);
@@ -116,7 +113,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
getChildFragmentManager().beginTransaction() getChildFragmentManager().beginTransaction()
.add(R.id.fragment_wrap, homeTimelineFragment) .add(R.id.fragment_wrap, homeTimelineFragment)
.add(R.id.fragment_wrap, searchFragment).hide(searchFragment) .add(R.id.fragment_wrap, searchFragment).hide(searchFragment)
.add(R.id.fragment_wrap, listTimelinesFragment).hide(listTimelinesFragment)
.add(R.id.fragment_wrap, notificationsFragment).hide(notificationsFragment) .add(R.id.fragment_wrap, notificationsFragment).hide(notificationsFragment)
.add(R.id.fragment_wrap, profileFragment).hide(profileFragment) .add(R.id.fragment_wrap, profileFragment).hide(profileFragment)
.commit(); .commit();
@@ -196,8 +192,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
return homeTimelineFragment; return homeTimelineFragment;
}else if(tab==R.id.tab_search){ }else if(tab==R.id.tab_search){
return searchFragment; return searchFragment;
}else if(tab==R.id.tab_lists) {
return listTimelinesFragment;
}else if(tab==R.id.tab_notifications){ }else if(tab==R.id.tab_notifications){
return notificationsFragment; return notificationsFragment;
}else if(tab==R.id.tab_profile){ }else if(tab==R.id.tab_profile){

5
mastodon/src/main/res/drawable/ic_fluent_lists_28_selector.xml Normal file
View File

@@ -0,0 +1,5 @@
<vector android:height="28dp" android:tint="#000000"
android:viewportHeight="24" android:viewportWidth="24"
android:width="28dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M3,5v14h17L20,5L3,5zM7,7v2L5,9L5,7h2zM5,13v-2h2v2L5,13zM5,15h2v2L5,17v-2zM18,17L9,17v-2h9v2zM18,13L9,13v-2h9v2zM18,9L9,9L9,7h9v2z"/>
</vector>

18
mastodon/src/main/res/layout/fragment_lists.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<org.joinmastodon.android.ui.tabs.TabLayout
android:id="@+id/tabbar"
android:layout_width="match_parent"
android:layout_height="48dp"
app:tabGravity="fill"
app:tabIndicator="@drawable/mtrl_tabs_default_indicator"
app:tabIndicatorAnimationMode="elastic"
app:tabIndicatorColor="?android:textColorPrimary"
app:tabMode="fixed"
android:background="@drawable/bg_discover_tabs"/>
</LinearLayout>

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

@@ -44,21 +44,6 @@
android:layout_height="1px" android:layout_height="1px"
android:layout_weight="1"/> android:layout_weight="1"/>
<ImageView
android:id="@+id/tab_lists"
android:layout_width="60dp"
android:layout_height="52dp"
android:scaleType="center"
android:contentDescription="@string/sk_lists_timeline"
android:background="?android:selectableItemBackgroundBorderless"
android:tint="?android:colorPrimary"
android:src="@drawable/ic_fluent_home_28_selector"/>
<Space
android:layout_width="0px"
android:layout_height="1px"
android:layout_weight="1"/>
<ImageView <ImageView
android:id="@+id/tab_notifications" android:id="@+id/tab_notifications"
android:layout_width="60dp" android:layout_width="60dp"