mirror of
https://github.com/AntennaPod/AntennaPod.git
synced 2025-01-05 13:27:09 +01:00
Add subscription to home screen (#5523)
This commit is contained in:
vbh
GitHub
parent
c691a999d9
commit
afee60ad38
@ -314,6 +314,16 @@
|
||||
|
||||
</activity>
|
||||
|
||||
<activity android:name=".activity.SelectSubscriptionActivity"
|
||||
android:label="@string/shortcut_subscription_label"
|
||||
android:icon="@drawable/ic_folder_shortcut"
|
||||
android:theme="@style/Theme.AntennaPod.Dark.Translucent"
|
||||
android:exported="true">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.CREATE_SHORTCUT" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
|
||||
<receiver
|
||||
android:name=".receiver.ConnectivityActionReceiver"
|
||||
android:exported="true">
|
||||
|
||||
@ -0,0 +1,162 @@
|
||||
package de.danoeh.antennapod.activity;
|
||||
|
||||
import static de.danoeh.antennapod.activity.MainActivity.EXTRA_FEED_ID;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.graphics.Bitmap;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.ListView;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.core.content.pm.ShortcutInfoCompat;
|
||||
import androidx.core.content.pm.ShortcutManagerCompat;
|
||||
import androidx.core.graphics.drawable.IconCompat;
|
||||
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.load.DataSource;
|
||||
import com.bumptech.glide.load.engine.GlideException;
|
||||
import com.bumptech.glide.request.RequestListener;
|
||||
import com.bumptech.glide.request.RequestOptions;
|
||||
import com.bumptech.glide.request.target.Target;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import de.danoeh.antennapod.R;
|
||||
import de.danoeh.antennapod.core.preferences.UserPreferences;
|
||||
import de.danoeh.antennapod.core.storage.DBReader;
|
||||
import de.danoeh.antennapod.core.storage.NavDrawerData;
|
||||
import de.danoeh.antennapod.databinding.SubscriptionSelectionActivityBinding;
|
||||
import de.danoeh.antennapod.model.feed.Feed;
|
||||
import io.reactivex.Observable;
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
||||
import io.reactivex.disposables.Disposable;
|
||||
import io.reactivex.schedulers.Schedulers;
|
||||
|
||||
public class SelectSubscriptionActivity extends AppCompatActivity {
|
||||
|
||||
private static final String TAG = "SelectSubscription";
|
||||
|
||||
private Disposable disposable;
|
||||
private volatile List<Feed> listItems;
|
||||
|
||||
private SubscriptionSelectionActivityBinding viewBinding;
|
||||
|
||||
@Override
|
||||
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
||||
setTheme(UserPreferences.getTranslucentTheme());
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
viewBinding = SubscriptionSelectionActivityBinding.inflate(getLayoutInflater());
|
||||
setContentView(viewBinding.getRoot());
|
||||
setSupportActionBar(viewBinding.toolbar);
|
||||
setTitle(R.string.shortcut_select_subscription);
|
||||
|
||||
viewBinding.transparentBackground.setOnClickListener(v -> finish());
|
||||
viewBinding.card.setOnClickListener(null);
|
||||
|
||||
loadSubscriptions();
|
||||
|
||||
final Integer[] checkedPosition = new Integer[1];
|
||||
viewBinding.list.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
|
||||
viewBinding.list.setOnItemClickListener((listView, view1, position, rowId) ->
|
||||
checkedPosition[0] = position
|
||||
);
|
||||
viewBinding.shortcutBtn.setOnClickListener(view -> {
|
||||
if (checkedPosition[0] != null && Intent.ACTION_CREATE_SHORTCUT.equals(
|
||||
getIntent().getAction())) {
|
||||
getBitmapFromUrl(listItems.get(checkedPosition[0]));
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
public List<Feed> getFeedItems(List<NavDrawerData.DrawerItem> items, List<Feed> result) {
|
||||
for (NavDrawerData.DrawerItem item : items) {
|
||||
if (item.type == NavDrawerData.DrawerItem.Type.TAG) {
|
||||
getFeedItems(((NavDrawerData.TagDrawerItem) item).children, result);
|
||||
} else {
|
||||
Feed feed = ((NavDrawerData.FeedDrawerItem) item).feed;
|
||||
if (!result.contains(feed)) {
|
||||
result.add(feed);
|
||||
}
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private void addShortcut(Feed feed, Bitmap bitmap) {
|
||||
Intent intent = new Intent(this, MainActivity.class);
|
||||
intent.setAction(Intent.ACTION_MAIN);
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
|
||||
intent.putExtra(EXTRA_FEED_ID, feed.getId());
|
||||
String id = "subscription-" + feed.getId();
|
||||
IconCompat icon;
|
||||
|
||||
if (bitmap != null) {
|
||||
icon = IconCompat.createWithAdaptiveBitmap(bitmap);
|
||||
} else {
|
||||
icon = IconCompat.createWithResource(this, R.drawable.ic_folder_shortcut);
|
||||
}
|
||||
|
||||
ShortcutInfoCompat shortcut = new ShortcutInfoCompat.Builder(this, id)
|
||||
.setShortLabel(feed.getTitle())
|
||||
.setLongLabel(feed.getFeedTitle())
|
||||
.setIntent(intent)
|
||||
.setIcon(icon)
|
||||
.build();
|
||||
|
||||
setResult(RESULT_OK, ShortcutManagerCompat.createShortcutResultIntent(this, shortcut));
|
||||
finish();
|
||||
}
|
||||
|
||||
private void getBitmapFromUrl(Feed feed) {
|
||||
int iconSize = (int) (128 * getResources().getDisplayMetrics().density);
|
||||
Glide.with(this)
|
||||
.asBitmap()
|
||||
.load(feed.getImageUrl())
|
||||
.apply(new RequestOptions().override(iconSize, iconSize))
|
||||
.listener(new RequestListener<Bitmap>() {
|
||||
@Override
|
||||
public boolean onLoadFailed(@Nullable GlideException e, Object model,
|
||||
Target<Bitmap> target, boolean isFirstResource) {
|
||||
addShortcut(feed, null);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onResourceReady(Bitmap resource, Object model,
|
||||
Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
|
||||
addShortcut(feed, resource);
|
||||
return true;
|
||||
}
|
||||
}).submit();
|
||||
}
|
||||
|
||||
private void loadSubscriptions() {
|
||||
if (disposable != null) {
|
||||
disposable.dispose();
|
||||
}
|
||||
disposable = Observable.fromCallable(
|
||||
() -> {
|
||||
NavDrawerData data = DBReader.getNavDrawerData();
|
||||
return getFeedItems(data.items, new ArrayList<>());
|
||||
})
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(
|
||||
result -> {
|
||||
listItems = result;
|
||||
ArrayList<String> titles = new ArrayList<>();
|
||||
for (Feed feed: result) {
|
||||
titles.add(feed.getTitle());
|
||||
}
|
||||
ArrayAdapter<String> adapter = new ArrayAdapter<>(this,
|
||||
R.layout.simple_list_item_multiple_choice_on_start, titles);
|
||||
viewBinding.list.setAdapter(adapter);
|
||||
}, error -> Log.e(TAG, Log.getStackTraceString(error)));
|
||||
}
|
||||
}
|
||||
56
app/src/main/res/layout/subscription_selection_activity.xml
Normal file
56
app/src/main/res/layout/subscription_selection_activity.xml
Normal file
@ -0,0 +1,56 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/transparentBackground"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<androidx.cardview.widget.CardView
|
||||
android:id="@+id/card"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_margin="32dp"
|
||||
android:elevation="16dp"
|
||||
app:cardCornerRadius="4dp">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<androidx.appcompat.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:minHeight="?attr/actionBarSize"
|
||||
android:theme="?attr/actionBarTheme"
|
||||
android:layout_alignParentTop="true" />
|
||||
|
||||
<View
|
||||
android:id="@+id/divider"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_below="@id/toolbar"
|
||||
android:background="?android:attr/listDivider" />
|
||||
|
||||
<ListView
|
||||
android:id="@+id/list"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/divider" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/shortcutBtn"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="16dp"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:text="@string/add_shortcut" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
||||
</LinearLayout>
|
||||
@ -850,4 +850,8 @@
|
||||
<string name="on_demand_config_setting_changed">Setting updated successfully.</string>
|
||||
<string name="on_demand_config_stream_text">Looks like you stream a lot. Do you want episode lists to show stream buttons?</string>
|
||||
<string name="on_demand_config_download_text">Looks like you download a lot. Do you want episode lists to show download buttons?</string>
|
||||
|
||||
<string name="shortcut_subscription_label">Subscription shortcut</string>
|
||||
<string name="shortcut_select_subscription">Select subscription</string>
|
||||
<string name="add_shortcut">Add Shortcut</string>
|
||||
</resources>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user