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

Tab bar and stuff

Browse Source
This commit is contained in:
Grishka
2022-02-03 11:01:34 +03:00
parent a1dee1fc88
commit 20d3a62747
25 changed files with 364 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,21 +1,44 @@
package org.joinmastodon.android.fragments;
import android.app.Fragment;
import android.graphics.Outline;
import android.os.Build;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewOutlineProvider;
import android.view.WindowInsets;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import org.joinmastodon.android.R;
import org.joinmastodon.android.api.session.AccountSessionManager;
import org.joinmastodon.android.model.Account;
import org.joinmastodon.android.ui.views.TabBar;
import org.parceler.Parcels;
import androidx.annotation.IdRes;
import androidx.annotation.Nullable;
import me.grishka.appkit.fragments.AppKitFragment;
import me.grishka.appkit.fragments.LoaderFragment;
import me.grishka.appkit.imageloader.ViewImageLoader;
import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
import me.grishka.appkit.utils.V;
import me.grishka.appkit.views.FragmentRootLinearLayout;
public class HomeFragment extends AppKitFragment{
private FragmentRootLinearLayout content;
private HomeTimelineFragment homeTimelineFragment;
private NotificationsFragment notificationsFragment;
private SearchFragment searchFragment;
private ProfileFragment profileFragment;
private TabBar tabBar;
private View tabBarWrap;
private ImageView tabBarAvatar;
@IdRes
private int currentTab=R.id.tab_home;
private String accountID;
@@ -35,11 +58,42 @@ public class HomeFragment extends AppKitFragment{
fragmentContainer.setId(R.id.fragment_wrap);
content.addView(fragmentContainer, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0, 1f));
inflater.inflate(R.layout.tab_bar, content);
tabBar=content.findViewById(R.id.tabbar);
tabBar.setListener(this::onTabSelected);
tabBarWrap=content.findViewById(R.id.tabbar_wrap);
tabBarAvatar=tabBar.findViewById(R.id.tab_profile_ava);
tabBarAvatar.setOutlineProvider(new ViewOutlineProvider(){
@Override
public void getOutline(View view, Outline outline){
outline.setOval(0, 0, view.getWidth(), view.getHeight());
}
});
tabBarAvatar.setClipToOutline(true);
Account self=AccountSessionManager.getInstance().getAccount(accountID).self;
ViewImageLoader.load(tabBarAvatar, null, new UrlImageLoaderRequest(self.avatar, V.dp(28), V.dp(28)));
Bundle args=new Bundle();
args.putString("account", accountID);
homeTimelineFragment=new HomeTimelineFragment();
homeTimelineFragment.setArguments(args);
getChildFragmentManager().beginTransaction().add(R.id.fragment_wrap, homeTimelineFragment).commit();
searchFragment=new SearchFragment();
searchFragment.setArguments(args);
notificationsFragment=new NotificationsFragment();
notificationsFragment.setArguments(args);
args=new Bundle(args);
args.putParcelable("profileAccount", Parcels.wrap(AccountSessionManager.getInstance().getAccount(accountID).self));
args.putBoolean("noAutoLoad", true);
profileFragment=new ProfileFragment();
profileFragment.setArguments(args);
getChildFragmentManager().beginTransaction()
.add(R.id.fragment_wrap, homeTimelineFragment)
.add(R.id.fragment_wrap, searchFragment).hide(searchFragment)
.add(R.id.fragment_wrap, notificationsFragment).hide(notificationsFragment)
.add(R.id.fragment_wrap, profileFragment).hide(profileFragment)
.commit();
return content;
}
@@ -47,11 +101,51 @@ public class HomeFragment extends AppKitFragment{
@Override
public void onHiddenChanged(boolean hidden){
super.onHiddenChanged(hidden);
homeTimelineFragment.onHiddenChanged(hidden);
fragmentForTab(currentTab).onHiddenChanged(hidden);
}
@Override
public boolean wantsLightStatusBar(){
return true;
}
@Override
public boolean wantsLightNavigationBar(){
return true;
}
@Override
public void onApplyWindowInsets(WindowInsets insets){
if(Build.VERSION.SDK_INT>=27){
int inset=insets.getSystemWindowInsetBottom();
tabBarWrap.setPadding(0, 0, 0, inset>0 ? Math.max(inset, V.dp(36)) : 0);
super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), insets.getSystemWindowInsetTop(), insets.getSystemWindowInsetRight(), 0));
}else{
super.onApplyWindowInsets(insets);
}
}
private Fragment fragmentForTab(@IdRes int tab){
if(tab==R.id.tab_home){
return homeTimelineFragment;
}else if(tab==R.id.tab_search){
return searchFragment;
}else if(tab==R.id.tab_notifications){
return notificationsFragment;
}else if(tab==R.id.tab_profile){
return profileFragment;
}
throw new IllegalArgumentException();
}
private void onTabSelected(@IdRes int tab){
Fragment newFragment=fragmentForTab(tab);
getChildFragmentManager().beginTransaction().hide(fragmentForTab(currentTab)).show(newFragment).commit();
if(newFragment instanceof LoaderFragment){
LoaderFragment lf=(LoaderFragment) newFragment;
if(!lf.loaded)
lf.loadData();
}
currentTab=tab;
}
}

43
mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
View File

@@ -1,12 +1,17 @@
package org.joinmastodon.android.fragments;
import android.app.Activity;
import android.content.res.Configuration;
import android.os.Bundle;
import android.view.Gravity;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.Toolbar;
import com.squareup.otto.Subscribe;
@@ -34,7 +39,6 @@ public class HomeTimelineFragment extends StatusListFragment{
@Override
public void onAttach(Activity activity){
super.onAttach(activity);
setTitle(R.string.app_name);
setHasOptionsMenu(true);
loadData();
}
@@ -56,6 +60,7 @@ public class HomeTimelineFragment extends StatusListFragment{
super.onViewCreated(view, savedInstanceState);
fab=view.findViewById(R.id.fab);
fab.setOnClickListener(this::onFabClick);
updateToolbarLogo();
}
@Override
@@ -65,20 +70,26 @@ public class HomeTimelineFragment extends StatusListFragment{
@Override
public boolean onOptionsItemSelected(MenuItem item){
Bundle args=new Bundle();
args.putString("account", accountID);
int id=item.getItemId();
if(id==R.id.new_toot){
Nav.go(getActivity(), ComposeFragment.class, args);
}else if(id==R.id.notifications){
Nav.go(getActivity(), NotificationsFragment.class, args);
}else if(id==R.id.my_profile){
args.putParcelable("profileAccount", Parcels.wrap(AccountSessionManager.getInstance().getAccount(accountID).self));
Nav.go(getActivity(), ProfileFragment.class, args);
}
// Bundle args=new Bundle();
// args.putString("account", accountID);
// int id=item.getItemId();
// if(id==R.id.new_toot){
// Nav.go(getActivity(), ComposeFragment.class, args);
// }else if(id==R.id.notifications){
// Nav.go(getActivity(), NotificationsFragment.class, args);
// }else if(id==R.id.my_profile){
// args.putParcelable("profileAccount", Parcels.wrap(AccountSessionManager.getInstance().getAccount(accountID).self));
// Nav.go(getActivity(), ProfileFragment.class, args);
// }
return true;
}
@Override
public void onConfigurationChanged(Configuration newConfig){
super.onConfigurationChanged(newConfig);
updateToolbarLogo();
}
@Subscribe
public void onStatusCreated(StatusCreatedEvent ev){
prependItems(Collections.singletonList(ev.status));
@@ -89,4 +100,12 @@ public class HomeTimelineFragment extends StatusListFragment{
args.putString("account", accountID);
Nav.go(getActivity(), ComposeFragment.class, args);
}
private void updateToolbarLogo(){
ImageView logo=new ImageView(getActivity());
logo.setScaleType(ImageView.ScaleType.CENTER);
logo.setImageResource(R.drawable.logo);
Toolbar toolbar=getToolbar();
toolbar.addView(logo, new Toolbar.LayoutParams(Gravity.CENTER));
}
}

1
mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
View File

@@ -19,7 +19,6 @@ public class NotificationsFragment extends BaseStatusListFragment<Notification>{
public void onAttach(Activity activity){
super.onAttach(activity);
setTitle(R.string.notifications);
loadData();
}
@Override

3
mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
View File

@@ -19,7 +19,8 @@ public class ProfileFragment extends StatusListFragment{
super.onAttach(activity);
user=Parcels.unwrap(getArguments().getParcelable("profileAccount"));
setTitle("@"+user.acct);
loadData();
if(!getArguments().getBoolean("noAutoLoad"))
loadData();
}
@Override

15
mastodon/src/main/java/org/joinmastodon/android/fragments/SearchFragment.java Normal file
View File

@@ -0,0 +1,15 @@
package org.joinmastodon.android.fragments;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import me.grishka.appkit.fragments.ToolbarFragment;
public class SearchFragment extends ToolbarFragment{
@Override
public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
return new View(getActivity());
}
}

55
mastodon/src/main/java/org/joinmastodon/android/ui/views/TabBar.java Normal file
View File

@@ -0,0 +1,55 @@
package org.joinmastodon.android.ui.views;
import android.content.Context;
import android.util.AttributeSet;
import android.view.View;
import android.widget.LinearLayout;
import org.joinmastodon.android.R;
import java.util.function.IntConsumer;
import androidx.annotation.IdRes;
public class TabBar extends LinearLayout{
@IdRes
private int selectedTabID;
private IntConsumer listener;
public TabBar(Context context){
this(context, null);
}
public TabBar(Context context, AttributeSet attrs){
this(context, attrs, 0);
}
public TabBar(Context context, AttributeSet attrs, int defStyle){
super(context, attrs, defStyle);
}
@Override
public void onViewAdded(View child){
super.onViewAdded(child);
if(child.getId()!=0){
if(selectedTabID==0){
selectedTabID=child.getId();
child.setSelected(true);
}
child.setOnClickListener(this::onChildClick);
}
}
private void onChildClick(View v){
if(v.getId()==selectedTabID)
return;
findViewById(selectedTabID).setSelected(false);
v.setSelected(true);
selectedTabID=v.getId();
listener.accept(selectedTabID);
}
public void setListener(IntConsumer listener){
this.listener=listener;
}
}