diff options
author | ByteHamster <ByteHamster@users.noreply.github.com> | 2021-02-13 13:53:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-13 13:53:18 +0100 |
commit | cca5a8a624f0d3529c99975f2440321a3b8872f4 (patch) | |
tree | 34d21d3ac2b51a18ee4e974203ce6ce46a7c982f /app | |
parent | 1a803fcbf811489522d286a12e6b4d833f8eb7f3 (diff) | |
parent | b0af98e6445832acf8ea4eec13665026fe47b3dc (diff) | |
download | AntennaPod-cca5a8a624f0d3529c99975f2440321a3b8872f4.zip |
Merge pull request #4920 from ByteHamster/jcenter-deprecation
Migrate away from jcenter
Diffstat (limited to 'app')
4 files changed, 6 insertions, 12 deletions
diff --git a/app/build.gradle b/app/build.gradle index 6a6e097c7..dfdfdd828 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -193,9 +193,8 @@ dependencies { implementation "com.joanzapata.iconify:android-iconify-fontawesome:$iconifyVersion" implementation "com.joanzapata.iconify:android-iconify-material:$iconifyVersion" - implementation 'com.yqritc:recyclerview-flexibledivider:1.4.0' implementation 'com.github.shts:TriangleLabelView:1.1.2' - implementation 'com.leinardi.android:speed-dial:3.1.1' + implementation 'com.github.leinardi:FloatingActionButtonSpeedDial:3.1.1' implementation "com.github.AntennaPod:AntennaPod-AudioPlayer:$audioPlayerVersion" implementation 'com.github.mfietz:fyydlin:v0.5.0' implementation 'com.github.ByteHamster:SearchPreference:v2.0.0' diff --git a/app/src/main/assets/licenses.xml b/app/src/main/assets/licenses.xml index b6e12cf54..aa0ad740b 100644 --- a/app/src/main/assets/licenses.xml +++ b/app/src/main/assets/licenses.xml @@ -91,12 +91,6 @@ license="Apache 2.0" licenseText="LICENSE_APACHE-2.0.txt" /> <library - name="RecyclerView-FlexibleDivider" - author="yqritc" - website="https://github.com/yqritc/RecyclerView-FlexibleDivider" - license="Apache 2.0" - licenseText="LICENSE_APACHE-2.0.txt" /> - <library name="RxAndroid" author="ReactiveX" website="https://github.com/ReactiveX/RxAndroid" diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java index d781d0774..624345907 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java @@ -8,9 +8,9 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.yqritc.recyclerviewflexibledivider.HorizontalDividerItemDecoration; import de.danoeh.antennapod.R; import de.danoeh.antennapod.adapter.ChaptersListAdapter; import de.danoeh.antennapod.core.event.PlaybackPositionEvent; @@ -45,7 +45,8 @@ public class ChaptersFragment extends Fragment { RecyclerView recyclerView = root.findViewById(R.id.recyclerView); layoutManager = new LinearLayoutManager(getActivity()); recyclerView.setLayoutManager(layoutManager); - recyclerView.addItemDecoration(new HorizontalDividerItemDecoration.Builder(getActivity()).build()); + recyclerView.addItemDecoration(new DividerItemDecoration(recyclerView.getContext(), + layoutManager.getOrientation())); adapter = new ChaptersListAdapter(getActivity(), pos -> { if (controller.getStatus() != PlayerStatus.PLAYING) { diff --git a/app/src/main/java/de/danoeh/antennapod/view/EpisodeItemListRecyclerView.java b/app/src/main/java/de/danoeh/antennapod/view/EpisodeItemListRecyclerView.java index 83d90f98b..fb1c533c5 100644 --- a/app/src/main/java/de/danoeh/antennapod/view/EpisodeItemListRecyclerView.java +++ b/app/src/main/java/de/danoeh/antennapod/view/EpisodeItemListRecyclerView.java @@ -6,9 +6,9 @@ import android.content.res.Configuration; import android.util.AttributeSet; import android.view.View; import androidx.appcompat.view.ContextThemeWrapper; +import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.yqritc.recyclerviewflexibledivider.HorizontalDividerItemDecoration; import de.danoeh.antennapod.R; import io.reactivex.annotations.Nullable; @@ -39,7 +39,7 @@ public class EpisodeItemListRecyclerView extends RecyclerView { layoutManager.setRecycleChildrenOnDetach(true); setLayoutManager(layoutManager); setHasFixedSize(true); - addItemDecoration(new HorizontalDividerItemDecoration.Builder(getContext()).build()); + addItemDecoration(new DividerItemDecoration(getContext(), layoutManager.getOrientation())); setClipToPadding(false); } |