y0zhyck/vtosters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more folders picker

Browse Source
This commit is contained in:
gdlbo
2022-08-05 20:39:24 +03:00
parent 9dd3a26bab
commit efa28aa3d6
5 changed files with 93 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/vtosters/lite/music/MP3Downloader.java
+11 -7
View File
@@ -1,11 +1,16 @@
package ru.vtosters.lite.music;
import static ru.vtosters.lite.utils.Preferences.getMusicDir;
import android.app.DownloadManager;
import android.net.Uri;
import android.os.Build;
import android.os.Environment;
import android.util.Log;
import android.widget.Toast;
import androidx.annotation.RequiresApi;
import com.vk.dto.music.MusicTrack;
import org.json.JSONException;
@@ -53,12 +58,10 @@ public class MP3Downloader {
if (responseNode.has("url")) {
var url = responseNode.optString("url");
Log.d("MP3Downloader", url);
if (url != null) {
if (url.endsWith(".mp3")) {
downloadMP3(track.toString(), url);
} else if (VKM3UParser.isM3U8(url)) {
AudioDownloader.downloadM3U8(track);
}
if (url.endsWith(".mp3")) {
downloadMP3(track.toString(), url);
} else if (VKM3UParser.isM3U8(url)) {
AudioDownloader.downloadM3U8(track);
}
}
}
@@ -69,13 +72,14 @@ public class MP3Downloader {
});
}
@RequiresApi(api = Build.VERSION_CODES.M)
private static void downloadMP3(String title, String url) {
var downloadManager = AndroidUtils.getGlobalContext().getSystemService(DownloadManager.class);
var request = new DownloadManager.Request(Uri.parse(url))
.setAllowedOverRoaming(true)
.setTitle("Downloading " + title)
.setDestinationInExternalFilesDir(AndroidUtils.getGlobalContext(),
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath(),
getMusicDir().getAbsolutePath(),
title + ".mp3")
.setVisibleInDownloadsUi(true);
downloadManager.enqueue(request);
app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java
+34
View File
@@ -94,6 +94,19 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
findPreference("downloads_directory").setSummary(
"Текущая папка: " + Preferences.getDownloadsDir()
);
findPreference("photos_directory").setSummary(
"Текущая папка: " + Preferences.getPhotosDir()
);
findPreference("videos_directory").setSummary(
"Текущая папка: " + Preferences.getVideosDir()
);
findPreference("music_directory").setSummary(
"Текущая папка: " + Preferences.getMusicDir()
);
findPreference("downloads_directory").setOnPreferenceClickListener(preference -> {
var intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
intent.addCategory(Intent.CATEGORY_DEFAULT);
@@ -101,6 +114,27 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
return true;
});
findPreference("photos_directory").setOnPreferenceClickListener(preference -> {
var intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
intent.addCategory(Intent.CATEGORY_DEFAULT);
startActivityForResult(intent, REQUEST_CODE_SET_DOWNLOAD_DIRECTORY);
return true;
});
findPreference("videos_directory").setOnPreferenceClickListener(preference -> {
var intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
intent.addCategory(Intent.CATEGORY_DEFAULT);
startActivityForResult(intent, REQUEST_CODE_SET_DOWNLOAD_DIRECTORY);
return true;
});
findPreference("music_directory").setOnPreferenceClickListener(preference -> {
var intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
intent.addCategory(Intent.CATEGORY_DEFAULT);
startActivityForResult(intent, REQUEST_CODE_SET_DOWNLOAD_DIRECTORY);
return true;
});
if (isLoggedIn()) {
findPreference("lastfm_auth").setSummary("Вы авторизованы как " + Scrobbler.getUserName());
} else {
app/src/main/java/ru/vtosters/lite/utils/Preferences.java
+18
View File
@@ -392,4 +392,22 @@ public class Preferences {
"downloads_directory",
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath()));
}
public static File getPhotosDir() {
return new File(getPreferences().getString(
"photos_directory",
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath()));
}
public static File getVideosDir() {
return new File(getPreferences().getString(
"videos_directory",
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES).getAbsolutePath()));
}
public static File getMusicDir() {
return new File(getPreferences().getString(
"videos_directory",
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC).getAbsolutePath()));
}
}
smali/res/xml/preferences_media.xml
+12
View File
@@ -29,6 +29,18 @@
android:key="downloads_directory"
android:summary="Текущая папка: "
android:title="Папка для загрузок" />
<Preference
android:key="photos_directory"
android:summary="Текущая папка: "
android:title="Папка для фото" />
<Preference
android:key="videos_directory"
android:summary="Текущая папка: "
android:title="Папка для видео" />
<Preference
android:key="music_directory"
android:summary="Текущая папка: "
android:title="Папка для музыки" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/sett_media">
<com.vtosters.lite.ui.MaterialSwitchPreference
smali/smali_classes2/b/h/g/m/FileUtils.smali
+18 -16
View File
@@ -1811,14 +1811,18 @@
.method private static c()Ljava/io/File;
.locals 2
.line 1
invoke-static {}, Lb/h/g/m/FileUtils;->getVKDir()Ljava/io/File;
# .line 1
# invoke-static {}, Lb/h/g/m/FileUtils;->getVKDir()Ljava/io/File;
move-result-object v0
# move-result-object v0
const-string v1, "Photos"
# const-string v1, "Photos"
invoke-static {v0, v1}, Lb/h/g/m/FileUtils;->a(Ljava/io/File;Ljava/lang/String;)Ljava/io/File;
# invoke-static {v0, v1}, Lb/h/g/m/FileUtils;->a(Ljava/io/File;Ljava/lang/String;)Ljava/io/File;
# move-result-object v0
invoke-static {}, Lru/vtosters/lite/utils/Preferences;->getPhotosDir()Ljava/io/File;
move-result-object v0
@@ -2105,14 +2109,18 @@
.method private static e()Ljava/io/File;
.locals 2
.line 1
invoke-static {}, Lb/h/g/m/FileUtils;->getVKDir()Ljava/io/File;
# .line 1
# invoke-static {}, Lb/h/g/m/FileUtils;->getVKDir()Ljava/io/File;
move-result-object v0
# move-result-object v0
const-string v1, "Videos"
# const-string v1, "Videos"
invoke-static {v0, v1}, Lb/h/g/m/FileUtils;->a(Ljava/io/File;Ljava/lang/String;)Ljava/io/File;
# invoke-static {v0, v1}, Lb/h/g/m/FileUtils;->a(Ljava/io/File;Ljava/lang/String;)Ljava/io/File;
# move-result-object v0
invoke-static {}, Lru/vtosters/lite/utils/Preferences;->getVideosDir()Ljava/io/File;
move-result-object v0
@@ -3631,12 +3639,6 @@
.line 2
invoke-static {v0}, Lb/h/g/m/FileUtils;->a(Ljava/io/File;)V
const-string v1, "Download"
invoke-static {v0, v1}, Lb/h/g/m/FileUtils;->a(Ljava/io/File;Ljava/lang/String;)Ljava/io/File;
move-result-object v0
const-string v1, "VK"
.line 3