diff options
author | Thomas <tschneider.ac@gmail.com> | 2022-11-30 17:07:23 +0100 |
---|---|---|
committer | Thomas <tschneider.ac@gmail.com> | 2022-11-30 17:07:23 +0100 |
commit | 9959904853fd05c563da5b6210960e4c02c1117d (patch) | |
tree | fac21b9445603ceb721c7825831d6866d23ba28e | |
parent | 0ff17dd96ff23e8a43e3596e9ba49acefee7ca4d (diff) |
Some fixes
8 files changed, 13 insertions, 65 deletions
diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java index de70ce38a..36cb47dc9 100644 --- a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java +++ b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java @@ -1134,21 +1134,17 @@ 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); - imm.hideSoftInputFromWindow(holder.binding.buttonEmojiOne.getWindowToken(), 0); - EmojiManager.install(new EmojiOneProvider()); - final EmojiPopup emojiPopup = EmojiPopup.Builder.fromRootView(holder.binding.buttonEmojiOne).setOnEmojiPopupDismissListener(() -> { - imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0); - }).build(holder.binding.content); - emojiPopup.toggle(); - }); - } else { - holder.binding.buttonEmojiOne.setVisibility(View.GONE); - } + + holder.binding.buttonEmojiOne.setVisibility(View.VISIBLE); + holder.binding.buttonEmojiOne.setOnClickListener(v -> { + InputMethodManager imm = (InputMethodManager) context.getSystemService(INPUT_METHOD_SERVICE); + imm.hideSoftInputFromWindow(holder.binding.buttonEmojiOne.getWindowToken(), 0); + EmojiManager.install(new EmojiOneProvider()); + final EmojiPopup emojiPopup = EmojiPopup.Builder.fromRootView(holder.binding.buttonEmojiOne).setOnEmojiPopupDismissListener(() -> { + imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0); + }).build(holder.binding.content); + emojiPopup.toggle(); + }); int newInputType = holder.binding.content.getInputType() & (holder.binding.content.getInputType() ^ InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE); holder.binding.content.setInputType(newInputType); diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/ConversationAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/ConversationAdapter.java index d64834d3c..ed5c8b617 100644 --- a/app/src/main/java/app/fedilab/android/ui/drawer/ConversationAdapter.java +++ b/app/src/main/java/app/fedilab/android/ui/drawer/ConversationAdapter.java @@ -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()) { diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/NotificationAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/NotificationAdapter.java index a0709d317..3dea68903 100644 --- a/app/src/main/java/app/fedilab/android/ui/drawer/NotificationAdapter.java +++ b/app/src/main/java/app/fedilab/android/ui/drawer/NotificationAdapter.java @@ -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)); diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java index e5c3d950c..66d4c107d 100644 --- a/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java +++ b/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java @@ -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); diff --git a/app/src/main/res/layout/drawer_conversation.xml b/app/src/main/res/layout/drawer_conversation.xml index c30d7b1ed..968ebf872 100644 --- a/app/src/main/res/layout/drawer_conversation.xml +++ b/app/src/main/res/layout/drawer_conversation.xml @@ -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" diff --git a/app/src/main/res/layout/drawer_follow.xml b/app/src/main/res/layout/drawer_follow.xml index 4ae70bc5b..9277677e9 100644 --- a/app/src/main/res/layout/drawer_follow.xml +++ b/app/src/main/res/layout/drawer_follow.xml @@ -35,17 +35,6 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - <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_storage_24" - android:visibility="gone" - tools:visibility="visible" /> - <androidx.appcompat.widget.AppCompatTextView android:id="@+id/title" android:layout_width="0dp" diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml index 2dbeb8fa6..aedc310fa 100644 --- a/app/src/main/res/layout/drawer_status.xml +++ b/app/src/main/res/layout/drawer_status.xml @@ -649,17 +649,6 @@ app:sparkbutton_primaryColor="@color/marked_icon" app:sparkbutton_secondaryColor="@color/marked_icon" /> - <androidx.appcompat.widget.AppCompatImageView - android:id="@+id/cache_indicator" - android:layout_width="20dp" - android:layout_height="20dp" - android:layout_marginStart="12dp" - android:layout_gravity="center" - android:adjustViewBounds="true" - android:contentDescription="@string/cached_messages" - android:src="@drawable/ic_baseline_storage_24" - android:visibility="gone" - tools:visibility="visible" /> <View android:layout_width="0dp" diff --git a/app/src/main/res/xml/pref_timelines.xml b/app/src/main/res/xml/pref_timelines.xml index 59cbfdd48..04f2a8b8a 100644 --- a/app/src/main/res/xml/pref_timelines.xml +++ b/app/src/main/res/xml/pref_timelines.xml @@ -36,7 +36,7 @@ app:singleLineTitle="false" app:title="@string/set_share_validation" /> <SwitchPreferenceCompat - android:defaultValue="false" + android:defaultValue="true" app:iconSpaceReserved="false" app:key="@string/SET_DISPLAY_BOOKMARK" app:singleLineTitle="false" |