diff options
Diffstat (limited to 'app/src/main/java/app/fedilab/android/mastodon/ui')
10 files changed, 16 insertions, 26 deletions
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java index 08541ce9a..695207270 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java @@ -891,8 +891,8 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder tag.name = camelTag; if (!results.hashtags.contains(tag)) { - for(Tag realTag: results.hashtags) { - if(realTag.name.equalsIgnoreCase(camelTag)) { + for (Tag realTag : results.hashtags) { + if (realTag.name.equalsIgnoreCase(camelTag)) { tag.history = realTag.history; break; } diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java index d9203d93e..d67012bb2 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java @@ -76,7 +76,6 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.annotation.OptIn; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.LinearLayoutCompat; @@ -91,7 +90,6 @@ import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelStoreOwner; import androidx.media3.common.MediaItem; import androidx.media3.common.Player; -import androidx.media3.common.util.UnstableApi; import androidx.media3.datasource.DataSource; import androidx.media3.datasource.DefaultDataSource; import androidx.media3.exoplayer.ExoPlayer; diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDirectMessageAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDirectMessageAdapter.java index d96d4d429..aa657a8a6 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDirectMessageAdapter.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDirectMessageAdapter.java @@ -61,7 +61,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.RequestBuilder; - import org.jetbrains.annotations.NotNull; import java.lang.ref.WeakReference; diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/TagsSearchAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/TagsSearchAdapter.java index 829729018..51c0e4e55 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/TagsSearchAdapter.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/TagsSearchAdapter.java @@ -11,8 +11,6 @@ import android.widget.Filterable; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.github.mikephil.charting.data.Entry; - import java.util.ArrayList; import java.util.List; @@ -125,7 +123,7 @@ public class TagsSearchAdapter extends ArrayAdapter<Tag> implements Filterable { stat += Integer.parseInt(history.accounts); } } - if(stat > 0 ) { + if (stat > 0) { holder.binding.tagCount.setText("(" + context.getString(R.string.talking_about, stat) + ")"); holder.binding.tagCount.setVisibility(View.VISIBLE); } else { diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/media/FragmentMedia.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/media/FragmentMedia.java index 82d981321..deeb01476 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/media/FragmentMedia.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/media/FragmentMedia.java @@ -21,8 +21,6 @@ import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; import android.os.Handler; -import android.os.Looper; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -97,7 +95,7 @@ public class FragmentMedia extends Fragment { @OptIn(markerClass = UnstableApi.class) public void toggleController(boolean display) { - if(display) { + if (display) { binding.controls.show(); } else { binding.controls.hide(); @@ -241,9 +239,7 @@ public class FragmentMedia extends Fragment { ); } switch (type.toLowerCase()) { - case "video": - case "audio": - case "gifv": + case "video", "audio", "gifv" -> { if (attachment.peertubeId != null) { //It's a peertube video, we are fetching data TimelinesVM timelinesVM = new ViewModelProvider(requireActivity()).get(TimelinesVM.class); @@ -258,7 +254,7 @@ public class FragmentMedia extends Fragment { } else { loadVideo(url, type); } - break; + } } } diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/media/FragmentMediaProfile.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/media/FragmentMediaProfile.java index c1fdd45be..197431cc6 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/media/FragmentMediaProfile.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/media/FragmentMediaProfile.java @@ -65,6 +65,7 @@ public class FragmentMediaProfile extends Fragment { private boolean checkRemotely; private String accountId; private Bundle arguments; + @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -98,7 +99,6 @@ public class FragmentMediaProfile extends Fragment { } - private void initializeAfterBundle(Bundle bundle) { if (bundle != null) { @@ -107,7 +107,7 @@ public class FragmentMediaProfile extends Fragment { } checkRemotely = bundle.getBoolean(Helper.ARG_CHECK_REMOTELY, false); } - if(accountTimeline == null) { + if (accountTimeline == null) { return; } flagLoading = false; @@ -148,7 +148,6 @@ public class FragmentMediaProfile extends Fragment { } - /** * Intialize the common view for statuses on different timelines * diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonContext.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonContext.java index fc4699a76..81f1c00a9 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonContext.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonContext.java @@ -138,6 +138,7 @@ public class FragmentMastodonContext extends Fragment { private Status firstStatus; private boolean pullToRefresh; private String user_token, user_instance; + private Bundle arguments; /** * Return the position of the status in the ArrayList @@ -158,8 +159,6 @@ public class FragmentMastodonContext extends Fragment { return found ? position : -1; } - private Bundle arguments; - public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java index 5177cc658..b2397dfdd 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java @@ -91,7 +91,6 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter. private StatusAdapter statusAdapter; private Timeline.TimeLineEnum timelineType; private List<Status> timelineStatuses; - private Bundle arguments; //Handle actions that can be done in other fragments private final BroadcastReceiver receive_action = new BroadcastReceiver() { @Override @@ -184,6 +183,7 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter. } } }; + private Bundle arguments; private boolean retry_for_home_done; private String lemmy_post_id; private boolean checkRemotely; @@ -351,7 +351,6 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter. } - @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -393,6 +392,7 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter. } } } + private void initializeAfterBundle(Bundle bundle) { if (bundle != null) { timelineType = (Timeline.TimeLineEnum) bundle.get(Helper.ARG_TIMELINE_TYPE); diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentProfileTimeline.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentProfileTimeline.java index e0b5bc733..1169004f0 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentProfileTimeline.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentProfileTimeline.java @@ -48,12 +48,14 @@ public class FragmentProfileTimeline extends Fragment { private boolean checkRemotely; private boolean show_boosts = true, show_replies = true; private Bundle arguments; + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { binding = FragmentProfileTimelinesBinding.inflate(inflater, container, false); arguments = getArguments(); return binding.getRoot(); } + @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); @@ -169,5 +171,4 @@ public class FragmentProfileTimeline extends Fragment { } - } diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/pageadapter/FedilabProfilePageAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/pageadapter/FedilabProfilePageAdapter.java index 22f55cd9c..fa1986156 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/pageadapter/FedilabProfilePageAdapter.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/pageadapter/FedilabProfilePageAdapter.java @@ -61,7 +61,7 @@ public class FedilabProfilePageAdapter extends FragmentStatePagerAdapter { case 0 -> { fragmentMastodonTimeline = new FragmentMastodonTimeline(); bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, Timeline.TimeLineEnum.ACCOUNT_TIMELINE); - if(account != null) { + if (account != null) { bundle.putSerializable(Helper.ARG_CACHED_ACCOUNT_ID, account.id); } bundle.putBoolean(Helper.ARG_SHOW_PINNED, true); @@ -74,7 +74,7 @@ public class FedilabProfilePageAdapter extends FragmentStatePagerAdapter { case 1 -> { fragmentMastodonTimeline = new FragmentMastodonTimeline(); bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, Timeline.TimeLineEnum.ACCOUNT_TIMELINE); - if(account != null) { + if (account != null) { bundle.putSerializable(Helper.ARG_CACHED_ACCOUNT_ID, account.id); } bundle.putBoolean(Helper.ARG_SHOW_PINNED, false); @@ -86,7 +86,7 @@ public class FedilabProfilePageAdapter extends FragmentStatePagerAdapter { } case 2 -> { FragmentMediaProfile fragmentMediaProfile = new FragmentMediaProfile(); - if(account != null) { + if (account != null) { bundle.putSerializable(Helper.ARG_CACHED_ACCOUNT_ID, account.id); } bundle.putBoolean(Helper.ARG_CHECK_REMOTELY, checkRemotely); |