Merge pull request #1092 from nextcloud/gradle-7-3-0

Update to Gradle 7.3.0
nextcloud · May 22, 2022 · 45e1d7c · 45e1d7c
2 parents e1c51f5 + deaf6ca
commit 45e1d7c
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 48 deletions.
diff --git 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
@@ -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>
diff --git 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
@@ -1103,7 +1103,7 @@ private void resetUiAndStartSync() {
 			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
@@ -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.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.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.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 @@ protected void openSpeedMenu() {
         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 View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
             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 View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
     }
 
 
-
-    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 + "%");

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.2.0'
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip