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

chore(merge-upstream): a bunch of stuff is still left to be done :D

Browse Source
This commit is contained in:
LucasGGamerM
2024-02-27 20:53:32 -03:00
parent 64e82bdeed
commit cf31a1be57
5 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mastodon/src/main/java/org/joinmastodon/android/fragments/CreateListAddMembersFragment.java
View File

@@ -1,6 +1,7 @@
package org.joinmastodon.android.fragments; package org.joinmastodon.android.fragments;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.view.Gravity; import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -128,7 +129,7 @@ public class CreateListAddMembersFragment extends BaseAccountListFragment implem
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
MenuItem item=menu.add(R.string.add_list_member); MenuItem item=menu.add(R.string.add_list_member);
item.setIcon(R.drawable.ic_add_24px); item.setIcon(R.drawable.ic_fluent_add_24_regular);
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
} }
@@ -320,4 +321,10 @@ public class CreateListAddMembersFragment extends BaseAccountListFragment implem
protected void loadRelationships(List<AccountViewModel> accounts){ protected void loadRelationships(List<AccountViewModel> accounts){
// no-op // no-op
} }
@Override
public Uri getWebUri(Uri.Builder base){
// TODO this
return null;
}
} }

4
mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
View File

@@ -97,7 +97,7 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
.setPositiveButton(R.string.save, (d, which) -> { .setPositiveButton(R.string.save, (d, which) -> {
String newTitle = editor.getTitle().trim(); String newTitle = editor.getTitle().trim();
setTitle(newTitle); setTitle(newTitle);
new UpdateList(listID, newTitle, editor.isExclusive(), editor.getRepliesPolicy()).setCallback(new Callback<>() { new UpdateList(listID, newTitle, editor.getRepliesPolicy(), editor.isExclusive()).setCallback(new Callback<>() {
@Override @Override
public void onSuccess(FollowList list) { public void onSuccess(FollowList list) {
if(getActivity()==null) return; if(getActivity()==null) return;
@@ -119,7 +119,7 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
.show(); .show();
} else if (item.getItemId() == R.id.delete) { } else if (item.getItemId() == R.id.delete) {
UiUtils.confirmDeleteList(getActivity(), accountID, listID, listTitle, () -> { UiUtils.confirmDeleteList(getActivity(), accountID, listID, listTitle, () -> {
E.post(new ListDeletedEvent(listID)); E.post(new ListDeletedEvent(accountID, listID));
Nav.finish(this); Nav.finish(this);
}); });
} }

2
mastodon/src/main/java/org/joinmastodon/android/fragments/ManageListsFragment.java
View File

@@ -114,7 +114,7 @@ public class ManageListsFragment extends BaseSettingsFragment<FollowList> implem
public void onViewCreated(View view, Bundle savedInstanceState){ public void onViewCreated(View view, Bundle savedInstanceState){
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
fab=view.findViewById(R.id.fab); fab=view.findViewById(R.id.fab);
fab.setImageResource(R.drawable.ic_add_24px); fab.setImageResource(R.drawable.ic_fluent_add_24_regular);
fab.setContentDescription(getString(R.string.create_list)); fab.setContentDescription(getString(R.string.create_list));
fab.setOnClickListener(v->onFabClick()); fab.setOnClickListener(v->onFabClick());
} }

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

@@ -66,7 +66,8 @@ public class SettingsDebugFragment extends BaseSettingsFragment<Void>{
} }
private void onResetPreReplySheetsClick(ListItem<?> item){ private void onResetPreReplySheetsClick(ListItem<?> item){
GlobalUserPreferences.resetPreReplySheets(); // TODO fix this
// GlobalUserPreferences.resetPreReplySheets();
Toast.makeText(getActivity(), "Pre-reply sheets were reset", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "Pre-reply sheets were reset", Toast.LENGTH_SHORT).show();
} }

8
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
View File

@@ -79,9 +79,9 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
applicationName=findViewById(R.id.application_name); applicationName=findViewById(R.id.application_name);
visibility=findViewById(R.id.visibility); visibility=findViewById(R.id.visibility);
time=findViewById(R.id.time); time=findViewById(R.id.time);
date=findViewById(R.id.date); // date=findViewById(R.id.date);
app=findViewById(R.id.app_name); // app=findViewById(R.id.app_name);
dateAppSeparator=findViewById(R.id.date_app_separator); // dateAppSeparator=findViewById(R.id.date_app_separator);
reblogs.setOnClickListener(v->startAccountListFragment(StatusReblogsListFragment.class)); reblogs.setOnClickListener(v->startAccountListFragment(StatusReblogsListFragment.class));
favorites.setOnClickListener(v->startAccountListFragment(StatusFavoritesListFragment.class)); favorites.setOnClickListener(v->startAccountListFragment(StatusFavoritesListFragment.class));
@@ -108,7 +108,7 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
String timeStr=item.status.createdAt != null ? TIME_FORMATTER.format(item.status.createdAt.atZone(ZoneId.systemDefault())) : null; String timeStr=item.status.createdAt != null ? TIME_FORMATTER.format(item.status.createdAt.atZone(ZoneId.systemDefault())) : null;
if (item.status.application!=null && !TextUtils.isEmpty(item.status.application.name)) { if (item.status.application!=null && !TextUtils.isEmpty(item.status.application.name)) {
time.setText(timeStr != null ? item.parentFragment.getString(R.string.timestamp_via_app, timeStr, "") : ""); time.setText(timeStr != null ? item.parentFragment.getString(R.string., timeStr, "") : "");
applicationName.setText(item.status.application.name); applicationName.setText(item.status.application.name);
if (item.status.application.website != null && item.status.application.website.toLowerCase().startsWith("https://")) { if (item.status.application.website != null && item.status.application.website.toLowerCase().startsWith("https://")) {
applicationName.setOnClickListener(e -> UiUtils.openURL(context, null, item.status.application.website)); applicationName.setOnClickListener(e -> UiUtils.openURL(context, null, item.status.application.website));