Truncate long names in the navigation header

Fixed theming on:
- Post content on PostImage and PostLink activities
- Report content forms

Closes #163

app/build.gradle

@@ -108,7 +108,7 @@ dependencies {
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.9.0"
+
     def lifecycleVersion = "2.5.1"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-livedata:$lifecycleVersion"

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

@@ -475,6 +475,8 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF
         nsfwTextView.setTextColor(primaryTextColor);
         titleEditText.setTextColor(primaryTextColor);
         titleEditText.setHintTextColor(secondaryTextColor);
+        contentEditText.setTextColor(primaryTextColor);
+        contentEditText.setHintTextColor(secondaryTextColor);
         boolean circleFab = mSharedPreferences.getBoolean(SharedPreferencesUtils.USE_CIRCULAR_FAB, false);
         applyFABTheme(captureFab, circleFab);
         applyFABTheme(selectFromLibraryFab, circleFab);
@@ -487,6 +489,10 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF
             titleEditText.setTypeface(typeface);
             selectAgainTextView.setTypeface(typeface);
         }
+
+        if (contentTypeface != null) {
+            contentEditText.setTypeface(contentTypeface);
+        }
     }
 
     private void loadImage() {

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

@@ -458,6 +458,8 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr
         titleEditText.setHintTextColor(secondaryTextColor);
         suggestTitleButton.setBackgroundColor(mCustomThemeWrapper.getColorPrimaryLightTheme());
         suggestTitleButton.setTextColor(mCustomThemeWrapper.getButtonTextColor());
+        contentEditText.setTextColor(primaryTextColor);
+        contentEditText.setHintTextColor(secondaryTextColor);
         linkEditText.setTextColor(primaryTextColor);
         linkEditText.setHintTextColor(secondaryTextColor);
         if (typeface != null) {
@@ -470,6 +472,7 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr
         }
         if (contentTypeface != null) {
             linkEditText.setTypeface(contentTypeface);
+            contentEditText.setTypeface(contentTypeface);
         }
     }
 

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

@@ -155,7 +155,21 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
                 viewHolder.itemView.setOnClickListener(view -> itemClickListener.onClick(null));
                 return;
             } else {
-                int offset = hasClearSelectionRow ? 1 : 0;
+                int offset;
+                if (itemClickListener != null) {
+                    if (hasClearSelectionRow) {
+                        offset = (mFavoriteSubscribedSubredditData != null && mFavoriteSubscribedSubredditData.size() > 0) ?
+                                mFavoriteSubscribedSubredditData.size() + 4 : 2;
+                    } else {
+                        offset = (mFavoriteSubscribedSubredditData != null && mFavoriteSubscribedSubredditData.size() > 0) ?
+                                mFavoriteSubscribedSubredditData.size() + 3 : 1;
+                    }
+                } else {
+                    offset = (mFavoriteSubscribedSubredditData != null && mFavoriteSubscribedSubredditData.size() > 0) ?
+                            mFavoriteSubscribedSubredditData.size() + 2 : 0;
+                }
+
+
                 SubscribedSubredditData communityData = mSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset);
                 name = mSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset).getName();
                 fullname = mSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset).getQualified_name();
@@ -273,9 +287,26 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
     @Override
     public int getItemCount() {
         if (mSubscribedSubredditData != null) {
+            if (mFavoriteSubscribedSubredditData != null && mFavoriteSubscribedSubredditData.size() > 0) {
+                if (itemClickListener != null) {
+                    if (hasClearSelectionRow) {
+                        return mSubscribedSubredditData.size() > 0 ?
+                                mFavoriteSubscribedSubredditData.size() + mSubscribedSubredditData.size() + 4 : 0;
+                    } else {
+                        return mSubscribedSubredditData.size() > 0 ?
+                                mFavoriteSubscribedSubredditData.size() + mSubscribedSubredditData.size() + 3 : 0;
+                    }
+                }
+                return mSubscribedSubredditData.size() > 0 ?
+                        mFavoriteSubscribedSubredditData.size() + mSubscribedSubredditData.size() + 2 : 0;
+            }
 
             if (itemClickListener != null) {
-                return mSubscribedSubredditData.size() > 0 ? mSubscribedSubredditData.size() + ((hasClearSelectionRow) ? 1 : 0) : 0;
+                if (hasClearSelectionRow) {
+                    return mSubscribedSubredditData.size() > 0 ? mSubscribedSubredditData.size() + 2 : 0;
+                } else {
+                    return mSubscribedSubredditData.size() > 0 ? mSubscribedSubredditData.size() + 1 : 0;
+                }
             }
 
             return mSubscribedSubredditData.size();
@@ -283,6 +314,7 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
         return 0;
     }
 
+
     @Override
     public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
         if(holder instanceof SubredditViewHolder) {

app/src/main/java/eu/toldi/infinityforlemmy/bottomsheetfragments/CommentMoreBottomSheetFragment.java

@@ -211,6 +211,12 @@ public class CommentMoreBottomSheetFragment extends LandscapeExpandedRoundedBott
             LayoutInflater dialog_inflater = LayoutInflater.from(activity);
             View dialog_view = dialog_inflater.inflate(R.layout.dialog_report, null);
             EditText reasonEditText = dialog_view.findViewById(R.id.reasonEditText);
+            reasonEditText.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
+            reasonEditText.setHintTextColor(mCustomThemeWrapper.getSecondaryTextColor());
+            if (activity.typeface != null) {
+                reasonEditText.setTypeface(activity.typeface);
+            }
+            reasonEditText.setHighlightColor(mCustomThemeWrapper.getColorAccent());
 
             MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(activity)
                     .setTitle(R.string.report_post)

app/src/main/java/eu/toldi/infinityforlemmy/fragments/ViewPostDetailFragment.java

@@ -1155,10 +1155,6 @@ public class ViewPostDetailFragment extends Fragment implements FragmentCommunic
                     .show();
             return true;
         } else if (itemId == R.id.action_report_view_post_detail_fragment) {
-            if (mAccessToken == null) {
-                Toast.makeText(activity, R.string.login_first, Toast.LENGTH_SHORT).show();
-                return true;
-            }
             if (mAccessToken == null) {
                 Toast.makeText(activity, R.string.login_first, Toast.LENGTH_SHORT).show();
                 return true;
@@ -1166,7 +1162,11 @@ public class ViewPostDetailFragment extends Fragment implements FragmentCommunic
             LayoutInflater inflater = LayoutInflater.from(activity);
             View view = inflater.inflate(R.layout.dialog_report, null);
             EditText reasonEditText = view.findViewById(R.id.reasonEditText);
-
+            reasonEditText.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
+            reasonEditText.setHintTextColor(mCustomThemeWrapper.getSecondaryTextColor());
+            if (activity.typeface != null) {
+                reasonEditText.setTypeface(activity.typeface);
+            }
             MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(activity)
                     .setTitle(R.string.report_post)
                     .setView(view)

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

@@ -28,6 +28,8 @@
         android:layout_marginTop="@dimen/nav_header_vertical_spacing"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
+        android:maxLines="1"
+        android:ellipsize="end"
         android:layout_alignParentStart="true"
         android:textSize="?attr/font_default"
         android:fontFamily="?attr/font_family"
@@ -40,6 +42,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
+        android:maxLines="1"
+        android:ellipsize="end"
         android:layout_alignParentStart="true"
         android:layout_below="@id/name_text_view_nav_header_main"
         android:layout_toStartOf="@id/account_switcher_image_view_nav_header_main"