From 851bf94c9036724f4cdc8632ee4265ca5e9c2465 Mon Sep 17 00:00:00 2001 From: sk Date: Tue, 29 Nov 2022 00:24:36 +0100 Subject: [PATCH] Revert "add release without federated timeline" This reverts commit 5cce8ca72cd97cb83200164caf3a6ab26e5a1b31. --- mastodon/build.gradle | 12 +++---- .../fragments/discover/DiscoverFragment.java | 31 ++++++------------- 2 files changed, 14 insertions(+), 29 deletions(-) diff --git a/mastodon/build.gradle b/mastodon/build.gradle index fbf3fe49b..8416da29b 100644 --- a/mastodon/build.gradle +++ b/mastodon/build.gradle @@ -20,8 +20,8 @@ android { buildTypes { release { -// minifyEnabled true -// shrinkResources true + minifyEnabled true + shrinkResources true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } debug{ @@ -31,12 +31,8 @@ android { } githubRelease{ initWith release - } - noFederatedRelease{ - initWith release - minifyEnabled true - shrinkResources true - versionNameSuffix '-nofederated' + minifyEnabled false + shrinkResources false } } compileOptions { diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java index ac974f2b0..5495ee134 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java @@ -1,7 +1,6 @@ package org.joinmastodon.android.fragments.discover; import android.app.Fragment; -import android.app.FragmentTransaction; import android.os.Build; import android.os.Bundle; import android.text.Editable; @@ -18,7 +17,6 @@ import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; -import org.joinmastodon.android.BuildConfig; import org.joinmastodon.android.R; import org.joinmastodon.android.fragments.ScrollableToTop; import org.joinmastodon.android.fragments.ListTimelinesFragment; @@ -31,7 +29,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager2.widget.ViewPager2; - import me.grishka.appkit.fragments.AppKitFragment; import me.grishka.appkit.fragments.BaseRecyclerFragment; import me.grishka.appkit.fragments.OnBackPressedListener; @@ -61,8 +58,6 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop, private String accountID; private Runnable searchDebouncer=this::onSearchChangedDebounced; - private static final boolean noFederated = BuildConfig.BUILD_TYPE.equals("noFederatedRelease"); - @Override public void onCreate(Bundle savedInstanceState){ super.onCreate(savedInstanceState); @@ -80,11 +75,10 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop, tabLayout=view.findViewById(R.id.tabbar); pager=view.findViewById(R.id.pager); - tabViews=new FrameLayout[noFederated ? 6 : 7]; + tabViews=new FrameLayout[7]; for(int i=0;i 0 ? i + 1 : i; - tabView.setId(switch(switchIndex){ + tabView.setId(switch(i){ case 0 -> R.id.discover_local_timeline; case 1 -> R.id.discover_federated_timeline; case 2 -> R.id.discover_hashtags; @@ -92,7 +86,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop, case 4 -> R.id.discover_news; case 5 -> R.id.discover_users; case 6 -> R.id.discover_lists; - default -> throw new IllegalStateException("Unexpected value: "+switchIndex); + default -> throw new IllegalStateException("Unexpected value: "+i); }); tabView.setVisibility(View.GONE); view.addView(tabView); // needed so the fragment manager will have somewhere to restore the tab fragment @@ -137,30 +131,26 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop, localTimelineFragment=new LocalTimelineFragment(); localTimelineFragment.setArguments(args); + federatedTimelineFragment=new FederatedTimelineFragment(); + federatedTimelineFragment.setArguments(args); + listTimelinesFragment=new ListTimelinesFragment(); listTimelinesFragment.setArguments(args); - FragmentTransaction transaction = getChildFragmentManager().beginTransaction() + getChildFragmentManager().beginTransaction() .add(R.id.discover_posts, postsFragment) .add(R.id.discover_local_timeline, localTimelineFragment) + .add(R.id.discover_federated_timeline, federatedTimelineFragment) .add(R.id.discover_hashtags, hashtagsFragment) .add(R.id.discover_news, newsFragment) .add(R.id.discover_users, accountsFragment) - .add(R.id.discover_lists, listTimelinesFragment); - - if (!noFederated) { - federatedTimelineFragment=new FederatedTimelineFragment(); - federatedTimelineFragment.setArguments(args); - transaction.add(R.id.discover_federated_timeline, federatedTimelineFragment); - } - - transaction.commit(); + .add(R.id.discover_lists, listTimelinesFragment) + .commit(); } tabLayoutMediator=new TabLayoutMediator(tabLayout, pager, new TabLayoutMediator.TabConfigurationStrategy(){ @Override public void onConfigureTab(@NonNull TabLayout.Tab tab, int position){ - if (noFederated && position > 0) position++; tab.setText(switch(position){ case 0 -> R.string.local_timeline; case 1 -> R.string.federated_timeline; @@ -290,7 +280,6 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop, } private Fragment getFragmentForPage(int page){ - if (noFederated && page > 0) page++; return switch(page){ case 0 -> localTimelineFragment; case 1 -> federatedTimelineFragment;