Commit 99599048 authored by Thomas's avatar Thomas
Browse files

Some fixes

parent 0ff17dd9

app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java

+11 −15
Original line number Diff line number Diff line
@@ -1134,8 +1134,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder 


            ComposeViewHolder holder = (ComposeViewHolder) viewHolder;



            boolean displayEmoji = sharedpreferences.getBoolean(context.getString(R.string.SET_DISPLAY_EMOJI), false);

            if (displayEmoji) {



            holder.binding.buttonEmojiOne.setVisibility(View.VISIBLE);

            holder.binding.buttonEmojiOne.setOnClickListener(v -> {

                InputMethodManager imm = (InputMethodManager) context.getSystemService(INPUT_METHOD_SERVICE);
@@ -1146,9 +1145,6 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder 
                }).build(holder.binding.content);

                emojiPopup.toggle();

            });

            } else {

                holder.binding.buttonEmojiOne.setVisibility(View.GONE);

            }



            int newInputType = holder.binding.content.getInputType() & (holder.binding.content.getInputType() ^ InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE);

            holder.binding.content.setInputType(newInputType);

app/src/main/java/app/fedilab/android/ui/drawer/ConversationAdapter.java

+0 −5
Original line number Diff line number Diff line
@@ -138,11 +138,6 @@ public class ConversationAdapter extends RecyclerView.Adapter<RecyclerView.ViewH 
        } else {

            holder.binding.layoutFetchMore.fetchMoreContainer.setVisibility(View.GONE);

        }

        if (conversation.cached) {

            holder.binding.cacheIndicator.setVisibility(View.VISIBLE);

        } else {

            holder.binding.cacheIndicator.setVisibility(View.GONE);

        }

        //---- SPOILER TEXT -----

        boolean expand_cw = sharedpreferences.getBoolean(context.getString(R.string.SET_EXPAND_CW), false);

        if (conversation.last_status.spoiler_text != null && !conversation.last_status.spoiler_text.trim().isEmpty()) {

app/src/main/java/app/fedilab/android/ui/drawer/NotificationAdapter.java

+0 −5
Original line number Diff line number Diff line
@@ -217,11 +217,6 @@ public class NotificationAdapter extends RecyclerView.Adapter<RecyclerView.ViewH 
            } else {

                holderFollow.binding.layoutFetchMore.fetchMoreContainer.setVisibility(View.GONE);

            }

            if (notification.cached) {

                holderFollow.binding.cacheIndicator.setVisibility(View.VISIBLE);

            } else {

                holderFollow.binding.cacheIndicator.setVisibility(View.GONE);

            }

        } else if (getItemViewType(position) == TYPE_FILERED) {

            StatusAdapter.StatusViewHolder holder = (StatusAdapter.StatusViewHolder) viewHolder;

            holder.bindingFiltered.filteredText.setText(context.getString(R.string.filtered_by, notification.filteredByApp.title));

app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java

+1 −7
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
        boolean confirmFav = sharedpreferences.getBoolean(context.getString(R.string.SET_NOTIF_VALIDATION_FAV), false);

        boolean confirmBoost = sharedpreferences.getBoolean(context.getString(R.string.SET_NOTIF_VALIDATION), true);

        boolean fullAttachement = sharedpreferences.getBoolean(context.getString(R.string.SET_FULL_PREVIEW), false);

        boolean displayBookmark = sharedpreferences.getBoolean(context.getString(R.string.SET_DISPLAY_BOOKMARK), false);

        boolean displayBookmark = sharedpreferences.getBoolean(context.getString(R.string.SET_DISPLAY_BOOKMARK), true);

        boolean long_press_media = sharedpreferences.getBoolean(context.getString(R.string.SET_LONG_PRESS_STORE_MEDIA), false);

        boolean displayCounters = sharedpreferences.getBoolean(context.getString(R.string.SET_DISPLAY_COUNTER_FAV_BOOST), false);

        String loadMediaType = sharedpreferences.getString(context.getString(R.string.SET_LOAD_MEDIA_TYPE), "ALWAYS");
@@ -515,12 +515,6 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
        holder.binding.actionButtonBoost.setActiveImageTint(R.color.boost_icon);

        holder.binding.actionButtonBookmark.setActiveImageTint(R.color.marked_icon);



        if (status.cached) {

            holder.binding.cacheIndicator.setVisibility(View.VISIBLE);

        } else {

            holder.binding.cacheIndicator.setVisibility(View.GONE);

        }





        if (status.pinned) {

            holder.binding.statusPinned.setVisibility(View.VISIBLE);

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

+0 −10
Original line number Diff line number Diff line
@@ -37,16 +37,6 @@ 
            android:orientation="horizontal"

            android:padding="6dp">



            <androidx.appcompat.widget.AppCompatImageView

                android:id="@+id/cache_indicator"

                android:layout_width="16sp"

                android:layout_height="16sp"

                android:layout_gravity="center"

                android:layout_marginEnd="12dp"

                android:adjustViewBounds="true"

                android:src="@drawable/ic_baseline_cached_24"

                android:visibility="gone"

                tools:visibility="visible" />



            <HorizontalScrollView

                android:layout_width="0dp"