diff options
author | ByteHamster <ByteHamster@users.noreply.github.com> | 2022-12-11 16:31:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-11 16:31:16 +0100 |
commit | 690eb6af8de3f9b8bb55adfdd9f524abe9a7b022 (patch) | |
tree | f66bd14ea29d06647596f63695c05dda3cb79d70 /app/src/main/java/de/danoeh | |
parent | 7101ea41f0ba1c5c3349d20c6442431d61eb4208 (diff) | |
parent | b1237094b2fd2474a262bcff48916dc540c4fd33 (diff) | |
download | AntennaPod-690eb6af8de3f9b8bb55adfdd9f524abe9a7b022.zip |
Merge pull request #6230 from ByteHamster/home-tweaks2
Make layout of home sections more clean and easy
Diffstat (limited to 'app/src/main/java/de/danoeh')
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/ui/home/HomeSection.java | 11 | ||||
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/ui/home/sections/InboxSection.java | 7 |
2 files changed, 15 insertions, 3 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/home/HomeSection.java b/app/src/main/java/de/danoeh/antennapod/ui/home/HomeSection.java index dd48f0ada..30513c198 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/home/HomeSection.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/home/HomeSection.java @@ -9,8 +9,9 @@ import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.text.TextUtilsCompat; +import androidx.core.view.ViewCompat; import androidx.fragment.app.Fragment; -import de.danoeh.antennapod.R; import de.danoeh.antennapod.adapter.EpisodeItemListAdapter; import de.danoeh.antennapod.adapter.HorizontalItemListAdapter; import de.danoeh.antennapod.databinding.HomeSectionBinding; @@ -18,6 +19,8 @@ import de.danoeh.antennapod.menuhandler.FeedItemMenuHandler; import de.danoeh.antennapod.model.feed.FeedItem; import org.greenrobot.eventbus.EventBus; +import java.util.Locale; + /** * Section on the HomeFragment */ @@ -31,7 +34,11 @@ public abstract class HomeSection extends Fragment implements View.OnCreateConte @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { viewBinding = HomeSectionBinding.inflate(inflater); viewBinding.titleLabel.setText(getSectionTitle()); - viewBinding.moreButton.setText(getString(R.string.navigate_arrows, getMoreLinkTitle())); + if (TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) == ViewCompat.LAYOUT_DIRECTION_LTR) { + viewBinding.moreButton.setText(getMoreLinkTitle() + "\u00A0»"); + } else { + viewBinding.moreButton.setText("«\u00A0" + getMoreLinkTitle()); + } viewBinding.moreButton.setOnClickListener((view) -> handleMoreClick()); if (TextUtils.isEmpty(getMoreLinkTitle())) { viewBinding.moreButton.setVisibility(View.INVISIBLE); diff --git a/app/src/main/java/de/danoeh/antennapod/ui/home/sections/InboxSection.java b/app/src/main/java/de/danoeh/antennapod/ui/home/sections/InboxSection.java index 3e7b02fd3..e635e9538 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/home/sections/InboxSection.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/home/sections/InboxSection.java @@ -36,6 +36,7 @@ import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import java.util.List; +import java.util.Locale; public class InboxSection extends HomeSection { public static final String TAG = "InboxSection"; @@ -133,7 +134,11 @@ public class InboxSection extends HomeSection { adapter.setDummyViews(0); adapter.updateItems(items); viewBinding.numNewItemsLabel.setVisibility(View.VISIBLE); - viewBinding.numNewItemsLabel.setText(String.valueOf(data.second)); + if (data.second >= 100) { + viewBinding.numNewItemsLabel.setText(String.format(Locale.getDefault(), "%d+", 99)); + } else { + viewBinding.numNewItemsLabel.setText(String.format(Locale.getDefault(), "%d", data.second)); + } }, error -> Log.e(TAG, Log.getStackTraceString(error))); } } |