From 64c62c6567ff1c44b509d938aef84edc004cf7bb Mon Sep 17 00:00:00 2001 From: Martin Fietz Date: Thu, 14 Apr 2016 11:39:09 +0200 Subject: [PATCH] Enable full hyphenation on Android 6 --- .../antennapod/adapter/AllEpisodesRecycleAdapter.java | 5 +++++ .../de/danoeh/antennapod/adapter/DownloadLogAdapter.java | 5 +++++ .../antennapod/adapter/DownloadedEpisodesListAdapter.java | 5 +++++ .../de/danoeh/antennapod/adapter/FeedItemlistAdapter.java | 8 ++++++-- .../danoeh/antennapod/adapter/QueueRecyclerAdapter.java | 5 +++++ .../de/danoeh/antennapod/adapter/SearchlistAdapter.java | 5 +++++ .../java/de/danoeh/antennapod/fragment/ItemFragment.java | 4 ++++ 7 files changed, 35 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java index 408a32f17..d5cca217f 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java @@ -1,8 +1,10 @@ package de.danoeh.antennapod.adapter; +import android.os.Build; import android.support.v4.content.ContextCompat; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.helper.ItemTouchHelper; +import android.text.Layout; import android.util.Log; import android.view.ContextMenu; import android.view.LayoutInflater; @@ -81,6 +83,9 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter= 23) { + holder.title.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL); + } holder.pubDate = (TextView) view .findViewById(R.id.txtvPublished); holder.statusUnread = view.findViewById(R.id.statusUnread); diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java index 85271a083..e271b5eed 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java @@ -1,7 +1,9 @@ package de.danoeh.antennapod.adapter; import android.content.Context; +import android.os.Build; import android.support.v4.content.ContextCompat; +import android.text.Layout; import android.text.format.DateUtils; import android.util.Log; import android.view.LayoutInflater; @@ -52,6 +54,9 @@ public class DownloadLogAdapter extends BaseAdapter { holder.retry = (IconButton) convertView.findViewById(R.id.btnRetry); holder.date = (TextView) convertView.findViewById(R.id.txtvDate); holder.title = (TextView) convertView.findViewById(R.id.txtvTitle); + if(Build.VERSION.SDK_INT >= 23) { + holder.title.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL); + } holder.type = (TextView) convertView.findViewById(R.id.txtvType); holder.reason = (TextView) convertView.findViewById(R.id.txtvReason); convertView.setTag(holder); diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java index 53dedd496..6d0beff9e 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java @@ -1,6 +1,8 @@ package de.danoeh.antennapod.adapter; import android.content.Context; +import android.os.Build; +import android.text.Layout; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -60,6 +62,9 @@ public class DownloadedEpisodesListAdapter extends BaseAdapter { parent, false); holder.imageView = (ImageView) convertView.findViewById(R.id.imgvImage); holder.title = (TextView) convertView.findViewById(R.id.txtvTitle); + if(Build.VERSION.SDK_INT >= 23) { + holder.title.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL); + } holder.txtvSize = (TextView) convertView.findViewById(R.id.txtvSize); holder.queueStatus = (ImageView) convertView.findViewById(R.id.imgvInPlaylist); holder.pubDate = (TextView) convertView diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java index 0de1ca1ff..f8a16983d 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java @@ -2,7 +2,9 @@ package de.danoeh.antennapod.adapter; import android.content.Context; import android.content.res.TypedArray; +import android.os.Build; import android.support.v4.content.ContextCompat; +import android.text.Layout; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; @@ -95,8 +97,10 @@ public class FeedItemlistAdapter extends BaseAdapter { convertView = inflater.inflate(R.layout.feeditemlist_item, parent, false); holder.container = (LinearLayout) convertView .findViewById(R.id.container); - holder.title = (TextView) convertView - .findViewById(R.id.txtvItemname); + holder.title = (TextView) convertView.findViewById(R.id.txtvItemname); + if(Build.VERSION.SDK_INT >= 23) { + holder.title.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL); + } holder.lenSize = (TextView) convertView .findViewById(R.id.txtvLenSize); holder.butAction = (ImageButton) convertView diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java index 0e3f82e37..44736fc05 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java @@ -1,10 +1,12 @@ package de.danoeh.antennapod.adapter; +import android.os.Build; import android.support.annotation.Nullable; import android.support.v4.content.ContextCompat; import android.support.v4.view.MotionEventCompat; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.helper.ItemTouchHelper; +import android.text.Layout; import android.text.TextUtils; import android.util.Log; import android.view.ContextMenu; @@ -141,6 +143,9 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter= 23) { + title.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL); + } pubDate = (TextView) v.findViewById(R.id.txtvPubDate); progressLeft = (TextView) v.findViewById(R.id.txtvProgressLeft); progressRight = (TextView) v.findViewById(R.id.txtvProgressRight); diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java index c15dd4ac6..a68ef01d9 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java @@ -1,6 +1,8 @@ package de.danoeh.antennapod.adapter; import android.content.Context; +import android.os.Build; +import android.text.Layout; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -60,6 +62,9 @@ public class SearchlistAdapter extends BaseAdapter { convertView = inflater.inflate(R.layout.searchlist_item, parent, false); holder.title = (TextView) convertView.findViewById(R.id.txtvTitle); + if(Build.VERSION.SDK_INT >= 23) { + holder.title.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL); + } holder.cover = (ImageView) convertView .findViewById(R.id.imgvFeedimage); holder.subtitle = (TextView) convertView diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java index eca6db34e..57d450118 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java @@ -10,6 +10,7 @@ import android.support.annotation.Nullable; import android.support.v4.app.Fragment; import android.support.v4.content.ContextCompat; import android.support.v4.view.GestureDetectorCompat; +import android.text.Layout; import android.text.TextUtils; import android.util.Log; import android.view.ContextMenu; @@ -175,6 +176,9 @@ public class ItemFragment extends Fragment implements OnSwipeGesture { txtvPodcast = (TextView) layout.findViewById(R.id.txtvPodcast); txtvPodcast.setOnClickListener(v -> openPodcast()); txtvTitle = (TextView) layout.findViewById(R.id.txtvTitle); + if(Build.VERSION.SDK_INT >= 23) { + txtvTitle.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL); + } txtvDuration = (TextView) layout.findViewById(R.id.txtvDuration); txtvPublished = (TextView) layout.findViewById(R.id.txtvPublished); if (Build.VERSION.SDK_INT >= 14) { // ellipsize is causing problems on old versions, see #448