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

@@ -15,7 +15,6 @@ import com.bumptech.glide.request.RequestOptions;
 
 import java.util.List;
 import java.util.concurrent.Executor;
-import java.util.regex.Pattern;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -187,10 +186,6 @@ public class BlockedCommunitiesRecyclerViewAdapter extends RecyclerView.Adapter<
                         .into(((SubredditViewHolder) viewHolder).iconGifImageView);
             }
             ((SubredditViewHolder) viewHolder).subredditNameTextView.setText(name);
-            if (fullname.contains("@")) {
-                ((SubredditViewHolder) viewHolder).communityInstanceTextView.setText("@" + fullname.split(Pattern.quote("@"), 2)[1]);
-                ((SubredditViewHolder) viewHolder).communityInstanceTextView.setTextColor(CustomThemeWrapper.darkenColor(primaryTextColor, 0.7f));
-            }
         } else if (viewHolder instanceof FavoriteSubredditViewHolder) {
             int offset;
             if (itemClickListener != null) {
@@ -323,9 +318,6 @@ public class BlockedCommunitiesRecyclerViewAdapter extends RecyclerView.Adapter<
         @BindView(R.id.thing_name_text_view_item_subscribed_thing)
         TextView subredditNameTextView;
 
-        @BindView(R.id.thing_instance_text_view_item_subscribed_thing)
-        TextView communityInstanceTextView;
-
         SubredditViewHolder(View itemView) {
             super(itemView);
             ButterKnife.bind(this, itemView);

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

@@ -141,8 +141,7 @@ public class SubredditListingRecyclerViewAdapter extends PagedListAdapter<Subred
                             .into(((DataViewHolder) holder).iconGifImageView);
                 }
 
-                ((DataViewHolder) holder).subredditNameTextView.setText(subredditData.getTitle());
+                ((DataViewHolder) holder).subredditNameTextView.setText(subredditData.getName());
-                ((DataViewHolder) holder).communityInstanceTextView.setText('@' + LemmyUtils.actorID2FullName(subredditData.getActorId()).split("@")[1]);
                 ((DataViewHolder) holder).subscriberCountTextView.setText(activity.getString(R.string.subscribers_number_detail, subredditData.getNSubscribers()));
 
                 if (!isMultiSelection) {
@@ -263,9 +262,6 @@ public class SubredditListingRecyclerViewAdapter extends PagedListAdapter<Subred
         GifImageView iconGifImageView;
         @BindView(R.id.subreddit_name_text_view_item_subreddit_listing)
         TextView subredditNameTextView;
-
-        @BindView(R.id.community_instance_text_view_item_subreddit_listing)
-        TextView communityInstanceTextView;
         @BindView(R.id.subscriber_count_text_view_item_subreddit_listing)
         TextView subscriberCountTextView;
         @BindView(R.id.subscribe_image_view_item_subreddit_listing)
@@ -277,7 +273,6 @@ public class SubredditListingRecyclerViewAdapter extends PagedListAdapter<Subred
             super(itemView);
             ButterKnife.bind(this, itemView);
             subredditNameTextView.setTextColor(primaryTextColor);
-            communityInstanceTextView.setTextColor(CustomThemeWrapper.darkenColor(primaryTextColor, 0.7f));
             subscriberCountTextView.setTextColor(secondaryTextColor);
             subscribeButton.setColorFilter(unsubscribed, android.graphics.PorterDuff.Mode.SRC_IN);
             if (isMultiSelection) {

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

@@ -220,9 +220,6 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
                         .into(((SubredditViewHolder) viewHolder).iconGifImageView);
             }
             ((SubredditViewHolder) viewHolder).subredditNameTextView.setText(name);
-            if (fullname.contains("@")) {
-                ((SubredditViewHolder) viewHolder).communityInstanceTextView.setText(fullname.substring(fullname.indexOf("@")));
-            }
         } else if (viewHolder instanceof FavoriteSubredditViewHolder) {
             int offset;
             if (itemClickListener != null) {
@@ -236,7 +233,6 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
             }
             SubscribedSubredditData communityData = mFavoriteSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset);
             String name = mFavoriteSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset).getName();
-            String fullname = mFavoriteSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset).getQualified_name();
             String iconUrl = mFavoriteSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset).getIconUrl();
 
             if (mFavoriteSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset).isFavorite()) {
@@ -282,9 +278,6 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
                         .into(((FavoriteSubredditViewHolder) viewHolder).iconGifImageView);
             }
             ((FavoriteSubredditViewHolder) viewHolder).subredditNameTextView.setText(name);
-            if (fullname.contains("@")) {
-                ((FavoriteSubredditViewHolder) viewHolder).communityInstanceTextView.setText(fullname.substring(fullname.indexOf("@")));
-            }
         }
     }
 
@@ -389,9 +382,6 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
         GifImageView iconGifImageView;
         @BindView(R.id.thing_name_text_view_item_subscribed_thing)
         TextView subredditNameTextView;
-
-        @BindView(R.id.thing_instance_text_view_item_subscribed_thing)
-        TextView communityInstanceTextView;
         @BindView(R.id.favorite_image_view_item_subscribed_thing)
         ImageView favoriteImageView;
 
@@ -400,10 +390,8 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
             ButterKnife.bind(this, itemView);
             if (mActivity.typeface != null) {
                 subredditNameTextView.setTypeface(mActivity.typeface);
-                communityInstanceTextView.setTypeface(mActivity.typeface);
             }
             subredditNameTextView.setTextColor(primaryTextColor);
-            communityInstanceTextView.setTextColor(CustomThemeWrapper.darkenColor(primaryTextColor, 0.7f));
         }
     }
 
@@ -412,9 +400,6 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
         GifImageView iconGifImageView;
         @BindView(R.id.thing_name_text_view_item_subscribed_thing)
         TextView subredditNameTextView;
-
-        @BindView(R.id.thing_instance_text_view_item_subscribed_thing)
-        TextView communityInstanceTextView;
         @BindView(R.id.favorite_image_view_item_subscribed_thing)
         ImageView favoriteImageView;
 
@@ -424,10 +409,8 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
             ButterKnife.bind(this, itemView);
             if (mActivity.typeface != null) {
                 subredditNameTextView.setTypeface(mActivity.typeface);
-                communityInstanceTextView.setTypeface(mActivity.typeface);
             }
             subredditNameTextView.setTextColor(primaryTextColor);
-            communityInstanceTextView.setTextColor(CustomThemeWrapper.darkenColor(primaryTextColor, 0.7f));
         }
     }
 

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

@@ -136,9 +136,7 @@ public class UserListingRecyclerViewAdapter extends PagedListAdapter<UserData, R
                             .into(((DataViewHolder) holder).iconGifImageView);
                 }
 
-                ((DataViewHolder) holder).userNameTextView.setText(userData.getTitle().equals("") ? userData.getName() : userData.getTitle());
+                ((DataViewHolder) holder).userNameTextView.setText(userData.getName());
-                String qualifiedName = LemmyUtils.actorID2FullName(userData.getActorId());
-                ((DataViewHolder) holder).userInstanceTextView.setText(qualifiedName.substring(qualifiedName.indexOf('@')));
 
                 if (!isMultiSelection) {
                     CheckIsFollowingUser.checkIsFollowingUser(executor, new Handler(), redditDataRoomDatabase,
@@ -239,9 +237,6 @@ public class UserListingRecyclerViewAdapter extends PagedListAdapter<UserData, R
         GifImageView iconGifImageView;
         @BindView(R.id.user_name_text_view_item_user_listing)
         TextView userNameTextView;
-
-        @BindView(R.id.user_instance_text_view_item_user_listing)
-        TextView userInstanceTextView;
         @BindView(R.id.subscribe_image_view_item_user_listing)
         ImageView subscribeButton;
         @BindView(R.id.checkbox__item_user_listing)
@@ -251,7 +246,6 @@ public class UserListingRecyclerViewAdapter extends PagedListAdapter<UserData, R
             super(itemView);
             ButterKnife.bind(this, itemView);
             userNameTextView.setTextColor(primaryTextColor);
-            userInstanceTextView.setTextColor(CustomThemeWrapper.darkenColor(primaryTextColor, 0.7f));
             subscribeButton.setColorFilter(unsubscribedColor, android.graphics.PorterDuff.Mode.SRC_IN);
 
             if (activity.typeface != null) {

app/src/main/res/layout/item_subreddit_listing.xml

@@ -20,28 +20,15 @@
 
     <TextView
         android:id="@+id/subreddit_name_text_view_item_subreddit_listing"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="32dp"
         android:fontFamily="?attr/font_family"
-        android:maxLines="1"
-        android:ellipsize="end"
         android:textSize="?attr/font_default"
         app:layout_constraintStart_toEndOf="@+id/subreddit_icon_gif_image_view_item_subreddit_listing"
+        app:layout_constraintEnd_toStartOf="@id/barrier3"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/community_instance_text_view_item_subreddit_listing"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fontFamily="?attr/font_family"
-        android:maxLines="1"
-        android:ellipsize="end"
-        android:textSize="?attr/font_default"
-        app:layout_constraintStart_toEndOf="@+id/subreddit_name_text_view_item_subreddit_listing"
-        app:layout_constraintTop_toTopOf="parent" />
-
-
     <TextView
         android:id="@+id/subscriber_count_text_view_item_subreddit_listing"
         android:layout_width="0dp"

app/src/main/res/layout/item_subscribed_thing.xml

@@ -15,33 +15,14 @@
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="32dp" />
 
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:orientation="horizontal">
-
     <TextView
         android:id="@+id/thing_name_text_view_item_subscribed_thing"
-            android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
+        android:layout_weight="1"
-            android:ellipsize="end"
+        android:textSize="?attr/font_default"
         android:fontFamily="?attr/font_family"
-            android:gravity="start"
+        android:layout_gravity="center_vertical" />
-            android:maxLines="1"
-            android:textSize="?attr/font_default" />
-
-        <TextView
-            android:id="@+id/thing_instance_text_view_item_subscribed_thing"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:ellipsize="end"
-            android:fontFamily="?attr/font_family"
-            android:maxLines="1"
-            android:textSize="?attr/font_default" />
-    </LinearLayout>
 
     <ImageView
         android:id="@+id/favorite_image_view_item_subscribed_thing"

app/src/main/res/layout/item_user_listing.xml

@@ -24,27 +24,12 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="32dp"
-        android:maxLines="1"
-        android:ellipsize="end"
         android:textSize="?attr/font_default"
         android:fontFamily="?attr/font_family"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/user_icon_gif_image_view_item_user_listing"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/user_instance_text_view_item_user_listing"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:fontFamily="?attr/font_family"
-        android:maxLines="1"
-        android:ellipsize="end"
-        android:textSize="?attr/font_default"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/user_name_text_view_item_user_listing"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <ImageView
         android:id="@+id/subscribe_image_view_item_user_listing"
         android:layout_width="wrap_content"