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

Revert "The placeholders are now there." 

This reverts commit 0ca9c536cd.
This commit is contained in:
LucasGGamerM 2022-12-12 20:40:10 -03:00
parent cf27c6bbf3
commit ad68d7e4f2
1 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
View File

@ -1,6 +1,8 @@
package org.joinmastodon.android.fragments; package org.joinmastodon.android.fragments;
import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import android.view.Gravity;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
@ -8,12 +10,15 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toolbar;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager2.widget.ViewPager2;
import org.joinmastodon.android.R; import org.joinmastodon.android.R;
import org.joinmastodon.android.api.MastodonAPIRequest; import org.joinmastodon.android.api.MastodonAPIRequest;
@ -21,8 +26,10 @@ import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
import org.joinmastodon.android.api.requests.lists.GetLists; import org.joinmastodon.android.api.requests.lists.GetLists;
import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList; import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
import org.joinmastodon.android.model.ListTimeline; import org.joinmastodon.android.model.ListTimeline;
import org.joinmastodon.android.ui.M3AlertDialogBuilder; import org.joinmastodon.android.ui.tabs.TabLayout;
import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
import org.joinmastodon.android.ui.utils.UiUtils; import org.joinmastodon.android.ui.utils.UiUtils;
import org.w3c.dom.Text;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -31,7 +38,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import me.grishka.appkit.Nav;
import me.grishka.appkit.api.ErrorResponse; import me.grishka.appkit.api.ErrorResponse;
import me.grishka.appkit.api.SimpleCallback; import me.grishka.appkit.api.SimpleCallback;
import me.grishka.appkit.fragments.BaseRecyclerFragment; import me.grishka.appkit.fragments.BaseRecyclerFragment;
@ -40,6 +46,8 @@ import me.grishka.appkit.utils.V;
import me.grishka.appkit.views.UsableRecyclerView; import me.grishka.appkit.views.UsableRecyclerView;
public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> implements ScrollableToTop { public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> implements ScrollableToTop {
private TextView toolbarTitle;
private String accountId; private String accountId;
private String profileAccountId; private String profileAccountId;
private String profileDisplayUsername; private String profileDisplayUsername;
@ -55,14 +63,19 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
Bundle args=getArguments(); Bundle args=getArguments();
// setTitle(R.string.sk_list_timelines);
accountId=args.getString("account"); accountId=args.getString("account");
if(args.containsKey("profileAccount")){ if(args.containsKey("profileAccount")){
profileAccountId=args.getString("profileAccount"); profileAccountId=args.getString("profileAccount");
profileDisplayUsername=args.getString("profileDisplayUsername"); profileDisplayUsername=args.getString("profileDisplayUsername");
setTitle(getString(R.string.sk_lists_with_user, profileDisplayUsername)); setTitle(getString(R.string.sk_lists_with_user, profileDisplayUsername));
// setHasOptionsMenu(true); setHasOptionsMenu(true);
} }
// toolbarTitle=new TextView(getActivity());
// toolbarTitle.setText(R.string.sk_list_timelines);
// Toolbar toolbar = getToolbar();
// toolbar.addView(toolbarTitle);
} }
@Override @Override
@ -72,20 +85,24 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
loadData(); loadData();
} }
// @Override @Override
// public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
// Button saveButton=new Button(getActivity()); Button saveButton=new Button(getActivity());
// saveButton.setText(R.string.save); saveButton.setText(R.string.save);
// saveButton.setOnClickListener(this::onSaveClick); saveButton.setOnClickListener(this::onSaveClick);
// LinearLayout wrap=new LinearLayout(getActivity()); LinearLayout wrap=new LinearLayout(getActivity());
// wrap.setOrientation(LinearLayout.HORIZONTAL); wrap.setOrientation(LinearLayout.HORIZONTAL);
// wrap.addView(saveButton, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)); wrap.addView(saveButton, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
// wrap.setPadding(V.dp(16), V.dp(4), V.dp(16), V.dp(8)); wrap.setPadding(V.dp(16), V.dp(4), V.dp(16), V.dp(8));
// wrap.setClipToPadding(false); wrap.setClipToPadding(false);
// MenuItem item=menu.add(R.string.save); MenuItem item=menu.add(R.string.save);
// item.setActionView(wrap); item.setActionView(wrap);
// item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
// } }
private void onSaveClick(View view) {
System.out.println("Save");
}
private void saveListMembership(String listId, boolean isMember) { private void saveListMembership(String listId, boolean isMember) {
userInList.put(listId, isMember); userInList.put(listId, isMember);
@ -97,6 +114,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
}).exec(accountId); }).exec(accountId);
} }
@Override @Override
protected void doLoadData(int offset, int count){ protected void doLoadData(int offset, int count){
userInListBefore.clear(); userInListBefore.clear();
@ -160,14 +178,11 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
private class ListViewHolder extends BindableViewHolder<ListTimeline> implements UsableRecyclerView.Clickable{ private class ListViewHolder extends BindableViewHolder<ListTimeline> implements UsableRecyclerView.Clickable{
private final TextView title; private final TextView title;
private final CheckBox listToggle; private final CheckBox listToggle;
private final ImageView edit, delete;
public ListViewHolder(){ public ListViewHolder(){
super(getActivity(), R.layout.item_list_timeline, list); super(getActivity(), R.layout.item_list_timeline, list);
title=findViewById(R.id.title); title=findViewById(R.id.title);
listToggle=findViewById(R.id.list_toggle); listToggle=findViewById(R.id.list_toggle);
edit=findViewById(R.id.edit);
delete=findViewById(R.id.delete);
} }
@Override @Override
@ -180,8 +195,6 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
} else { } else {
listToggle.setVisibility(View.GONE); listToggle.setVisibility(View.GONE);
} }
// edit.setOnClickListener();
// delete.setOnClickListener();
} }
private void onClickToggle(View view) { private void onClickToggle(View view) {
@ -192,13 +205,5 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
public void onClick() { public void onClick() {
UiUtils.openListTimeline(getActivity(), accountId, item); UiUtils.openListTimeline(getActivity(), accountId, item);
} }
// private void editListName(){
// new M3AlertDialogBuilder(getActivity())
// .setTitle(R.string.edit_text_edited)
// .setPositiveButton(R.string.discard, (dialog, which)-> )
// .setNegativeButton(R.string.cancel, null)
// .show();
// }
} }
} }