From d1e77efa1c91bedb2d26ac7f1216ce1cb6a8e4bc Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Mon, 12 Dec 2022 20:40:11 -0300 Subject: [PATCH] Revert "Adding a tab on the tabbar and showing lists. Its still an early alpha though" This reverts commit bfd87cf94e345368b376005d8fe8bdd7077f337e. --- .../android/fragments/HomeFragment.java | 1 - .../fragments/ListTimelinesFragment.java | 18 ------------------ mastodon/src/main/res/values/strings_sk.xml | 1 - 3 files changed, 20 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java index 3b99e29d8..ca33aefd9 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java @@ -20,7 +20,6 @@ import org.joinmastodon.android.R; import org.joinmastodon.android.api.session.AccountSession; import org.joinmastodon.android.api.session.AccountSessionManager; import org.joinmastodon.android.fragments.discover.DiscoverFragment; -import org.joinmastodon.android.fragments.ListTimelinesFragment; import org.joinmastodon.android.model.Account; import org.joinmastodon.android.ui.AccountSwitcherSheet; import org.joinmastodon.android.ui.utils.UiUtils; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java index f01711df8..96c567161 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java @@ -1,6 +1,5 @@ package org.joinmastodon.android.fragments; -import android.app.Activity; import android.os.Bundle; import android.view.Menu; import android.view.MenuInflater; @@ -9,13 +8,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.CheckBox; -import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import androidx.viewpager2.widget.ViewPager2; import org.joinmastodon.android.R; import org.joinmastodon.android.api.MastodonAPIRequest; @@ -23,8 +20,6 @@ import org.joinmastodon.android.api.requests.lists.AddAccountsToList; import org.joinmastodon.android.api.requests.lists.GetLists; import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList; import org.joinmastodon.android.model.ListTimeline; -import org.joinmastodon.android.ui.tabs.TabLayout; -import org.joinmastodon.android.ui.tabs.TabLayoutMediator; import org.joinmastodon.android.ui.utils.UiUtils; import java.util.ArrayList; @@ -42,11 +37,6 @@ import me.grishka.appkit.utils.V; import me.grishka.appkit.views.UsableRecyclerView; public class ListTimelinesFragment extends BaseRecyclerFragment implements ScrollableToTop { - private TabLayout tabLayout; - private ViewPager2 pager; - private FrameLayout[] tabViews; - private TabLayoutMediator tabLayoutMediator; - private String accountId; private String profileAccountId; private String profileDisplayUsername; @@ -79,13 +69,6 @@ public class ListTimelinesFragment extends BaseRecyclerFragment im loadData(); } - @Override - public void onAttach(Activity activity){ - super.onAttach(activity); - setHasOptionsMenu(true); - setTitle(R.string.sk_list_timelines); - } - // @Override // public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { // Button saveButton=new Button(getActivity()); @@ -111,7 +94,6 @@ public class ListTimelinesFragment extends BaseRecyclerFragment im }).exec(accountId); } - @Override protected void doLoadData(int offset, int count){ userInListBefore.clear(); diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml index a4ba9cd93..90b3c527a 100644 --- a/mastodon/src/main/res/values/strings_sk.xml +++ b/mastodon/src/main/res/values/strings_sk.xml @@ -49,5 +49,4 @@ Yellow Material You Not supported on your device - Lists picker