From 8e65694b7d6b05ba8ec6d50a4810aca028856154 Mon Sep 17 00:00:00 2001
From: Ojas Gupta <ojasgupta4321@gmail.com>
Date: Sun, 20 Oct 2024 12:39:26 +1100
Subject: [PATCH 1/7] Added feature.

---
 .../schabi/newpipe/download/DownloadDialog.java    | 12 +++++++++++-
 app/src/main/res/layout/download_dialog.xml        | 14 ++++++++++++++
 build.gradle                                       |  5 ++++-
 settings.gradle                                    | 10 +++++-----
 4 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
index db2066b2782..0b0f7649d81 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -20,6 +20,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
+import android.widget.Button;
 import android.widget.RadioGroup;
 import android.widget.SeekBar;
 import android.widget.Toast;
@@ -331,6 +332,14 @@ public void onProgressChanged(@NonNull final SeekBar seekbar,
             }
         });
 
+        final Button button = (Button) dialogBinding.btnChngeDir;
+        button.setOnClickListener(new View.OnClickListener() {
+            public void onClick(final View v) {
+                askForSavePath = true;
+                prepareSelectedDownload();
+            }
+        });
+
         fetchStreamsSize();
     }
 
@@ -347,7 +356,6 @@ private void initToolbar(final Toolbar toolbar) {
 
         okButton = toolbar.findViewById(R.id.okay);
         okButton.setEnabled(false); // disable until the download service connection is done
-
         toolbar.setOnMenuItemClickListener(item -> {
             if (item.getItemId() == R.id.okay) {
                 prepareSelectedDownload();
@@ -485,6 +493,8 @@ private void requestDownloadPickAudioFolderResult(final ActivityResult result) {
     }
 
     private void requestDownloadPickVideoFolderResult(final ActivityResult result) {
+        final String testing = String.valueOf(result.getData());
+
         requestDownloadPickFolderResult(
                 result, getString(R.string.download_path_video_key), DownloadManager.TAG_VIDEO);
     }
diff --git a/app/src/main/res/layout/download_dialog.xml b/app/src/main/res/layout/download_dialog.xml
index 67aa1577c0c..8f996d41ccf 100644
--- a/app/src/main/res/layout/download_dialog.xml
+++ b/app/src/main/res/layout/download_dialog.xml
@@ -142,11 +142,25 @@
             android:progress="3" />
     </LinearLayout>
 
+    <Button
+        android:id="@+id/btn_chngeDir"
+        android:layout_width="335dp"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/threads_layout"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginStart="38dp"
+        android:layout_marginTop="42dp"
+        android:layout_marginEnd="38dp"
+        android:layout_marginBottom="39dp"
+        android:text="Browse for Alternate Download Folder" />
+
     <org.schabi.newpipe.views.NewPipeTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/threads_layout"
         android:layout_marginLeft="24dp"
+        android:layout_marginTop="114dp"
         android:layout_marginRight="24dp"
         android:layout_marginBottom="12dp"
         android:gravity="center"
diff --git a/build.gradle b/build.gradle
index 6d19a6f8a84..ceb082d60e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext {
+        agp_version = '8.1.0'
+    }
     ext.kotlin_version = '1.9.10'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0'
+        classpath "com.android.tools.build:gradle:$agp_version"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/settings.gradle b/settings.gradle
index 0338fde6c55..193755d497d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,8 +4,8 @@ include ':app'
 // We assume, that NewPipe and NewPipe Extractor have the same parent directory.
 // If this is not the case, please change the path in includeBuild().
 
-//includeBuild('../NewPipeExtractor') {
-//    dependencySubstitution {
-//        substitute module('com.github.TeamNewPipe:NewPipeExtractor') using project(':extractor')
-//    }
-//}
+includeBuild('/Users/ojasgupta/Documents/github/NewPipe/app/NewPipeExtractor') {
+    dependencySubstitution {
+        substitute module('com.github.TeamNewPipe:NewPipeExtractor') using project(':extractor')
+    }
+}
\ No newline at end of file

From 77b769ef1601d70a83c73dd0c914feeaec63104e Mon Sep 17 00:00:00 2001
From: Ojas Gupta <ojasgupta4321@gmail.com>
Date: Sun, 20 Oct 2024 18:20:37 +1100
Subject: [PATCH 2/7] Delete settings.gradle

---
 settings.gradle | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 settings.gradle

diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 193755d497d..00000000000
--- a/settings.gradle
+++ /dev/null
@@ -1,11 +0,0 @@
-include ':app'
-
-// Use a local copy of NewPipe Extractor by uncommenting the lines below.
-// We assume, that NewPipe and NewPipe Extractor have the same parent directory.
-// If this is not the case, please change the path in includeBuild().
-
-includeBuild('/Users/ojasgupta/Documents/github/NewPipe/app/NewPipeExtractor') {
-    dependencySubstitution {
-        substitute module('com.github.TeamNewPipe:NewPipeExtractor') using project(':extractor')
-    }
-}
\ No newline at end of file

From f99eb180621b06077152d6c35141c811e6c96beb Mon Sep 17 00:00:00 2001
From: Ojas Gupta <ojasgupta4321@gmail.com>
Date: Sun, 20 Oct 2024 18:20:51 +1100
Subject: [PATCH 3/7] Delete build.gradle

---
 build.gradle | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 build.gradle

diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index ceb082d60e8..00000000000
--- a/build.gradle
+++ /dev/null
@@ -1,28 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    ext {
-        agp_version = '8.1.0'
-    }
-    ext.kotlin_version = '1.9.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath "com.android.tools.build:gradle:$agp_version"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-        maven { url "https://jitpack.io" }
-        maven { url "https://repo.clojars.org" }
-    }
-}

From 2ab06b56336faa93de924a22d635e1eefe29095d Mon Sep 17 00:00:00 2001
From: Ojas Gupta <ojasgupta4321@gmail.com>
Date: Sun, 20 Oct 2024 18:43:31 +1100
Subject: [PATCH 4/7] Added Changes.

---
 .../main/java/org/schabi/newpipe/download/DownloadDialog.java   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
index 0b0f7649d81..73d4d19b90e 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -493,8 +493,6 @@ private void requestDownloadPickAudioFolderResult(final ActivityResult result) {
     }
 
     private void requestDownloadPickVideoFolderResult(final ActivityResult result) {
-        final String testing = String.valueOf(result.getData());
-
         requestDownloadPickFolderResult(
                 result, getString(R.string.download_path_video_key), DownloadManager.TAG_VIDEO);
     }

From c6a3849a9c3d4d1ea7efa14df604b55ffc952089 Mon Sep 17 00:00:00 2001
From: Ojas Gupta <ojasgupta4321@gmail.com>
Date: Thu, 24 Oct 2024 15:01:28 +1100
Subject: [PATCH 5/7] Revert "Delete settings.gradle"

This reverts commit 77b769ef1601d70a83c73dd0c914feeaec63104e.
---
 settings.gradle | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 settings.gradle

diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 00000000000..193755d497d
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,11 @@
+include ':app'
+
+// Use a local copy of NewPipe Extractor by uncommenting the lines below.
+// We assume, that NewPipe and NewPipe Extractor have the same parent directory.
+// If this is not the case, please change the path in includeBuild().
+
+includeBuild('/Users/ojasgupta/Documents/github/NewPipe/app/NewPipeExtractor') {
+    dependencySubstitution {
+        substitute module('com.github.TeamNewPipe:NewPipeExtractor') using project(':extractor')
+    }
+}
\ No newline at end of file

From ecf0f334082c8cde20f73b292ee7490cbb9fe6b5 Mon Sep 17 00:00:00 2001
From: Ojas Gupta <ojasgupta4321@gmail.com>
Date: Thu, 24 Oct 2024 15:01:49 +1100
Subject: [PATCH 6/7] Revert "Delete build.gradle"

This reverts commit f99eb180621b06077152d6c35141c811e6c96beb.
---
 build.gradle | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 build.gradle

diff --git a/build.gradle b/build.gradle
new file mode 100644
index 00000000000..ceb082d60e8
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,28 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    ext {
+        agp_version = '8.1.0'
+    }
+    ext.kotlin_version = '1.9.10'
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:$agp_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+        maven { url "https://jitpack.io" }
+        maven { url "https://repo.clojars.org" }
+    }
+}

From fcafeedaca0dc364cc400bdae857f9792aaa0589 Mon Sep 17 00:00:00 2001
From: Ojas Gupta <ojasgupta4321@gmail.com>
Date: Thu, 24 Oct 2024 15:02:50 +1100
Subject: [PATCH 7/7] Reverted changes and modified settings.gradle.

---
 settings.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 193755d497d..8c2696e3355 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,8 +4,8 @@ include ':app'
 // We assume, that NewPipe and NewPipe Extractor have the same parent directory.
 // If this is not the case, please change the path in includeBuild().
 
-includeBuild('/Users/ojasgupta/Documents/github/NewPipe/app/NewPipeExtractor') {
-    dependencySubstitution {
-        substitute module('com.github.TeamNewPipe:NewPipeExtractor') using project(':extractor')
-    }
-}
\ No newline at end of file
+//includeBuild('../') {
+//    dependencySubstitution {
+//        substitute module('com.github.TeamNewPipe:NewPipeExtractor') using project(':extractor')
+//    }
+//}
\ No newline at end of file