diff options
author | David Luhmer <david-dev@live.de> | 2022-05-22 21:00:10 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-22 21:00:10 +0300 |
commit | 45e1d7cab5dd5829a4d96d974d4c369d5292ee75 (patch) | |
tree | 5638400e90bdfb6e3698ada383747305ee00d899 /News-Android-App | |
parent | e1c51f505464c8ed9133efa9aaff3ad5a26c8095 (diff) | |
parent | deaf6ca7e24324ecf89d0e525212448b93057863 (diff) |
Merge pull request #1092 from nextcloud/gradle-7-3-0v.0.9.9.73
Update to Gradle 7.3.0
Diffstat (limited to 'News-Android-App')
5 files changed, 39 insertions, 46 deletions
diff --git a/News-Android-App/build.gradle b/News-Android-App/build.gradle index 933b6e12..add7bb65 100644 --- a/News-Android-App/build.gradle +++ b/News-Android-App/build.gradle @@ -101,6 +101,7 @@ android { disable 'MissingTranslation', 'ExtraTranslation', 'MissingQuantity', 'InconsistentArrays', 'TypographyEllipsis' ignoreWarnings true } + namespace 'de.luhmer.owncloudnewsreader' } diff --git a/News-Android-App/src/androidTest/AndroidManifest.xml b/News-Android-App/src/androidTest/AndroidManifest.xml index fcfdf5a8..8d58876f 100644 --- a/News-Android-App/src/androidTest/AndroidManifest.xml +++ b/News-Android-App/src/androidTest/AndroidManifest.xml @@ -1,14 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:tools="http://schemas.android.com/tools" - xmlns:android="http://schemas.android.com/apk/res/android" - package="your.package.name"> + xmlns:android="http://schemas.android.com/apk/res/android"> - <uses-sdk tools:overrideLibrary="android_libs.ub_uiautomator"/> + <uses-sdk tools:overrideLibrary="android_libs.ub_uiautomator" /> <application> <!-- You don't need to include android:required="false" if your app's minSdkVersion is 28 or higher. --> - <uses-library android:name="android.test.runner" android:required="false" /> - <uses-library android:name="android.test.base" android:required="false" /> - <uses-library android:name="android.test.mock" android:required="false" /> + <uses-library + android:name="android.test.runner" + android:required="false" /> + <uses-library + android:name="android.test.base" + android:required="false" /> + <uses-library + android:name="android.test.mock" + android:required="false" /> </application> </manifest>
\ No newline at end of file diff --git a/News-Android-App/src/main/AndroidManifest.xml b/News-Android-App/src/main/AndroidManifest.xml index 840a99d4..4a09fc22 100644 --- a/News-Android-App/src/main/AndroidManifest.xml +++ b/News-Android-App/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - package="de.luhmer.owncloudnewsreader" android:installLocation="internalOnly"> <uses-permission android:name="android.permission.WAKE_LOCK" /> diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java index adb9fda6..1dc0e881 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java @@ -1103,7 +1103,7 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements startSync(); nrlf.bindUserInfoToUI(); } else { - Log.e(TAG, "resetUiAndStartSync - NewsReaderListFragment is not available") + Log.e(TAG, "resetUiAndStartSync - NewsReaderListFragment is not available"); } } diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragment.java index 181da22e..19047f08 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragment.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragment.java @@ -1,15 +1,15 @@ package de.luhmer.owncloudnewsreader; +import static android.media.MediaMetadata.METADATA_KEY_MEDIA_ID; +import static de.luhmer.owncloudnewsreader.services.PodcastPlaybackService.CURRENT_PODCAST_MEDIA_TYPE; +import static de.luhmer.owncloudnewsreader.services.PodcastPlaybackService.PLAYBACK_SPEED_FLOAT; + import android.app.Activity; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; - -import androidx.annotation.NonNull; -import androidx.appcompat.app.AlertDialog; - import android.os.Handler; import android.os.ResultReceiver; import android.support.v4.media.MediaBrowserCompat; @@ -26,6 +26,10 @@ import android.widget.EditText; import android.widget.NumberPicker; import android.widget.SeekBar; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; + import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.ImageLoader; import com.sothree.slidinguppanel.SlidingUpPanelLayout; @@ -38,7 +42,6 @@ import java.lang.reflect.Field; import java.util.Arrays; import java.util.Locale; -import androidx.fragment.app.Fragment; import de.luhmer.owncloudnewsreader.ListView.PodcastArrayAdapter; import de.luhmer.owncloudnewsreader.ListView.PodcastFeedArrayAdapter; import de.luhmer.owncloudnewsreader.databinding.FragmentPodcastBinding; @@ -56,10 +59,6 @@ import de.luhmer.owncloudnewsreader.services.PodcastPlaybackService; import de.luhmer.owncloudnewsreader.services.podcast.PlaybackService; import de.luhmer.owncloudnewsreader.view.PodcastSlidingUpPanelLayout; -import static android.media.MediaMetadata.METADATA_KEY_MEDIA_ID; -import static de.luhmer.owncloudnewsreader.services.PodcastPlaybackService.CURRENT_PODCAST_MEDIA_TYPE; -import static de.luhmer.owncloudnewsreader.services.PodcastPlaybackService.PLAYBACK_SPEED_FLOAT; - /** * Use the {@link PodcastFragment#newInstance} factory method to @@ -213,6 +212,23 @@ public class PodcastFragment extends Fragment { showPlaybackSpeedPicker(); } + private final SlidingUpPanelLayout.PanelSlideListener onPanelSlideListener = new SlidingUpPanelLayout.PanelSlideListener() { + @Override + public void onPanelSlide(View view, float v) { + } + + @Override + public void onPanelStateChanged(View panel, SlidingUpPanelLayout.PanelState previousState, SlidingUpPanelLayout.PanelState newState) { + if (newState == SlidingUpPanelLayout.PanelState.COLLAPSED) { + sliding_layout.setDragView(binding.llPodcastHeader); + binding.viewSwitcherProgress.setDisplayedChild(0); + } else if (newState == SlidingUpPanelLayout.PanelState.EXPANDED) { + sliding_layout.setDragView(binding.viewSwitcherProgress); + binding.viewSwitcherProgress.setDisplayedChild(1); + } + } + }; + @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // create ContextThemeWrapper from the original Activity Context with the custom theme @@ -242,7 +258,7 @@ public class PodcastFragment extends Fragment { sliding_layout.setDragView(binding.llPodcastHeader); //sliding_layout.setEnableDragViewTouchEvents(true); - sliding_layout.setPanelSlideListener(onPanelSlideListener); + sliding_layout.addPanelSlideListener(onPanelSlideListener); } PodcastFeedArrayAdapter mArrayAdapter = new PodcastFeedArrayAdapter(getActivity(), new PodcastFeedItem[0]); @@ -260,38 +276,10 @@ public class PodcastFragment extends Fragment { } - - private final SlidingUpPanelLayout.PanelSlideListener onPanelSlideListener = new SlidingUpPanelLayout.PanelSlideListener() { - @Override - public void onPanelSlide(View view, float v) { } - - @Override - public void onPanelCollapsed(View view) { - if(sliding_layout != null) - sliding_layout.setDragView(binding.llPodcastHeader); - binding.viewSwitcherProgress.setDisplayedChild(0); - } - - @Override - public void onPanelExpanded(View view) { - if(sliding_layout != null) - sliding_layout.setDragView(binding.viewSwitcherProgress); - binding.viewSwitcherProgress.setDisplayedChild(1); - } - - @Override public void onPanelAnchored(View view) { } - - @Override public void onPanelHidden(View view) { } - }; - - boolean blockSeekbarUpdate = false; private final SeekBar.OnSeekBarChangeListener onSeekBarChangeListener = new SeekBar.OnSeekBarChangeListener() { - int before; - @Override public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { - /* if(fromUser) { Log.v(TAG, "onProgressChanged: " + progress + "%"); |