app/src/main/java/eu/toldi/infinityforlemmy/activities/InstanceInfoActivity.java

@@ -1,19 +1,14 @@
 package eu.toldi.infinityforlemmy.activities;
 
-import android.content.Intent;
 import android.content.SharedPreferences;
-import android.graphics.Color;
 import android.graphics.PorterDuff;
-import android.net.Uri;
 import android.os.Bundle;
-import android.text.Spanned;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
 import androidx.constraintlayout.widget.ConstraintLayout;
@@ -45,9 +40,6 @@ import eu.toldi.infinityforlemmy.user.BasicUserInfo;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 import io.noties.markwon.AbstractMarkwonPlugin;
 import io.noties.markwon.Markwon;
-import io.noties.markwon.MarkwonConfiguration;
-import io.noties.markwon.MarkwonPlugin;
-import io.noties.markwon.core.MarkwonTheme;
 import io.noties.markwon.recycler.MarkwonAdapter;
 
 public class InstanceInfoActivity extends BaseActivity {
@@ -120,36 +112,9 @@ public class InstanceInfoActivity extends BaseActivity {
         int markdownColor = customThemeWrapper.getPostContentColor();
         int postSpoilerBackgroundColor = markdownColor | 0xFF000000;
         int linkColor = customThemeWrapper.getLinkColor();
-
-
-        MarkwonPlugin miscPlugin = new AbstractMarkwonPlugin() {
-            @Override
-            public void beforeSetText(@NonNull TextView textView, @NonNull Spanned markdown) {
-                if (InstanceInfoActivity.this.contentTypeface != null) {
-                    textView.setTypeface(InstanceInfoActivity.this.contentTypeface);
-                }
-                textView.setTextColor(markdownColor);
-                textView.setHighlightColor(Color.TRANSPARENT);
-            }
-
-            @Override
-            public void configureConfiguration(@NonNull MarkwonConfiguration.Builder builder) {
-                builder.linkResolver((view, link) -> {
-                    Intent intent = new Intent(InstanceInfoActivity.this, LinkResolverActivity.class);
-                    Uri uri = Uri.parse(link);
-                    intent.setData(uri);
-                    InstanceInfoActivity.this.startActivity(intent);
-                });
-            }
-
-            @Override
-            public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
-                builder.linkColor(linkColor);
-            }
-        };
-
         mPostDetailMarkwon = MarkdownUtils.createFullRedditMarkwon(this,
-                miscPlugin, markdownColor, postSpoilerBackgroundColor, null);
+                new AbstractMarkwonPlugin() {
+                }, markdownColor, postSpoilerBackgroundColor, null);
         mMarkwonAdapter = MarkdownUtils.createTablesAdapter();
         mContentMarkdownView.setAdapter(mMarkwonAdapter);
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);

app/src/main/java/eu/toldi/infinityforlemmy/adapters/SubscribedSubredditsRecyclerViewAdapter.java

@@ -84,10 +84,12 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
         if (mFavoriteSubscribedSubredditData != null && mFavoriteSubscribedSubredditData.size() > 0) {
             if (itemClickListener != null && !hasClearSelectionRow) {
                 if (position == 0) {
+                    return VIEW_TYPE_SUBREDDIT;
+                } else if (position == 1) {
                     return VIEW_TYPE_FAVORITE_SUBREDDIT_DIVIDER;
                 } else if (position == mFavoriteSubscribedSubredditData.size() + 1) {
                     return VIEW_TYPE_SUBREDDIT_DIVIDER;
-                } else if (position <= mFavoriteSubscribedSubredditData.size()) {
+                } else if (position < mFavoriteSubscribedSubredditData.size() + 1) {
                     return VIEW_TYPE_FAVORITE_SUBREDDIT;
                 } else {
                     return VIEW_TYPE_SUBREDDIT;
@@ -158,7 +160,7 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
                                 mFavoriteSubscribedSubredditData.size() + 3 : 1;
                     } else {
                         offset = (mFavoriteSubscribedSubredditData != null && mFavoriteSubscribedSubredditData.size() > 0) ?
-                                mFavoriteSubscribedSubredditData.size() + 2 : 1;
+                                mFavoriteSubscribedSubredditData.size() + 3 : 1;
                     }
                 } else {
                     offset = (mFavoriteSubscribedSubredditData != null && mFavoriteSubscribedSubredditData.size() > 0) ?
@@ -226,7 +228,7 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
                 if (hasClearSelectionRow) {
                     offset = 2;
                 } else {
-                    offset = 1;
+                    offset = 2;
                 }
             } else {
                 offset = 1;
@@ -287,7 +289,7 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
             if (mFavoriteSubscribedSubredditData != null && mFavoriteSubscribedSubredditData.size() > 0) {
                 if (itemClickListener != null) {
                     return mSubscribedSubredditData.size() > 0 ?
-                            mFavoriteSubscribedSubredditData.size() + mSubscribedSubredditData.size() + ((hasClearSelectionRow) ? 3 : 2) : 0;
+                            mFavoriteSubscribedSubredditData.size() + mSubscribedSubredditData.size() + 3 : 0;
                 }
                 return mSubscribedSubredditData.size() > 0 ?
                         mFavoriteSubscribedSubredditData.size() + mSubscribedSubredditData.size() + 2 : 0;
@@ -347,7 +349,7 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
                                     mFavoriteSubscribedSubredditData.size() + 3 : 0;
                         } else {
                             offset = (mFavoriteSubscribedSubredditData != null && mFavoriteSubscribedSubredditData.size() > 0) ?
-                                    mFavoriteSubscribedSubredditData.size() + 2 : 0;
+                                    mFavoriteSubscribedSubredditData.size() + 3 : 0;
                         }
                     } else {
                         offset = (mFavoriteSubscribedSubredditData != null && mFavoriteSubscribedSubredditData.size() > 0) ?
@@ -362,7 +364,7 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
                     if (hasClearSelectionRow) {
                         offset = 2;
                     } else {
-                        offset = 1;
+                        offset = 2;
                     }
                 } else {
                     offset = 1;