diff options
Diffstat (limited to 'app/src')
6 files changed, 125 insertions, 53 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/TagSettingsDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/TagSettingsDialog.java index de9f4d504..8ef01590f 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/TagSettingsDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/TagSettingsDialog.java @@ -3,7 +3,11 @@ package de.danoeh.antennapod.dialog; import android.app.Dialog; import android.os.Bundle; import android.text.TextUtils; +import android.util.Log; +import android.view.MotionEvent; +import android.view.View; import android.view.ViewGroup; +import android.widget.ArrayAdapter; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; @@ -12,10 +16,15 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.chip.Chip; import de.danoeh.antennapod.R; +import de.danoeh.antennapod.core.storage.DBReader; +import de.danoeh.antennapod.core.storage.NavDrawerData; import de.danoeh.antennapod.model.feed.FeedPreferences; import de.danoeh.antennapod.core.storage.DBWriter; import de.danoeh.antennapod.databinding.EditTagsDialogBinding; import de.danoeh.antennapod.view.ItemOffsetDecoration; +import io.reactivex.Observable; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.schedulers.Schedulers; import java.util.ArrayList; import java.util.List; @@ -53,6 +62,17 @@ public class TagSettingsDialog extends DialogFragment { viewBinding.newTagButton.setOnClickListener(v -> addTag(viewBinding.newTagEditText.getText().toString().trim())); + loadTags(); + viewBinding.newTagEditText.setThreshold(1); + viewBinding.newTagEditText.setOnTouchListener(new View.OnTouchListener() { + @Override + public boolean onTouch(View v, MotionEvent event) { + viewBinding.newTagEditText.showDropDown(); + viewBinding.newTagEditText.requestFocus(); + return false; + } + }); + AlertDialog.Builder dialog = new AlertDialog.Builder(getContext()); dialog.setView(viewBinding.getRoot()); dialog.setTitle(R.string.feed_folders_label); @@ -69,6 +89,31 @@ public class TagSettingsDialog extends DialogFragment { return dialog.create(); } + private void loadTags() { + Observable.fromCallable( + () -> { + NavDrawerData data = DBReader.getNavDrawerData(); + List<NavDrawerData.DrawerItem> items = data.items; + List<String> folders = new ArrayList<String>(); + for (NavDrawerData.DrawerItem item : items) { + if (item.type == NavDrawerData.DrawerItem.Type.FOLDER) { + folders.add(item.getTitle()); + } + } + return folders; + }) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe( + result -> { + ArrayAdapter<String> acAdapter = new ArrayAdapter<String>(getContext(), + R.layout.single_tag_text_view, result); + viewBinding.newTagEditText.setAdapter(acAdapter); + }, error -> { + Log.e(TAG, Log.getStackTraceString(error)); + }); + } + private void addTag(String name) { if (TextUtils.isEmpty(name) || displayedTags.contains(name)) { return; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java index 21a1d2039..a84c34b7e 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java @@ -268,7 +268,7 @@ public class AudioPlayerFragment extends Fragment implements } controller.setPlaybackSpeed(newSpeed); - loadMediaInfo(); + loadMediaInfo(false); }); butPlaybackSpeed.setOnLongClickListener(v -> { new VariableSpeedDialog().show(getChildFragmentManager(), null); @@ -290,14 +290,16 @@ public class AudioPlayerFragment extends Fragment implements txtvPlaybackSpeed.setVisibility(View.VISIBLE); } - private void loadMediaInfo() { + private void loadMediaInfo(boolean includingChapters) { if (disposable != null) { disposable.dispose(); } - disposable = Maybe.create(emitter -> { + disposable = Maybe.<Playable>create(emitter -> { Playable media = controller.getMedia(); if (media != null) { - ChapterUtils.loadChapters(media, getContext()); + if (includingChapters) { + ChapterUtils.loadChapters(media, getContext()); + } emitter.onSuccess(media); } else { emitter.onComplete(); @@ -305,9 +307,13 @@ public class AudioPlayerFragment extends Fragment implements }) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(media -> updateUi((Playable) media), - error -> Log.e(TAG, Log.getStackTraceString(error)), - () -> updateUi(null)); + .subscribe(media -> { + updateUi(media); + if (media.getChapters() == null && !includingChapters) { + loadMediaInfo(true); + } + }, error -> Log.e(TAG, Log.getStackTraceString(error)), + () -> updateUi(null)); } private PlaybackController newPlaybackController() { @@ -350,7 +356,7 @@ public class AudioPlayerFragment extends Fragment implements @Override public void onSleepTimerUpdate() { - AudioPlayerFragment.this.loadMediaInfo(); + AudioPlayerFragment.this.loadMediaInfo(false); } @Override @@ -360,7 +366,7 @@ public class AudioPlayerFragment extends Fragment implements @Override public void loadMediaInfo() { - AudioPlayerFragment.this.loadMediaInfo(); + AudioPlayerFragment.this.loadMediaInfo(false); } @Override @@ -397,7 +403,7 @@ public class AudioPlayerFragment extends Fragment implements super.onStart(); controller = newPlaybackController(); controller.init(); - loadMediaInfo(); + loadMediaInfo(false); EventBus.getDefault().register(this); txtvRev.setText(NumberFormat.getInstance().format(UserPreferences.getRewindSecs())); txtvFF.setText(NumberFormat.getInstance().format(UserPreferences.getFastForwardSecs())); @@ -447,7 +453,7 @@ public class AudioPlayerFragment extends Fragment implements @Subscribe(threadMode = ThreadMode.MAIN) public void favoritesChanged(FavoritesEvent event) { - AudioPlayerFragment.this.loadMediaInfo(); + AudioPlayerFragment.this.loadMediaInfo(false); } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java index 9c9eee2aa..5dbadaefa 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java @@ -124,14 +124,16 @@ public class CoverFragment extends Fragment { configureForOrientation(getResources().getConfiguration()); } - private void loadMediaInfo() { + private void loadMediaInfo(boolean includingChapters) { if (disposable != null) { disposable.dispose(); } disposable = Maybe.<Playable>create(emitter -> { Playable media = controller.getMedia(); if (media != null) { - ChapterUtils.loadChapters(media, getContext()); + if (includingChapters) { + ChapterUtils.loadChapters(media, getContext()); + } emitter.onSuccess(media); } else { emitter.onComplete(); @@ -141,6 +143,9 @@ public class CoverFragment extends Fragment { .subscribe(media -> { this.media = media; displayMediaInfo(media); + if (media.getChapters() == null && !includingChapters) { + loadMediaInfo(true); + } }, error -> Log.e(TAG, Log.getStackTraceString(error))); } @@ -188,17 +193,22 @@ public class CoverFragment extends Fragment { } private void updateChapterControlVisibility() { + boolean chapterControlVisible = false; if (media.getChapters() != null) { - boolean chapterControlVisible = media.getChapters().size() > 0; - int newVisibility = chapterControlVisible ? View.VISIBLE : View.GONE; - if (chapterControl.getVisibility() != newVisibility) { - chapterControl.setVisibility(newVisibility); - ObjectAnimator.ofFloat(chapterControl, - "alpha", - chapterControlVisible ? 0 : 1, - chapterControlVisible ? 1 : 0) - .start(); - } + chapterControlVisible = media.getChapters().size() > 0; + } else if (media instanceof FeedMedia) { + FeedMedia fm = ((FeedMedia) media); + // If an item has chapters but they are not loaded yet, still display the button. + chapterControlVisible = fm.getItem() != null && fm.getItem().hasChapters(); + } + int newVisibility = chapterControlVisible ? View.VISIBLE : View.GONE; + if (chapterControl.getVisibility() != newVisibility) { + chapterControl.setVisibility(newVisibility); + ObjectAnimator.ofFloat(chapterControl, + "alpha", + chapterControlVisible ? 0 : 1, + chapterControlVisible ? 1 : 0) + .start(); } } @@ -264,11 +274,11 @@ public class CoverFragment extends Fragment { controller = new PlaybackController(getActivity()) { @Override public void loadMediaInfo() { - CoverFragment.this.loadMediaInfo(); + CoverFragment.this.loadMediaInfo(false); } }; controller.init(); - loadMediaInfo(); + loadMediaInfo(false); EventBus.getDefault().register(this); } diff --git a/app/src/main/java/de/danoeh/antennapod/view/ChapterSeekBar.java b/app/src/main/java/de/danoeh/antennapod/view/ChapterSeekBar.java index ba7acb847..7c6b64e2c 100644 --- a/app/src/main/java/de/danoeh/antennapod/view/ChapterSeekBar.java +++ b/app/src/main/java/de/danoeh/antennapod/view/ChapterSeekBar.java @@ -62,6 +62,7 @@ public class ChapterSeekBar extends androidx.appcompat.widget.AppCompatSeekBar { } else { this.dividerPos = null; } + invalidate(); } public void highlightCurrentChapter() { diff --git a/app/src/main/res/layout/edit_tags_dialog.xml b/app/src/main/res/layout/edit_tags_dialog.xml index 2e7774cea..57e3c412f 100644 --- a/app/src/main/res/layout/edit_tags_dialog.xml +++ b/app/src/main/res/layout/edit_tags_dialog.xml @@ -1,41 +1,43 @@ <?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:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="16dp"> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="16dp"> <androidx.recyclerview.widget.RecyclerView - android:id="@+id/tagsRecycler" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> + android:id="@+id/tagsRecycler" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> <CheckBox - android:id="@+id/rootFolderCheckbox" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/feed_folders_include_root" /> + android:id="@+id/rootFolderCheckbox" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/feed_folders_include_root" /> <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> - <EditText - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:inputType="text" - android:ems="10" - android:id="@+id/newTagEditText"/> + <AutoCompleteTextView + android:id="@+id/newTagEditText" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:inputType="text" + android:ems="10" /> <ImageButton - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:srcCompat="@drawable/ic_add" - android:contentDescription="@string/new_label" - android:id="@+id/newTagButton"/> + android:id="@+id/newTagButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/new_label" + app:srcCompat="@drawable/ic_add" /> + </LinearLayout> </LinearLayout> diff --git a/app/src/main/res/layout/single_tag_text_view.xml b/app/src/main/res/layout/single_tag_text_view.xml new file mode 100644 index 000000000..67410a20e --- /dev/null +++ b/app/src/main/res/layout/single_tag_text_view.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<TextView + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:scrollbars="vertical" + android:padding="10dp" + android:ems="10" /> |