Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move Glide to its own module

Browse Source
This commit is contained in:
ByteHamster 2022-11-01 13:07:18 +01:00
parent 6921d7162e
commit c1fbb53805
23 changed files with 52 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -90,6 +90,7 @@ dependencies {
implementation project(':storage:database')
implementation project(':ui:app-start-intent')
implementation project(':ui:common')
implementation project(':ui:glide')
implementation project(':ui:i18n')
implementation project(':ui:statistics')
@ -112,7 +113,6 @@ dependencies {
implementation "commons-io:commons-io:$commonsioVersion"
implementation "org.jsoup:jsoup:$jsoupVersion"
implementation "com.github.bumptech.glide:glide:$glideVersion"
annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion"
implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
implementation "com.squareup.okhttp3:okhttp-urlconnection:$okhttpVersion"
implementation "com.squareup.okio:okio:$okioVersion"

2
app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
View File

@ -38,7 +38,6 @@ import de.danoeh.antennapod.core.feed.FeedUrlNotFoundException;
import de.danoeh.antennapod.core.util.DownloadErrorLabel;
import de.danoeh.antennapod.event.FeedListUpdateEvent;
import de.danoeh.antennapod.event.PlayerStatusEvent;
import de.danoeh.antennapod.core.glide.FastBlurTransformation;
import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
import de.danoeh.antennapod.core.preferences.UserPreferences;
import de.danoeh.antennapod.core.service.download.DownloadRequest;
@ -64,6 +63,7 @@ import de.danoeh.antennapod.model.feed.Feed;
import de.danoeh.antennapod.model.feed.FeedPreferences;
import de.danoeh.antennapod.model.playback.RemoteMedia;
import de.danoeh.antennapod.parser.feed.UnsupportedFeedtypeException;
import de.danoeh.antennapod.ui.glide.FastBlurTransformation;
import io.reactivex.Maybe;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;

2
app/src/main/java/de/danoeh/antennapod/adapter/CoverLoader.java
View File

@ -23,9 +23,9 @@ import com.bumptech.glide.request.transition.Transition;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.activity.MainActivity;
import de.danoeh.antennapod.core.glide.PaletteBitmap;
import de.danoeh.antennapod.core.preferences.UserPreferences;
import de.danoeh.antennapod.ui.common.ThemeUtils;
import de.danoeh.antennapod.ui.glide.PaletteBitmap;
public class CoverLoader {
private int resource = 0;

2
app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java
View File

@ -36,7 +36,6 @@ import com.google.android.material.snackbar.Snackbar;
import com.joanzapata.iconify.Iconify;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.activity.MainActivity;
import de.danoeh.antennapod.core.glide.FastBlurTransformation;
import de.danoeh.antennapod.core.storage.DBReader;
import de.danoeh.antennapod.core.storage.DBTasks;
import de.danoeh.antennapod.core.util.IntentUtils;
@ -44,6 +43,7 @@ import de.danoeh.antennapod.core.util.syndication.HtmlToPlainText;
import de.danoeh.antennapod.menuhandler.FeedMenuHandler;
import de.danoeh.antennapod.model.feed.Feed;
import de.danoeh.antennapod.model.feed.FeedFunding;
import de.danoeh.antennapod.ui.glide.FastBlurTransformation;
import de.danoeh.antennapod.ui.statistics.StatisticsFragment;
import de.danoeh.antennapod.ui.statistics.feed.FeedStatisticsFragment;
import de.danoeh.antennapod.view.ToolbarIconTintManager;

2
app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
View File

@ -32,7 +32,6 @@ import de.danoeh.antennapod.adapter.EpisodeItemListAdapter;
import de.danoeh.antennapod.core.event.DownloadEvent;
import de.danoeh.antennapod.core.event.DownloaderUpdate;
import de.danoeh.antennapod.core.feed.FeedEvent;
import de.danoeh.antennapod.core.glide.FastBlurTransformation;
import de.danoeh.antennapod.core.menuhandler.MenuItemUtils;
import de.danoeh.antennapod.core.service.download.DownloadService;
import de.danoeh.antennapod.core.storage.DBReader;
@ -61,6 +60,7 @@ import de.danoeh.antennapod.model.download.DownloadStatus;
import de.danoeh.antennapod.model.feed.Feed;
import de.danoeh.antennapod.model.feed.FeedItem;
import de.danoeh.antennapod.model.feed.FeedItemFilter;
import de.danoeh.antennapod.ui.glide.FastBlurTransformation;
import de.danoeh.antennapod.view.ToolbarIconTintManager;
import de.danoeh.antennapod.view.viewholder.EpisodeItemViewHolder;
import io.reactivex.Maybe;

2
core/build.gradle
View File

@ -42,7 +42,6 @@ dependencies {
implementation 'androidx.documentfile:documentfile:1.0.1'
implementation "androidx.fragment:fragment:$fragmentVersion"
implementation "androidx.media:media:$mediaVersion"
implementation "androidx.palette:palette:$paletteVersion"
implementation "androidx.preference:preference:$preferenceVersion"
implementation "androidx.work:work-runtime:$workManagerVersion"
implementation "com.google.android.material:material:$googleMaterialVersion"
@ -51,7 +50,6 @@ dependencies {
implementation "commons-io:commons-io:$commonsioVersion"
implementation "org.jsoup:jsoup:$jsoupVersion"
implementation "com.github.bumptech.glide:glide:$glideVersion"
annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion"
implementation "com.github.bumptech.glide:okhttp3-integration:$glideVersion@aar"
implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
implementation "com.squareup.okhttp3:okhttp-urlconnection:$okhttpVersion"

1
settings.gradle
View File

@ -18,6 +18,7 @@ include ':storage:database'
include ':ui:app-start-intent'
include ':ui:common'
include ':ui:glide'
include ':ui:i18n'
include ':ui:png-icons'
include ':ui:statistics'

3
ui/glide/README.md Normal file
View File

@ -0,0 +1,3 @@
# :ui:glide
Configuration and ModelLoaders for the Glide image loading library.

27
ui/glide/build.gradle Normal file
View File

@ -0,0 +1,27 @@
plugins {
id("com.android.library")
}
apply from: "../../common.gradle"
apply from: "../../playFlavor.gradle"
android {
lintOptions {
disable "InvalidPeriodicWorkRequestInterval", "ObsoleteLintCustomCheck", "DefaultLocale", "UnusedAttribute",
"ParcelClassLoader", "CheckResult", "TrustAllX509TrustManager",
"StaticFieldLeak", "IconDensities", "IconDuplicates", "MissingPermission", "AppCompatResource",
"GradleCompatible", "QueryPermissionsNeeded"
}
}
dependencies {
implementation project(":model")
implementation project(":core")
implementation "androidx.palette:palette:$paletteVersion"
implementation "com.github.bumptech.glide:glide:$glideVersion"
implementation "com.github.bumptech.glide:okhttp3-integration:$glideVersion@aar"
annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion"
implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
implementation "commons-io:commons-io:$commonsioVersion"
}

1
ui/glide/src/main/AndroidManifest.xml Normal file
View File

@ -0,0 +1 @@
<manifest package="de.danoeh.antennapod.ui.glide" />

2
core/src/main/java/de/danoeh/antennapod/core/glide/ApGlideModule.java → ui/glide/src/main/java/de/danoeh/antennapod/ui/glide/ApGlideModule.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.glide;
package de.danoeh.antennapod.ui.glide;
import android.annotation.SuppressLint;
import android.content.Context;

2
core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java → ui/glide/src/main/java/de/danoeh/antennapod/ui/glide/ApOkHttpUrlLoader.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.glide;
package de.danoeh.antennapod.ui.glide;
import android.content.ContentResolver;
import android.text.TextUtils;

2
core/src/main/java/de/danoeh/antennapod/core/glide/AudioCoverFetcher.java → ui/glide/src/main/java/de/danoeh/antennapod/ui/glide/AudioCoverFetcher.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.glide;
package de.danoeh.antennapod.ui.glide;
import android.content.ContentResolver;
import android.content.Context;

2
core/src/main/java/de/danoeh/antennapod/core/glide/ChapterImageModelLoader.java → ui/glide/src/main/java/de/danoeh/antennapod/ui/glide/ChapterImageModelLoader.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.glide;
package de.danoeh.antennapod.ui.glide;
import androidx.annotation.NonNull;
import com.bumptech.glide.Priority;

2
core/src/main/java/de/danoeh/antennapod/core/glide/FastBlurTransformation.java → ui/glide/src/main/java/de/danoeh/antennapod/ui/glide/FastBlurTransformation.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.glide;
package de.danoeh.antennapod.ui.glide;
import android.graphics.Bitmap;
import android.media.ThumbnailUtils;

2
core/src/main/java/de/danoeh/antennapod/core/glide/GenerativePlaceholderImageModelLoader.java → ui/glide/src/main/java/de/danoeh/antennapod/ui/glide/GenerativePlaceholderImageModelLoader.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.glide;
package de.danoeh.antennapod.ui.glide;
import android.graphics.Bitmap;
import android.graphics.Canvas;

2
core/src/main/java/de/danoeh/antennapod/core/glide/MetadataRetrieverLoader.java → ui/glide/src/main/java/de/danoeh/antennapod/ui/glide/MetadataRetrieverLoader.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.glide;
package de.danoeh.antennapod.ui.glide;
import android.content.Context;
import androidx.annotation.NonNull;

2
core/src/main/java/de/danoeh/antennapod/core/glide/NoHttpStringLoader.java → ui/glide/src/main/java/de/danoeh/antennapod/ui/glide/NoHttpStringLoader.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.glide;
package de.danoeh.antennapod.ui.glide;
import android.net.Uri;
import androidx.annotation.NonNull;

2
core/src/main/java/de/danoeh/antennapod/core/glide/PaletteBitmap.java → ui/glide/src/main/java/de/danoeh/antennapod/ui/glide/PaletteBitmap.java
View File

@ -2,7 +2,7 @@
* Source: https://github.com/bumptech/glide/wiki/Custom-targets#palette-example
*/
package de.danoeh.antennapod.core.glide;
package de.danoeh.antennapod.ui.glide;
import android.graphics.Bitmap;

2
core/src/main/java/de/danoeh/antennapod/core/glide/PaletteBitmapResource.java → ui/glide/src/main/java/de/danoeh/antennapod/ui/glide/PaletteBitmapResource.java
View File

@ -2,7 +2,7 @@
* Source: https://github.com/bumptech/glide/wiki/Custom-targets#palette-example
*/
package de.danoeh.antennapod.core.glide;
package de.danoeh.antennapod.ui.glide;
import androidx.annotation.NonNull;

2
core/src/main/java/de/danoeh/antennapod/core/glide/PaletteBitmapTranscoder.java → ui/glide/src/main/java/de/danoeh/antennapod/ui/glide/PaletteBitmapTranscoder.java
View File

@ -2,7 +2,7 @@
* Source: https://github.com/bumptech/glide/wiki/Custom-targets#palette-example
*/
package de.danoeh.antennapod.core.glide;
package de.danoeh.antennapod.ui.glide;
import android.graphics.Bitmap;

7
core/src/main/java/de/danoeh/antennapod/core/glide/ResizingOkHttpStreamFetcher.java → ui/glide/src/main/java/de/danoeh/antennapod/ui/glide/ResizingOkHttpStreamFetcher.java
View File

@ -1,4 +1,4 @@
package de.danoeh.antennapod.core.glide;
package de.danoeh.antennapod.ui.glide;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@ -9,6 +9,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.bumptech.glide.Priority;
import com.bumptech.glide.integration.okhttp3.OkHttpStreamFetcher;
import com.bumptech.glide.load.data.DataFetcher;
import com.bumptech.glide.load.model.GlideUrl;
import okhttp3.Call;
import org.apache.commons.io.FileUtils;
@ -36,8 +37,8 @@ public class ResizingOkHttpStreamFetcher extends OkHttpStreamFetcher {
}
@Override
public void loadData(@NonNull Priority priority, @NonNull DataCallback<? super InputStream> callback) {
super.loadData(priority, new DataCallback<InputStream>() {
public void loadData(@NonNull Priority priority, @NonNull DataFetcher.DataCallback<? super InputStream> callback) {
super.loadData(priority, new DataFetcher.DataCallback<InputStream>() {
@Override
public void onDataReady(@Nullable InputStream data) {
if (data == null) {

1
ui/statistics/build.gradle
View File

@ -28,7 +28,6 @@ dependencies {
implementation "org.greenrobot:eventbus:$eventbusVersion"
implementation "com.github.bumptech.glide:glide:$glideVersion"
annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion"
implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion"
implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion"
implementation "com.joanzapata.iconify:android-iconify-fontawesome:$iconifyVersion"