diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 411c07777..000000000 --- a/.gitattributes +++ /dev/null @@ -1,4 +0,0 @@ -* text=auto eol=lf - -*.bat text eol=crlf -*.jar binary diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 3ee2b591b..000000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,51 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve. Please write in English only. -title: '' -labels: bug -assignees: '' - ---- - - - -**Have you read the [FAQ](https://github.com/RetroMusicPlayer/RetroMusicPlayer/blob/master/FAQ.md)?** -[Yes/No] - -**Has the bug already been reported? Please search in GitHub issue tab before creating an issue.** -[Yes/No] - -**Describe the bug** -A clear and concise description of what the bug is. - -**How To Reproduce** -Steps to reproduce the behavior: -1. -2. -3. -4. - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Crash log** -If the app is crashing, add a crash log -
- Click to view logs -PASTE YOUR LOGS HERE. -
- -**Device info:** - - Device: [e.g. OnePlus 7] - - Android version: [e.g. Android 9] - - App version [e.g. 3.5.300_0517] - -**Additional context** -Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index 0f15789f4..000000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project. Please write in English only. -title: '' -labels: enhancement -assignees: '' - ---- - - - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -**Describe the solution you'd like** -A clear and concise description of what you want to happen. - -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. - -**Additional context** -Add any other context or screenshots about the feature request here. diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml deleted file mode 100644 index e450294c1..000000000 --- a/.github/workflows/android.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Android CI - -on: - push: - branches: [ dev ] - pull_request: - branches: [ dev ] - -jobs: - check: - runs-on: ubuntu-latest - timeout-minutes: 10 - steps: - - uses: actions/checkout@v3 - - uses: gradle/wrapper-validation-action@v1 - - uses: actions/setup-java@v3 - with: - distribution: 'zulu' - java-version: 17 - - uses: gradle/gradle-build-action@v2 - - name: Lint Android - run: ./gradlew lint - - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'zulu' - - uses: gradle/gradle-build-action@v2 - - name: Build - run: ./gradlew app:assemble diff --git a/.gitignore b/.gitignore index 6a32941f0..37f05b7f5 100644 --- a/.gitignore +++ b/.gitignore @@ -38,4 +38,8 @@ obj/ captures app/normal/release/ /models/ -/app/release/ + +app/font/ +app/src/debug/ +/app/nofont/ +/crowdin.properties diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 2775d78f3..000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,35 +0,0 @@ -# Contributing - -## Using the issue tracker -The [issue tracker](https://github.com/RetroMusicPlayer/RetroMusicPlayer/issues) is the preferred channel for bug reports, feature requests and submitting pull requests, but please follow these rules: - -* Please **do not** derail or troll issues. Keep the discussion on topic and respect the opinions of others. - -* Please **do not** post comments consisting solely of "+1" or "👍". Use [GitHub's "reactions" feature](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments) instead. - -* Please **do not** write [enhancement]/[bug]/[feature request] or similar stuff in the title of issues, as there are labels for that purpose that will be added by devs or collaborators. - -## Bug reports -A bug is a _demonstrable problem_. Good bug reports are extremely helpful, so thanks! - -Guidelines for bug reports: - -* Use the GitHub issue search, check if the issue has already been reported both in the open issues and in the closed ones, if there are some missing details, add them in issue comments, without creating a new one -* Check if the issue has been fixed — try to reproduce it using the latest available build -* Isolate the problem — ideally create a reproducible scenario and a live example -* Do not report multiple bugs in a single ticket, otherwise it will be confusing. - -A good bug report shouldn't leave others needing to chase you up for more information. Please try to be as detailed as possible in your report. - - -## Feature requests -Feature requests are welcome, please make sure to be as detailed as possible and use screenshots, videos, GIFs, to demonstrate it better, if possible. - - -## Pull requests -**Please ask first** before embarking on any significant pull request (e.g. implementing features, refactoring code), otherwise you risk spending a lot of time working on something that developers might not want to merge into the project. To avoid that, you can join the official [Telegram group](https://t.me/retromusicapp) or open an issue. - -## License -By contributing your code, you agree to license your contribution under the [GNU General Public License](https://github.com/RetroMusicPlayer/RetroMusicPlayer/blob/master/LICENSE.md). - -Please note we have a code of conduct, please follow it in all your interactions with the project. diff --git a/FAQ.md b/FAQ.md index 8223a2c7a..2ac44e716 100644 --- a/FAQ.md +++ b/FAQ.md @@ -1,157 +1,152 @@ -## **Q: How do I get the beta version of Retro Music?** +#### Q: How do I get the beta version of Retro Music? You can opt-in for the beta build by clicking on this link: https://play.google.com/apps/testing/code.name.monkey.retromusic -___ -## **Q: How to restore my purchases?** -Make sure to switch and use your account in the Play Store app through which you purchased before installing Retro Music. The Google account used to install the app is also used to purchase/restore the pro license. +#### Q: How to restore my purchases? +Make sure to switch and use account in the Play Store app through which you purchased before installing Retro music. The account used to install the app is also used to purchase/restore the pro license. -If you've already installed the app, remove all other accounts except the one from which you purchased premium, and then restore the purchase. +If you already installed, remove all other accounts except the one with which you purchased premium. Then restore the purchase. -___ -## Q: **How do I use offline synced lyrics?** -There are three methods for adding offline synced lyrics in Retro Music. +#### Q: How do I use offline synced lyrics? +There are two methods for how to get offline synced lyrics. -### ***Method 1:-*** -#### STEP 1: -Find the time-stamped lyrics for your songs that don't have lyrics already. A time-stamped lyric looks like this, "[00:04:02] Some lyrics text" for example. -#### STEP 2: -Copy these time-stamped lyrics. -#### STEP 3: +#### Method 1:- +##### STEP 1: +Find the time stamped lyrics for your songs which don't have lyrics already. A time stamped lyrics looks like this, "[00:04:02] Some lyrics text" for example. +##### STEP 2: +Copy these time stamped lyrics. +##### STEP 3: Open retro music and head to the song synced lyrics editor. -#### STEP 4: +##### STEP 4: Paste the lyrics there normally and exit the editor -#### STEP 5: -Open lyrics and you should see your time-stamped lyrics there. +##### STEP 5: +Open lyrics and you should see your time stamped lyrics there. -### ***Method 2:-*** -#### STEP 1: -Download the time-stamped lyrics for your songs that don't have lyrics already. You can find ".lrc" files for popular songs at either of the websites given below. A time-stamped lyric looks like this, "[00:04:02] Some lyrics text" for example. -#### STEP 2: -A ".lrc" is like a text file that contains the time-stamped lyrics for example, "[00:04:02] Some lyrics text". Save your time-stamped lyrics are ".lrc" file. -#### STEP 3: +#### Method 2:- +##### STEP 1: +Find the ".lrc" files for your songs which doesn't have lyrics already. +##### STEP 2: +A ".lrc" is like a text file which contains the time stamped lyrics for example, "[00:04:02] Some lyrics text" +##### STEP 3: Now you have to rename the file you created in this way: - .lrc or for better matching copy the and the from the tag editor and then rename the file. -### STEP 4: -Now paste the LRC files to the following path: /sdcard/Retromusic/lyrics/ -Here sdcard is your internal storage. +##### STEP 4: +You have to copy or move this file into a location on the SD Card: whatever_sdcard/RetroMusic/lyrics/ and paste it there. +Finally you will be able to see the lyrics working. +> If you want to skip to particular time stamp, simply scroll to the time stamp from where you want to start from and a 'Play' icon will appear left to the particular stamp. Tap on play button to play from there. -### ***Method 3:- (Requires third-party app)*** -#### STEP 1: -Download automatag or autotagger from Play Store. -#### STEP 2: -Find the time-stamped lyrics for your songs that don't have lyrics already. You can find ".lrc" files for popular songs at either of the websites given below. A time-stamped lyric looks like this, "[00:04:02] Some lyrics text" for example. -#### STEP 3: -Find your song to edit and paste the synced lyrics. -> These apps add those synced lyrics in the music file itself instead of creating a ".lrc file for it." -**Lyrics Website Links:** -- https://www.lyricsify.com/ -- https://www.syair.info +#### Q: Why isn't the artist's image downloading? +Last.fm has disabled the download of artist's images for the time being, whether functionality for this will be restored in future is uncertain. So we have moved to deezer API for artist images which have very less artists in their database and you might not able to see covers on every artist profiles. -**Some Important Notes:** -- If you want to skip to a particular timestamp, simply scroll to the time stamp from where you want to start and a 'Play' icon will appear left to the particular stamp. Tap on the play button to play from there. -- When you save lyrics by pasting lyrics in lyrics editor, close the lyrics and open again for lyrics to show. -- For those who are having difficulty in making the synced lyrics work, we have a short tutorial video on it. Hope this helps you. {[Link in the note or here](https://youtu.be/1oIOTGWhNMY)} -___ - -## **Q: How do I change the theme?** +#### Q: How do I change the theme? Settings -> Look and feel -> Select your theme. -___ -## **Q: Equalizer is very laggy and unstable or I am getting a "No equalizer found" error. Why?** -- The Retro music in-built equalizer was removed updates ago so the only equalizer you will have by your OEM or Android native equalizer which isn't made by us and have no control over them. So you can report those issues to your OEM so that they can provide a fix in the next updates. -- If you are seeing "No Equalizer Found" in your device, this means your device doesn't have a stock equalizer "MusicFx" Equalizer. You can try using this one. It's made by AEX ROM developers. +#### Q: Equailizer is very laggy and unstable or I am getting "No equalizer found" error. why? +The Retro music in-built equalizer was removed updates ago so the only equalizer you will have by your OEM or android which aren't made by us and have no control over them. So you can report those issues to your OEM so that they can provide a fix in next updates. -https://drive.google.com/file/d/1_1bpsn6roeEyElGKikbU39lVKUH8O3xp/view?**usp=drivesdk +If you are seeing "No Equalizer Found" in your device, this means your device doesn't have stock equalizer MusicFx Equalizer. You can try using this one. Its made by AEX ROM developers. -___ +https://drive.google.com/file/d/1_1bpsn6roeEyElGKikbU39lVKUH8O3xp/view?usp=drivesdk -## **Q: Why aren't last added songs showing?** + +#### Q: Why aren't last added songs showing? Settings -> Other -> Last added playlist interval -> Select an option from the list. -___ -## **Q: How do I enable fullscreen lock screen controls?** + +#### Q: How do I enable fullscreen lockscreen controls? Settings -> Personalize -> Fullscreen controls -> Enable (this will only be visible when songs are playing from Retro Music). -___ -## **Q: Why are my gallery or random pictures showing up as album art?** + +#### Q: Why are gallery or random pictures showing up as album art? Settings -> Images -> Ignore media store covers -> Enable -___ -## **Q: Which file types are supported?** + +#### Q: Which file types are supported? Retro Music uses the native media player that comes with your Android phone, so as long as a file type is supported by your phone, it's supported by Retro Music. -___ -## **Q: Why is my device slowing down when I'm using the app?** + +#### Q: Why is my device slowing down when I'm using the app? Retro Music is image intensive, it keeps images in the cache for quick loading. -___ -## **Q: The title "Retro Music" is showing on the top of the app, how can I fix this?** + +#### Q: The title "Retro Music" is showing on the top of the app, how can i fix this? Clear the app's cache and data. -___ -## **Q: My app is crashing, how do I fix this?** (Sorry, settings have changed internally) -Please try to clear the data of the app. If it doesn't work, reinstalling fresh from the play store should help. -___ -## **Q: Why has all the text gone white/disappeared?** +#### Q: My app is crashing, how do i fix this? (Sorry, settings have changed internally) +Please try clear data of the app. If it doesn't work, reinstalling fresh from play store should help. + + +#### Q: Why has all the text gone white/dissapeared? Change the theme to Black or Dark and change it back to what you had before. -___ -## **Q: Why some of my songs are not showing in my library?** -- Try checking up if those songs are not less than 30 seconds, if so head to settings -> other -> filter song duration. Put this to zero and see the songs that should start appearing in the library. -- If this doesn't work out for you, re-scanning the media folder should help and subsequently rebooting the device to refresh the media store. +#### Q: Why some of my songs are not showing in my library? +Try checking up if those songs are not less than 30 seconds, if so head to settings -> other -> filter song duration. Put this to zero and see the songs should start appearimg in the library. -- At last, resort, If nothing worked and your audio files are stored in SD card. Try moving them to internal memory then back to SD card. +If this doesn't work out for you, re-scanning the media folder should help and subsquently rebooting the device to refresh media store. -___ +At last resort, If nothing worked and your audio files are stored in SD card. Try moving them to internal memory then back to SD card. -## **Q: Why does my library shows song files twice or no song at all?** -If you are seeing duplication of songs in the library or no songs at all, then it's because of the Media Store issue which got affected by some other app. -***To fix this:*** -1. Head to your device settings +#### Q: Why some of my songs are not showing in my library? +1. Try checking up if those songs are not less than 30 seconds, if so head to settings -> other -> filter song duration. Put this to zero and see the songs should start appearimg in the library. -1. Open up "Apps & notifications" (This name depends from ROM to ROM) +2. If this doesn't work out for you, re-scanning the media folder should help and subsquently rebooting the device to refresh media store. -1. Find the 'Media storage' app and clear storage (both data and cache) of it. +3. At last resort, If nothing worked and your audio files are stored in SD card. Try moving them to internal memory then back to SD card. -1. Then open the Retro Music app and manually scan your music from your storage. -1. Reboot the device to refresh the media store (Not sure if this is necessary) +#### Q: Why my playlist/playlist songs keep disappearing? +Playlist/Playlist songs disappearing is based on android media store system. Save those playlist as file(Tap on three dot menu next to available playlist and save as file) and it should get fixed. -**NOTE:** Don't panic when you will open Retro Music and see "Zero" songs there in the library. It's because you cleared Media Store which is responsible for recognising files on your device. -___ -## **Q: I can't find the folder menu anymore after the latest update?** -Head to settings -> personalise. And select folders from "library categories". If there is no option of folders, tap on reset and select folders. -___ +#### Q: Why does my library shows song files twice or no song at all? +If you are seeing duplication of songs in the library or no songs at all, then it's because of Media Store issue which got affected by some other app. -## **Q: After updating the app to the latest version, the font got removed. Why?** -- Retro Music's font has now been replaced with system font, which means the default font your system uses will be used by Retro Music too. It fixes all font-related issues you used to face/are facing in the app. +To fix this: -- With the recent Retro Music v5 release, we have a built-in optional font "Manrope font" which you can toggle from Settings > Look & Feel > Toggle "Use manrope font". +• Head to your device settings -- If you think the font looks ugly, then you just need to change the default font from your Android settings (or use any Magisk module). If you can't, there's nothing we can do about it. -___ +• Open up "Apps & notifications" (This name depends from ROM to ROM) -## **Q: How to export playlist?** -- ***From Retro Music:*** +• Find 'Media storage' app and clear storage (both data and cache) of it. -Head to the playlists tab > tap on the three-dot menu on the playlist you want to export > save as a file. +• Then open Retro Music app and manually scan your music from your storage. -- ***From Other Music Players:*** +• Reboot the device to refresh media store (Not sure if this is necessary) -In your built-in music player, there should be an option to save that playlist as a file. Save them and import them from the file manager by opening it into retro music. +NOTE: Don't panic when you will open Retro Music and see "Zero" songs there in the library. It's because you cleared Media Store which is responsible for recognising files on your device. -> Note that such playlist must be of your offline music only since retro music is an offline music player, not an online music player. So if your playlist is of online music, it can't be opened on other offline players nor can be exported -___ -## **Q: How to restore/import playlist?** -Retro Music will automatically detect any playlist file when that playlist file is stored in internal storage/Playlist. However, if it doesn't, just open any "File manager" and open that playlist file with Retro Music. +#### Q: I can't find folder menu anymore after latest update? +Head to settings -> personalise. And select folders from "library categories". If there is option of folders, tap on reset and select folders. -For restoring playlists successfully, the location of songs must be the same in both the "Playlist" file and in your storage. For example, If your music is in "Internal storage/Music" and the playlist file has songs location "Internal storage/Songs". Then it will not be going to work since both these locations are different. \ No newline at end of file + +#### Q: After updating the app to latest version, font got removed. Why? +Retro Music's font have now been replaced with system font now, which means the default font your system uses will be used by Retro too. It fixes all font related issues you used to face/are facing in the app. + +If you think the font looks ugly, then you just need to change the default font from your Android settings (or use any Magisk module). If you can't, there's nothing we can do about it. + + +#### Q: How to export playlist: +In your built-in music player, there should be an option to save those playlist as file. Save them and import from file manager by opening it into retro music. + +Note that those playlist must be of your offline music only since retro music is offline music player not an online music player. So if your playlist are of online music, it can't be opened on other offline players nor can be exported + + +#### Q: How to restore/import playlist: +Retro Music will automatically detect any playlist file when that playlist file is stored in InternalStorage/Playlist. However, if it doesn't, just open "file manager" and open that playlist file with Retro Music. + +For restoring playlists, the location of songs must be same in both Playlist file and in your storage. For example, your music is in "Internalstorage/Music" and playlist file has songs location "Internalstorage/Songs". Then it will not going to work since both these location are different. + + +#### Q: Adding songs to playlist or marking them as favourite are making app crash. Why? +It's a known issue with only android 10 with its media store API when songs are in SD card due to introduction of Scoped Storage by Google. The issue have been created on Google Issue Tracker by many users. Many other players which doesn't have this issue are using a custom database for storing playlist. We will soon be implementing a custom database for playlist to fix this issue! + +Workaround: You can move all songs to internal storage to fix the issue. + +ISSUE link: https://issuetracker.google.com/issues/147619577 diff --git a/README.md b/README.md index ca4bd8b1b..9aff14f0f 100644 --- a/README.md +++ b/README.md @@ -2,96 +2,77 @@ Material Design music player for Android music lovers -## Downloads - -[Get it on F-Droid](https://f-droid.org/en/packages/io.github.muntashirakon.Music/) - -## Differences between Metro and [RetroMusicPlayer](https://github.com/h4h13/RetroMusicPlayer) -- Google Play libraries removed (fully libre) -- Pro features available for free -- Fully offline (INTERNET permission removed) +## Differences between RetroMusicPlayer and Metro +- Google Play libraries removed (in favor for F-Droid) +- Pro features for free - Bug fixes -- Minor differences in UI -## 📱 Screenshots +## Screenshots ### App Themes -| | | | +| | | | |:---:|:---:|:---:| |Clearly white| Kinda dark | Just black| ### Player screen -| | | | | | -|:---:|:---:|:---:|:---:|:---:| -| Home | Songs | Albums | Artists | Settings | +| | | | | +|:---:|:---:|:---:|:---:| +| Home | Songs | Albums | Settings | -### Synced lyrics screen (Over Cover) -| | | | -|:---:|:---:|:---:| -| Synced Over Cover light | Synced Over Cover dark | Synced Over Cover black | - -### Synced lyrics screen (Replace Cover) -| | | | -|:---:|:---:|:---:| -| Synced Replace Cover light | Synced Replace Cover dark | Synced Replace Cover black | - -### 10+ Now playing themes -| || | | | +### 9+ Now playing themes + +| || | | | |:-----: |:-----: |:-----: |:-----: |:-----: | | Normal | Fit | Flat | Color | Material | -| || | | | +| || | | | |:-----: |:-----: |:-----: |:-----: |:-----: | -| Classic | Adaptive | Blur | Tiny | Peek | +| Classic | Adaptive | Blur | Tiny | Peak | -## 🧭 Navigation never made easier -Self-explanatory interface without overloaded menus. +### 🧭 Navigation never made easier +Self-explanatory interface without overloaded menus -## 🎨 Colorful -You can choose between three different main themes: Clearly White, Kinda -Dark and Just Black for AMOLED displays. Select your favorite accent +### 🎨 Colorful +You can choose between three different main themes: Clearly white, Kind +dark and Just black for AMOLED displays. Select your favorite accent color from a color palette. -## 🏠 Home -Where you can view your recently/top played artists, albums and -favorite songs. No other music player has this feature. +### 🏠 Home +Where you can have your recently/ top played Artists, Albums and +Favorite Songs. No other music player has this feature -## 📦 Included Features -- Base 3 themes (Clearly White, Kinda Dark and Just Black) +### 📦 Included Features +- Base 3 themes (Clearly white, Kinda dark and Just Black) - Choose from 10+ now playing themes -- Driving Mode +- Drive Mode - Headset/Bluetooth support -- Music duration filter -- Android auto support -- Wallpaper accent picker on Android 8.1+ -- Material You support on Android 12+ -- Monet themed icon support on Android 13+ -- Folder support - Play songs by folder +- Music Duration Filter +- Folder support - Play song by folder - Gapless playback - Volume controls -- Carousel effect for album covers -- Home screen widgets -- Lock screen playback controls -- Lyrics screen (download and sync with music) -- Sleep timer -- Easy drag to sort playlist & play queue +- More than 10 Now playing themes +- Carousel effect for an album cover +- Home screen Widgets +- Lock Screen Playback Controls +- Lyrics Screen(download and sync with music) +- Sleep Timer +- Home screen Widgets +- Easy Drag to Sort Playlist & Play Queue - Tag editor -- Create, edit and import playlists +- Create, Edit, Import playlists - Playing queue with reorder - User profile -- 30+ languages support -- Browse and play your music by songs, albums, artists, playlists and - genre -- Smart Auto Playlists - Recently played, most played and history -- Build your playlist on the go +- 30 Languages support +- Browse and play your music by Songs, Albums, Artists, Playlists, + Genre +- Smart Auto Playlists - Recently played/Top Played/History Fully + playlist support & Build your own playlist on the go -We are trying our best to bring you the best user experience. The app is regularly being updated for bug fixes and new features. -## 🗂️ License +We are trying our best to bring you the best user experience. Until now +it is a beta version - bug fixes (if any) and more features are on the +way. for FAQ's https://goo.gl/DR2mE2 + +### 🗂️ License Metro is released under the GNU General Public License v3.0 -(GPLv3), which can be found [here](LICENSE.md) - - -> Please note: Metro is an offline music player app. It doesn't support music downloading or online music streaming. +(GPLv3), which can be found here: [License](LICENSE.md) diff --git a/app/build.gradle b/app/build.gradle index cb394ecda..851e95dfc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,30 +1,40 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' +apply plugin: "ru.cleverpumpkin.proguard-dictionaries-generator" apply plugin: "androidx.navigation.safeargs.kotlin" -apply plugin: 'kotlin-parcelize' -apply plugin: 'com.google.devtools.ksp' + +proguardDictionaries { + dictionaryNames = [ + "build/class-dictionary", + "build/package-dictionary", + "build/obfuscation-dictionary" + ] +} android { - compileSdk 33 - namespace "code.name.monkey.retromusic" + compileSdkVersion 29 + buildToolsVersion = '30.0.0' defaultConfig { - minSdk 21 - targetSdk 33 + minSdkVersion 21 + targetSdkVersion 29 + renderscriptTargetApi 29 //must match target sdk and build tools vectorDrawables.useSupportLibrary = true applicationId 'io.github.muntashirakon.Music' - versionCode 10603 - versionName '6.1.0' + versionCode 10443 + versionName '3.5.10' multiDexEnabled true } buildTypes { release { - shrinkResources true minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + shrinkResources true + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } debug { applicationIdSuffix '.debug' @@ -32,17 +42,15 @@ android { } } - buildFeatures { - viewBinding true - } packagingOptions { - resources { - excludes += ['META-INF/LICENSE', 'META-INF/NOTICE', 'META-INF/java.properties'] - } + exclude 'META-INF/LICENSE' + exclude 'META-INF/NOTICE' + exclude 'META-INF/java.properties' } - lint { - abortOnError true - warning 'ImpliedQuantity', 'Instantiatable', 'MissingQuantity', 'MissingTranslation' + lintOptions { + disable 'MissingTranslation' + disable 'InvalidPackage' + abortOnError false } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -51,82 +59,90 @@ android { kotlinOptions { jvmTarget = "1.8" } - dependenciesInfo { - includeInApk = false - includeInBundle = false - } - configurations.configureEach { + + configurations.all { resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9' } + androidExtensions { + experimental = true + } + kapt { + generateStubs = true + } } dependencies { + implementation fileTree(include: ['*.jar'], dir: 'libs') implementation project(':appthemehelper') - implementation "androidx.gridlayout:gridlayout:1.0.0" + implementation 'androidx.multidex:multidex:2.0.1' - implementation "androidx.appcompat:appcompat:$appcompat_version" - implementation 'androidx.annotation:annotation:1.6.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.recyclerview:recyclerview:1.3.0' - implementation "androidx.preference:preference-ktx:$preference_version" - implementation "androidx.core:core-ktx:$core_version" + implementation "androidx.gridlayout:gridlayout:1.0.0" + implementation "androidx.cardview:cardview:1.0.0" + implementation "androidx.viewpager2:viewpager2:1.1.0-alpha01" + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.preference:preference-ktx:1.1.1' + implementation 'androidx.core:core-ktx:1.3.1' + implementation 'androidx.fragment:fragment-ktx:1.2.5' implementation 'androidx.palette:palette-ktx:1.0.0' - implementation 'androidx.mediarouter:mediarouter:1.3.1' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta8' + implementation 'androidx.recyclerview:recyclerview:1.1.0' - implementation "androidx.navigation:navigation-runtime-ktx:$navigation_version" - implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version" - implementation "androidx.navigation:navigation-ui-ktx:$navigation_version" - - def room_version = '2.5.1' - implementation "androidx.room:room-runtime:$room_version" - implementation "androidx.room:room-ktx:$room_version" - ksp "androidx.room:room-compiler:$room_version" - - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" - implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" - - implementation "androidx.core:core-splashscreen:1.0.0" - - implementation "com.google.android.material:material:$mdc_version" + implementation 'com.google.android.material:material:1.3.0-alpha01' def retrofit_version = '2.9.0' implementation "com.squareup.retrofit2:retrofit:$retrofit_version" implementation "com.squareup.retrofit2:converter-gson:$retrofit_version" - def material_dialog_version = "3.3.0" + def material_dialog_version = "0.9.6.0" implementation "com.afollestad.material-dialogs:core:$material_dialog_version" - implementation "com.afollestad.material-dialogs:input:$material_dialog_version" - implementation "com.afollestad.material-dialogs:color:$material_dialog_version" + implementation "com.afollestad.material-dialogs:commons:$material_dialog_version" + implementation 'com.afollestad:material-cab:0.1.12' - implementation 'com.afollestad:material-cab:2.0.1' + implementation 'com.github.bumptech.glide:glide:3.8.0' + implementation 'com.github.bumptech.glide:okhttp3-integration:1.5.0' + implementation 'com.squareup.okhttp3:logging-interceptor:3.6.0' - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + implementation('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.11.0@aar') { + transitive = true + } + def kotlin_coroutines_version = "1.3.8" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version" - def koin_version = '3.4.0' - implementation "io.insert-koin:koin-core:$koin_version" - implementation "io.insert-koin:koin-android:$koin_version" + implementation 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:3.4.0.201406110918-r' - def glide_version = '4.15.1' - implementation "com.github.bumptech.glide:glide:$glide_version" - ksp "com.github.bumptech.glide:ksp:$glide_version" + implementation 'com.github.ksoichiro:android-observablescrollview:1.6.0' + implementation 'com.github.kabouzeid:recyclerview-fastscroll:1.9-kmod' - implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0' + implementation 'com.github.AdrienPoupa:jaudiotagger:2.2.3' - implementation 'com.github.bosphere.android-fadingedgelayout:fadingedgelayout:1.0.0' - - implementation 'net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent:3.0.0-RC3' - implementation 'com.github.jetradarmobile:android-snowfall:1.2.1' - - implementation "dev.chrisbanes.insetter:insetter:0.6.1" - - implementation 'com.github.Adonai:jaudiotagger:2.3.15' implementation 'com.r0adkll:slidableactivity:2.1.0' - implementation 'com.heinrichreimersoftware:material-intro:2.0.0' - implementation 'com.github.dhaval2404:imagepicker:2.1' - implementation 'me.zhanghai.android.fastscroll:library:1.2.0' - implementation 'cat.ereza:customactivityoncrash:2.4.0' - implementation 'me.tankery.lib:circularSeekBar:1.4.2' + implementation 'com.heinrichreimersoftware:material-intro:1.6' + implementation 'me.zhanghai.android.fastscroll:library:1.1.0' + + def lifecycle_version = "2.2.0" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" + + implementation 'me.jorgecastillo:androidcolorx:0.2.0' + debugImplementation 'com.amitshekhar.android:debug-db:1.0.4' + implementation 'com.github.dhaval2404:imagepicker:1.7.1' + + def koin_version = "2.1.5" + implementation "org.koin:koin-core:$koin_version" + implementation "org.koin:koin-core-ext:$koin_version" + implementation "org.koin:koin-androidx-scope:$koin_version" + implementation "org.koin:koin-androidx-viewmodel:$koin_version" + implementation "org.koin:koin-androidx-fragment:$koin_version" + implementation "org.koin:koin-androidx-ext:$koin_version" + + def nav_version = "2.3.0" + implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" + implementation "androidx.navigation:navigation-ui-ktx:$nav_version" + } \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index c9f1d0067..5e2e2be56 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -16,9 +16,9 @@ # public *; #} -# Preserve the line number information for +# Uncomment this to preserve the line number information for # debugging stack traces. --keepattributes SourceFile,LineNumberTable +#-keepattributes SourceFile,LineNumberTable # If you keep the line number information, uncomment this to # hide the original source file name. @@ -26,46 +26,40 @@ -dontwarn java.lang.invoke.* -dontwarn **$$Lambda$* --dontwarn javax.annotation.** # RetroFit -dontwarn retrofit.** -keep class retrofit.** { *; } +-keepattributes Signature +-keepattributes Exceptions +-dontwarn javax.annotation.** # Glide -keep public class * implements com.bumptech.glide.module.GlideModule --keep class * extends com.bumptech.glide.module.AppGlideModule { - (...); -} --keep public enum com.bumptech.glide.load.ImageHeaderParser$** { - **[] $VALUES; - public *; -} --keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder { - *** rewind(); +-keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** { + **[] $VALUES; + public *; } -# OkHttp --keepattributes Signature --keepattributes *Annotation* --keep interface com.squareup.okhttp3.** { *; } --dontwarn com.squareup.okhttp3.** +-keep class !android.support.v7.internal.view.menu.**,** {*;} -#-dontwarn -#-ignorewarnings +-dontwarn +-ignorewarnings -#Jaudiotagger --dontwarn org.jaudiotagger.** --dontwarn org.jcodec.** --keep class org.jaudiotagger.** { *; } --keep class org.jcodec.** { *; } +-keep public class android.support.design.widget.BottomNavigationView { *; } +-keep public class android.support.design.internal.BottomNavigationMenuView { *; } +-keep public class android.support.design.internal.BottomNavigationPresenter { *; } +-keep public class android.support.design.internal.BottomNavigationItemView { *; } --keepclassmembers enum * { *; } --keepattributes *Annotation*, Signature, Exception --keepnames class androidx.navigation.fragment.NavHostFragment --keep class * extends androidx.fragment.app.Fragment{} --keepnames class * extends android.os.Parcelable --keepnames class * extends java.io.Serializable --keep class code.name.monkey.retromusic.network.model.** { *; } --keep class code.name.monkey.retromusic.model.** { *; } --keep class com.google.android.material.bottomsheet.** { *; } \ No newline at end of file +#-dontwarn android.support.v8.renderscript.* +#-keepclassmembers class android.support.v8.renderscript.RenderScript { +# native *** rsn*(...); +# native *** n*(...); +#} + +#-keep class org.jaudiotagger.** { *; } + + +-obfuscationdictionary build/obfuscation-dictionary.txt +-classobfuscationdictionary build/class-dictionary.txt +-packageobfuscationdictionary build/package-dictionary.txt diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json new file mode 100644 index 000000000..08c9ac789 --- /dev/null +++ b/app/release/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "io.github.muntashirakon.Music", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "properties": [], + "versionCode": 10443, + "versionName": "3.5.10", + "enabled": true, + "outputFile": "app-release.apk" + } + ] +} \ No newline at end of file diff --git a/app/release/output.json b/app/release/output.json new file mode 100644 index 000000000..758f3ea4a --- /dev/null +++ b/app/release/output.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "code.name.monkey.retromusic", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "properties": [], + "versionCode": 10438, + "versionName": "10438", + "enabled": true, + "outputFile": "app-release.apk" + } + ] +} \ No newline at end of file diff --git a/app/src/debug/res/font/bold.ttf b/app/src/debug/res/font/bold.ttf deleted file mode 100644 index 96619df92..000000000 Binary files a/app/src/debug/res/font/bold.ttf and /dev/null differ diff --git a/app/src/debug/res/font/google_sans_bold.ttf b/app/src/debug/res/font/google_sans_bold.ttf deleted file mode 100644 index 80497666e..000000000 Binary files a/app/src/debug/res/font/google_sans_bold.ttf and /dev/null differ diff --git a/app/src/debug/res/font/google_sans_medium.ttf b/app/src/debug/res/font/google_sans_medium.ttf deleted file mode 100644 index 1543660da..000000000 Binary files a/app/src/debug/res/font/google_sans_medium.ttf and /dev/null differ diff --git a/app/src/debug/res/font/google_sans_regular.ttf b/app/src/debug/res/font/google_sans_regular.ttf deleted file mode 100644 index ab605f9e2..000000000 Binary files a/app/src/debug/res/font/google_sans_regular.ttf and /dev/null differ diff --git a/app/src/debug/res/font/medium.ttf b/app/src/debug/res/font/medium.ttf deleted file mode 100644 index fd818d6f5..000000000 Binary files a/app/src/debug/res/font/medium.ttf and /dev/null differ diff --git a/app/src/debug/res/font/regular.ttf b/app/src/debug/res/font/regular.ttf deleted file mode 100644 index e2c69c3fb..000000000 Binary files a/app/src/debug/res/font/regular.ttf and /dev/null differ diff --git a/app/src/debug/res/font/sans.xml b/app/src/debug/res/font/sans.xml deleted file mode 100644 index 7bbc8513b..000000000 --- a/app/src/debug/res/font/sans.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/debug/res/values/bools.xml b/app/src/debug/res/values/bools.xml deleted file mode 100644 index 7d3f0ee62..000000000 --- a/app/src/debug/res/values/bools.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - true - false - \ No newline at end of file diff --git a/app/src/debug/res/values/donottranslate.xml b/app/src/debug/res/values/donottranslate.xml deleted file mode 100644 index 79e559838..000000000 --- a/app/src/debug/res/values/donottranslate.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - Metro Debug - \ No newline at end of file diff --git a/app/src/debug/res/values/styles.xml b/app/src/debug/res/values/styles.xml deleted file mode 100644 index f3761b219..000000000 --- a/app/src/debug/res/values/styles.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 14fbaaab7..30cf2312c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,57 +1,39 @@ - - - - + - - - - + + + + - - + android:usesCleartextTraffic="false" + tools:ignore="AllowBackup,GoogleAppIndexingWarning" + tools:targetApi="m"> + android:label="@string/app_name" + android:theme="@style/SplashTheme"> @@ -62,6 +44,7 @@ + @@ -121,54 +104,30 @@ + + + + + + + + + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + - + @@ -216,7 +174,7 @@ @@ -229,7 +187,7 @@ @@ -241,7 +199,7 @@ @@ -253,7 +211,7 @@ @@ -265,7 +223,7 @@ @@ -275,36 +233,13 @@ android:name="android.appwidget.provider" android:resource="@xml/app_widget_card_info" /> - - - - - - - - - - - - - - + android:label="@string/app_name" + tools:ignore="ExportedService"> @@ -318,33 +253,15 @@ android:name="com.lge.support.SPLIT_WINDOW" android:value="true" /> - - - + android:name="io.github.muntashirakon.music.glide.RetroMusicGlideModule" + android:value="GlideModule" /> - - - - + + - - - - - diff --git a/app/src/main/assets/contributors.json b/app/src/main/assets/contributors.json new file mode 100644 index 000000000..2efd24509 --- /dev/null +++ b/app/src/main/assets/contributors.json @@ -0,0 +1,26 @@ +[ + { + "name": "Hemanth Savarala", + "summary": "Lead Developer & Designer", + "link": "https://github.com/h4h13", + "profile_image": "https://i.imgur.com/AoVs9oj.jpg" + }, + { + "name": "Lennart Glamann", + "summary": "Play Store banner and Images", + "link": "https://t.me/FlixbusLennart", + "profile_image": "https://i.imgur.com/Q5Nsx1R.jpg" + }, + { + "name": "Daksh P. Jain", + "summary": "Telegram group maintainer", + "link": "https://dakshpjain.eu.org", + "profile_image": "https://i.imgur.com/fnYpg65.jpg" + }, + { + "name": "Milind Goel", + "summary": "Github & Telegram maintainer", + "link": "https://t.me/MilindGoel15", + "profile_image": "https://i.imgur.com/Bz4De21_d.jpg" + } +] diff --git a/app/src/main/assets/images/daksh.png b/app/src/main/assets/images/daksh.png deleted file mode 100644 index 737f9066c..000000000 Binary files a/app/src/main/assets/images/daksh.png and /dev/null differ diff --git a/app/src/main/assets/images/haythem.jpg b/app/src/main/assets/images/haythem.jpg deleted file mode 100644 index c74527f1d..000000000 Binary files a/app/src/main/assets/images/haythem.jpg and /dev/null differ diff --git a/app/src/main/assets/images/hemanth.jpg b/app/src/main/assets/images/hemanth.jpg deleted file mode 100644 index b8f5e7805..000000000 Binary files a/app/src/main/assets/images/hemanth.jpg and /dev/null differ diff --git a/app/src/main/assets/images/lenny.jpg b/app/src/main/assets/images/lenny.jpg deleted file mode 100644 index 7f8025f08..000000000 Binary files a/app/src/main/assets/images/lenny.jpg and /dev/null differ diff --git a/app/src/main/assets/images/milind.png b/app/src/main/assets/images/milind.png deleted file mode 100644 index bbf9b8278..000000000 Binary files a/app/src/main/assets/images/milind.png and /dev/null differ diff --git a/app/src/main/assets/images/pratham.jpg b/app/src/main/assets/images/pratham.jpg deleted file mode 100644 index 7f05ad9d5..000000000 Binary files a/app/src/main/assets/images/pratham.jpg and /dev/null differ diff --git a/app/src/main/assets/license.html b/app/src/main/assets/license.html deleted file mode 100644 index 2fd8ba5ed..000000000 --- a/app/src/main/assets/license.html +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - -

Phonograph by - Karim Abou Zeid

-

AOSP Support Libraries by AOSP contributors

-

Glide by Sam Judd

-

Retrofit by Square team -

-

OkHttp by Square team

-

Koin by Arnaud Giuliani

-

Material Dialogs and Cab - by Aidan Michael Follestad

-

- Material Contextual Action Bar by Aidan Michael Follestad

-

Advanced RecyclerView by Haruki Hasegawa

-

Custom Activity on Crash by Eduard Ereza Martínez -

-

NanoHttpd by NanoHttpd Team

-

Circular Seekbar by Tankery

-

jAudioTagger by Kanedias

-

Android Fast Scroll by Zhang Hai

-

Image Picker by Dhaval Patel

-

Material Intro by Jan Heinrich Reimer

-

Slidr by Drew Heavner

-

FadingEdgeLayout by bosphere

-

KeyboardVisibilityEvent by Yasuhiro SHIMIZU

-

android-snowfall by Jetradar Mobile

-

Insetter by Chris Banes

-

Icons by Austin Andrews

-

Material Design City Wallpaper -

- - diff --git a/app/src/main/assets/oldindex.html b/app/src/main/assets/oldindex.html new file mode 100644 index 000000000..367da632a --- /dev/null +++ b/app/src/main/assets/oldindex.html @@ -0,0 +1,63 @@ + + + + + + + + + +

Phonograph by + Karim Abou Zeid

+

Material Dialogs and Cab + by Aidan Michael Follestad

+

AOSP Support Librariesby AOSP contributors

+

Glide by Sam Judd

+

Retrofit by Square team +

+

+ Material Contextual Action Bar by Aidan Michael Follestad

+

OkHttp by Square team

+

+ CircleImageView by Henning Dodenhof

+

+ MaterialProgressBar by Zhang Hai

+

Android In-App Billing v3 Library by + Henning Dodenhof

+

Advanced RecyclerView by Haruki Hasegawa

+

Android-ObservableScrollView by Soichiro + Kashima

+

Icons by Austin Andrews

+

Material Design City Wallpaper +

+ + + diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html index b6b1c411a..aa3c01e7f 100644 --- a/app/src/main/assets/retro-changelog.html +++ b/app/src/main/assets/retro-changelog.html @@ -6,23 +6,22 @@ word-wrap: break-word; } - div { - margin: 20px 10px; - padding: 10px; - border-radius: 10px; - box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2); + body { + padding-left: 1rem; + padding-right: 1rem; } h2 { margin-block-end: 0rem; margin-block-start: 0rem; - display: inline-block; - vertical-align: center; } li { font-size: 0.85rem; - padding: 0.5rem 0; + padding-top: 0.5rem; + padding-left: 0; + padding-right: 0; + color: rgba(0, 0, 0, 0.8); } ul { @@ -37,6 +36,7 @@ span { font-size: 0.7rem; + line-height: 0.7rem; } h5 { @@ -44,423 +44,39 @@ margin-block-end: 0.5rem; } - h3 { - margin: 10px 0px; + h3 span { + border-radius: 0.2rem; + padding-left: 0.5rem; + padding-right: 0.5rem; + padding-top: 0.3rem; + padding-bottom: 0.3rem; font-size: 1rem; } - - .tag { - border-radius: 5px; - margin-left: 10px; - padding: 5px; - display: inline-block; - vertical-align: top; - } - {style-placeholder} + + - -
-
March 30, 2023
-

v6.1.0

-

What's New

-
    -
  • App now targets Android 13, support for Granular media permissions, Photo picker, Per-app language preferences & Predictive back gesture
    • -
-

Fixed

-
    -
  • Fixed playlist reordering crash
    • -
  • Other minor bugs fixes and improvements
    • -
-
-
-
March 13, 2023
-

v6.0.4

-

What's New

-
    -
  • Minor redesign in Playlist details screen
    • -
  • Updated translations
    • -
-

Fixed

-
    -
  • Fixed file popup menu actions in Folders tab
    • -
  • Fixed playlist image loading
    • -
  • Fixed blurry album art in Android 13
    • -
  • Minor bug fixes and improvements
    • -
-
-
-
July 10, 2022
-

v6.0.3Beta

-

Fixed

-
    -
  • Migrated icons to Material symbols
    • -
-
-
-
June 21, 2022
-

v6.0.2Beta

-

Fixed

-
    -
  • Minor bug fixes and improvements
    • -
-
-
-
June 13, 2022
-

v6.0.1Beta

-

Fixed

-
    -
  • Fixed ChromeCast crash
    • -
  • Fixed Slider crashes
    • -
  • Fixed storage related crashes on Android 10
    • -
  • Fixed CrossFade not working Fade Audio is not working
    • -
-
-
-
June 7, 2022
-

v6.0.0Beta

-

What's New

-
    -
  • Better Cast
    • -
  • Mini player in settings screen
    • -
  • Changed Seekbar with Sliders
    • -
  • Added NavigationRailView for Landscape
    • -
  • Show remaining time in Sleep timer dialog
    • -
-

Fixed

-
    -
  • Fixed Top/Recent Artists/Albums not updating (Wrong sort order)
    • -
  • Fixed all Blacklist related crashes
    • -
  • Fix restart button not working in crash activity
    • -
-
-
-
May 25, 2022
-

v5.8.5

-

What's New

-
    -
  • Display song images along in the artist and album details pages
    • -
  • Removed the Internet permissions and all the associated features
    • -
-

Fixed

-
    -
  • Fixed crashing occurs during changing screen orientation
    • -
-
-
-
May 13, 2022
-

v5.8.4

-

What's New

-
    -
  • Added a toggle to enable/disable swipe down to dismiss mini player
    • -
-

Fixed

-
    -
  • Fixed Playback speed and pitch not working when CrossFade is enabled
    • -
  • Fixed crash when adding folders to blacklist
    • -
  • Fix bugs in MD3 theme
    • -
-
-
-
May 07, 2022
-

v5.8.3

-

What's New

-
    -
  • Added a new MD3 now playing theme
    • -
  • Swipe down to dismiss Mini player
    • -
  • Add support for Just Black with Material You
    • -
-

Fixed

-
    -
  • Fixed sharing of files from SD Card
    • -
  • Fix ChromeCast crash and bugs
    • -
  • Fix Audio Crossfade
    • -
  • Tried to fix incorrect song data in notification
    • -
-
-
-
April 8, 2022
-

v5.8.0

-

What's New

-
    -
  • Updated translations
    • -
-

Fixed

-
    -
  • Fixed Classic Notification crash
    • -
  • Fixed crash when clicking on Playlist in the Search Tab
    • -
  • Fixed settings change not reflecting immediately
    • -
  • Fixed shuffle
    • -
  • Fixed Song duration not visible in Card & Blur card themes
    • -
  • Fixed some Album skip styles
    • -
  • Minor bug fixes & UI improvements
    • -
-
-
-
March 13, 2022
-

v5.7.3

-

What's New

-
    -
  • Added adaptive color in Material now playing theme
    • -
  • Added an option to share crash report
    • -
  • Added options to clear, pause history
    • -
-

Fixed

-
    -
  • Adapt Wallpaper accent for better readability
    • -
  • Optimized search
    • -
  • Made sleep timer precise
    • -
-
-
-
February 13, 2022
-

v5.7.2Beta

-

What's New

-
    -
  • Animated splash screen on Android 12 devices
    • -
-

Fixed

-
    -
  • Fixed crash when removing song from Playing queue
    • -
  • Fixed lyrics editing crash
    • -
  • Fixed shuffle button not working
    • -
  • Fixed crash on song deletion
    • -
-
-
-
February 1, 2022
-

v5.7.1Beta

-

What's New

-
    -
  • Added option to disable changing song by swiping anywhere on the now playing screen
    • -
-

Fixed

-
    -
  • Fixed Playlist save on A11+
    • -
  • Fixed Just Black theme
    • -
  • Fixed some UI issues
    • -
-

Improved

-
    -
  • Improvements to search
    • -
-
-
-
January 25, 2022
-

v5.7.0Beta

-

What's New

-
    -
  • Added Android Auto
    • -
  • Added accent color extraction on Android 8.1+ devices
    • -
  • Added new Circle widget
    • -
  • Added Collapsing appbar to library tabs with an option to switch back to simple appbar -
    • -
  • Added Search tab
    • -
  • Added option to use circular play button
    • -
  • Added lyrics editing on A11+ devices again
    • -
  • Added Long Press to forward, rewind current song
    • -
  • Added ability to set Playback speed and pitch
    • -
  • Added option to show lyrics over Cover
    • -
  • Added option to keep screen on when showing lyrics
    • -
  • Added option to switch to Manrope font
    • -
-

Fixed

-
    -
  • Fixed Gapless Playback
    • -
  • Fixed Shuffle FAB going behind Mini Player
    • -
  • Fixed crashes on Pre-marshmallow devices
    • -
  • Blacklisted songs can't be played after opening from outside the app
    • -
  • Fixed various small bugs and some minor improvements
    • -
-
-
-
January 1, 2021
-

v5.6.1

-

Fixed

-
    -
  • Fixed artist covers not updating and showing album cover images.
    • -
  • Fixed FAB's not visible (Shuffle, Save, etc.)
    • -
  • Fixed a crash when a Song is deleted in Artist Details
    • -
  • Fixed Snowfall effect
    • -
  • Fixed empty notification when queue is cleared
    • -
-
-
-
December 25, 2021
-

v5.6.0Beta

-

What's New

-
    -
  • Added Artwork editing for songs
    • -
  • Circle theme has album art now
    • -
  • Upgraded tag editor library, we should support reading tags of more formats now e.g. - opus. -
    • -
  • Added Snowfall effect
    • -
  • Crossfade effect for background when Song is changed for Blur, Blur card themes
    • -
  • Album art is hidden when Show lyrics is enabled
    • -
  • Added fastscroll in Playlists tab
    • -
  • Added Chooser to choose what to restore
    • -
  • Hide BottomNavigation when only one tab is selected in Library Categories(This was - already there but when changing screens it was getting visible) -
    • -
-

Fixed

-
    -
  • Fixed Ringtone crash
    • -
  • Fixed blank album cover bug
    • -
  • Fixed bottom navigation visible in Playing Queue
    • -
  • Fixed lockscreen dragging glitch
    • -
  • Fixed incorrect colors when no cover art is available
    • -
  • Fixed favorite not updating when song is changed
    • -
  • Fixed playlist not getting created & playlist creation crash with same name
    • -
  • Fixed a bug in "Plain" Now playing theme where onClick event is consumed by the views - behind the bottom sheet -
    • -
-
-
-
December 6, 2021
-

v5.4.2Beta

-

Fixed

-
    -
  • Bug Fixes
    • -
-
-
-
December 1, 2021
-

v5.4.1Beta

-

What's New

-
    -
  • Added file selection from system file picker for restore
    • -
  • Added Grid size selection for Playlists
    • -
-

Improved

-
    -
  • Enable Material You by default on Android 12
    • -
  • Reworked Grid Style saving
    • -
  • Improved Playlist preview images
    • -
  • UI improvements
    • -
-

Improved

-
    -
  • Fixed File deletion on Android 10
    • -
  • Fixed Sleep Timer crash
    • -
  • Fixed Bottom Toolbar not clickable in now playing when Shuffle is clicked
    • -
  • Fixed Album Artist sort order
    • -
  • Fixed a crash when clicking the "Clear All" button in the Blacklist folder selection -
    • -
  • Fixed Continuous crashes on A12 when the song ends
    • -
  • Fixed New Music Mix multiple clicks crash
    • -
-
-
-
November 22, 2021
-

v5.4.0Beta

-

What's New

-
    -
  • Material You
    • -
  • Going Edge-to-Edge
    • -
  • Added Backup & restore
    • -
-

Improved

-
    -
  • Improved Animations
    • -
  • Improved Crossfade
    • -
-
-
-
September 06, 2021
-

v5.0.0

-

What's New

-
    -
  • Added ability to Remember last tab
    • -
  • Added Whitelisting songs
    • -
  • You can now browse SDCard from Folders Tab
    • -
-
-
-
August 22, 2021
-

v4.4.0Beta

-

What's New

-
    -
  • Added Crossfade
    • -
  • Multi-select in Album and Artist Details
    • -
  • Albums now show Album Artists instead of artist of first song
    • -
-

Fixed

-
    -
  • Fixed Playlist Preview Images
    • -
-
-
-
August 11, 2021
-

v4.2.30Beta

-

What's New

-
    -
  • Revamped Playlist Tab
    • -
  • Revamped Genres Tab
    • -
  • Added support for embedded Synced Lyrics
    • -
  • Added animated icons
    • -
-

Fixed

-
    -
  • Fixed Language Switching
    • -
  • Fixed some reported bugs
    • -
-
-
-
July 18, 2021
-

v4.2.020Beta

-

What's New

-
    -
  • Added ChromeCast Support
    • -
  • Added Lyrics Editor for Normal and Synced Lyrics
    • -
  • Added Ripple Animation for Color Theme
    • -
  • Added Drag to seek in Tiny Theme
    • -
  • Added Playlist Order
    • -
  • Added Search Filters
    • -
  • Added Audio Fade
    • -
  • Synced Lyrics in all Themes
    • -
  • Swipe anywhere to change song
    • -
-

Improved

-
    -
  • Fixed Navigate by Album Artist
    • -
  • Changed New Music Mix Actions
    • -
  • Improved Animations
    • -
  • And some minor bug fixes and improvements
    • -
-
-
-
October 12, 2020
-

v4.0.10

-

What's New

-
    -
  • Re-built from scratch using MVVM Architecture and JetPack Components
    • -
  • New Material Design icon
    • -
  • Implemented a custom database for playlists
    • -
  • Added new Material Design motions
    • -
  • Bug fixes & performance improvements
    • -
  • Revamped Home tab UI
    • -
  • Android 11 support
    • -
  • And more!
    • -
-
-
-
April 30, 2020
-

v3.5.110Beta

-

What's New

-
    -
  • Changed profile form image to icon
    • -
  • New what's new screen
    • -
  • Added In-App language changer, where you can select language
    • -
-

Improved

-
    -
  • Improved loading of Songs, Albums, Artists, Genres, Playlists
    • -
-
+
April 30, 2020
+

v3.5.110

+Beta version +

What's New

+
    +
  • Changed profile form image to icon
    • +
  • New what's new screen
    • +
  • Added In-App language changer, where you can select language
    • +
+

Improved

+
    +
  • Improved loading of Songs, Albums, Artists, Genres, Playlists
    • +
+ +

*If you face any UI related issues you clear app data and cache, if itsnot working try to + uninstall and install + again.

\ No newline at end of file diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index aa6e4ae9a..991844b5e 100644 Binary files a/app/src/main/ic_launcher-playstore.png and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png index 7e7647db5..ff0f8b9ff 100644 Binary files a/app/src/main/ic_launcher-web.png and b/app/src/main/ic_launcher-web.png differ diff --git a/app/src/main/java/code/name/monkey/retromusic/App.kt b/app/src/main/java/code/name/monkey/retromusic/App.kt deleted file mode 100644 index 93dfe4d96..000000000 --- a/app/src/main/java/code/name/monkey/retromusic/App.kt +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2020 Hemanth Savarla. - * - * Licensed under the GNU General Public License v3 - * - * This is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - */ -package code.name.monkey.retromusic - -import android.app.Application -import androidx.preference.PreferenceManager -import cat.ereza.customactivityoncrash.config.CaocConfig -import code.name.monkey.appthemehelper.ThemeStore -import code.name.monkey.appthemehelper.util.VersionUtils -import code.name.monkey.retromusic.activities.ErrorActivity -import code.name.monkey.retromusic.activities.MainActivity -import code.name.monkey.retromusic.appshortcuts.DynamicShortcutManager -import code.name.monkey.retromusic.helper.WallpaperAccentManager -import org.koin.android.ext.koin.androidContext -import org.koin.core.context.startKoin - -class App : Application() { - - private val wallpaperAccentManager = WallpaperAccentManager(this) - - override fun onCreate() { - super.onCreate() - instance = this - - startKoin { - androidContext(this@App) - modules(appModules) - } - // default theme - if (!ThemeStore.isConfigured(this, 3)) { - ThemeStore.editTheme(this) - .accentColorRes(code.name.monkey.appthemehelper.R.color.md_deep_purple_A200) - .coloredNavigationBar(true) - .commit() - } - wallpaperAccentManager.init() - - if (VersionUtils.hasNougatMR()) - DynamicShortcutManager(this).initDynamicShortcuts() - - // setting Error activity - CaocConfig.Builder.create().errorActivity(ErrorActivity::class.java) - .restartActivity(MainActivity::class.java).apply() - - // Set Default values for now playing preferences - // This will reduce startup time for now playing settings fragment as Preference listener of AbsSlidingMusicPanelActivity won't be called - PreferenceManager.setDefaultValues(this, R.xml.pref_now_playing_screen, false) - } - - override fun onTerminate() { - super.onTerminate() - wallpaperAccentManager.release() - } - - companion object { - private var instance: App? = null - - fun getContext(): App { - return instance!! - } - } -} diff --git a/app/src/main/java/code/name/monkey/retromusic/HomeSection.kt b/app/src/main/java/code/name/monkey/retromusic/HomeSection.kt deleted file mode 100644 index 4f1273a03..000000000 --- a/app/src/main/java/code/name/monkey/retromusic/HomeSection.kt +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2020 Hemanth Savarla. - * - * Licensed under the GNU General Public License v3 - * - * This is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - */ -package code.name.monkey.retromusic - -import androidx.annotation.IntDef - -@IntDef( - RECENT_ALBUMS, - TOP_ALBUMS, - RECENT_ARTISTS, - TOP_ARTISTS, - SUGGESTIONS, - FAVOURITES, - GENRES, - PLAYLISTS -) -@Retention(AnnotationRetention.SOURCE) -annotation class HomeSection - -const val RECENT_ALBUMS = 3 -const val TOP_ALBUMS = 1 -const val RECENT_ARTISTS = 2 -const val TOP_ARTISTS = 0 -const val SUGGESTIONS = 5 -const val FAVOURITES = 4 -const val GENRES = 6 -const val PLAYLISTS = 7 -const val HISTORY_PLAYLIST = 8 -const val LAST_ADDED_PLAYLIST = 9 -const val TOP_PLAYED_PLAYLIST = 10 diff --git a/app/src/main/java/code/name/monkey/retromusic/MainModule.kt b/app/src/main/java/code/name/monkey/retromusic/MainModule.kt deleted file mode 100644 index d88f8a760..000000000 --- a/app/src/main/java/code/name/monkey/retromusic/MainModule.kt +++ /dev/null @@ -1,156 +0,0 @@ -package code.name.monkey.retromusic - -import androidx.room.Room -import code.name.monkey.retromusic.auto.AutoMusicProvider -import code.name.monkey.retromusic.db.MIGRATION_23_24 -import code.name.monkey.retromusic.db.RetroDatabase -import code.name.monkey.retromusic.fragments.LibraryViewModel -import code.name.monkey.retromusic.fragments.albums.AlbumDetailsViewModel -import code.name.monkey.retromusic.fragments.artists.ArtistDetailsViewModel -import code.name.monkey.retromusic.fragments.genres.GenreDetailsViewModel -import code.name.monkey.retromusic.fragments.playlists.PlaylistDetailsViewModel -import code.name.monkey.retromusic.model.Genre -import code.name.monkey.retromusic.repository.* -import org.koin.android.ext.koin.androidContext -import org.koin.androidx.viewmodel.dsl.viewModel -import org.koin.dsl.bind -import org.koin.dsl.module - -private val roomModule = module { - - single { - Room.databaseBuilder(androidContext(), RetroDatabase::class.java, "playlist.db") - .addMigrations(MIGRATION_23_24) - .build() - } - - factory { - get().playlistDao() - } - - factory { - get().playCountDao() - } - - factory { - get().historyDao() - } - - single { - RealRoomRepository(get(), get(), get()) - } bind RoomRepository::class -} -private val autoModule = module { - single { - AutoMusicProvider( - androidContext(), - get(), - get(), - get(), - get(), - get(), - get() - ) - } -} -private val mainModule = module { - single { - androidContext().contentResolver - } -} -private val dataModule = module { - single { - RealRepository( - get(), - get(), - get(), - get(), - get(), - get(), - get(), - get(), - get(), - get(), - ) - } bind Repository::class - - single { - RealSongRepository(get()) - } bind SongRepository::class - - single { - RealGenreRepository(get(), get()) - } bind GenreRepository::class - - single { - RealAlbumRepository(get()) - } bind AlbumRepository::class - - single { - RealArtistRepository(get(), get()) - } bind ArtistRepository::class - - single { - RealPlaylistRepository(get()) - } bind PlaylistRepository::class - - single { - RealTopPlayedRepository(get(), get(), get(), get()) - } bind TopPlayedRepository::class - - single { - RealLastAddedRepository( - get(), - get(), - get() - ) - } bind LastAddedRepository::class - - single { - RealSearchRepository( - get(), - get(), - get(), - get(), - get() - ) - } -} - -private val viewModules = module { - - viewModel { - LibraryViewModel(get()) - } - - viewModel { (albumId: Long) -> - AlbumDetailsViewModel( - get(), - albumId - ) - } - - viewModel { (artistId: Long?, artistName: String?) -> - ArtistDetailsViewModel( - get(), - artistId, - artistName - ) - } - - viewModel { (playlistId: Long) -> - PlaylistDetailsViewModel( - get(), - playlistId - ) - } - - viewModel { (genre: Genre) -> - GenreDetailsViewModel( - get(), - genre - ) - } -} - -val appModules = listOf(mainModule, dataModule, autoModule, viewModules, roomModule) \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt deleted file mode 100644 index af3890d22..000000000 --- a/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt +++ /dev/null @@ -1,258 +0,0 @@ -/* - * Copyright (c) 2020 Hemanth Savarla. - * - * Licensed under the GNU General Public License v3 - * - * This is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - */ -package code.name.monkey.retromusic.activities - -import android.content.Intent -import android.graphics.Color -import android.graphics.PorterDuff -import android.os.Bundle -import androidx.lifecycle.lifecycleScope -import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity -import code.name.monkey.retromusic.databinding.ActivityDriveModeBinding -import code.name.monkey.retromusic.db.toSongEntity -import code.name.monkey.retromusic.extensions.accentColor -import code.name.monkey.retromusic.extensions.drawAboveSystemBars -import code.name.monkey.retromusic.glide.BlurTransformation -import code.name.monkey.retromusic.glide.RetroGlideExtension -import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions -import code.name.monkey.retromusic.helper.MusicPlayerRemote -import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper -import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper.Callback -import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler -import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.repository.RealRepository -import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.util.MusicUtil -import com.bumptech.glide.Glide -import com.google.android.material.slider.Slider -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext -import org.koin.android.ext.android.inject - - -/** - * Created by hemanths on 2020-02-02. - */ - -class DriveModeActivity : AbsMusicServiceActivity(), Callback { - - private lateinit var binding: ActivityDriveModeBinding - private var lastPlaybackControlsColor: Int = Color.GRAY - private var lastDisabledPlaybackControlsColor: Int = Color.GRAY - private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper - private val repository: RealRepository by inject() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - binding = ActivityDriveModeBinding.inflate(layoutInflater) - setContentView(binding.root) - setUpMusicControllers() - - progressViewUpdateHelper = MusicProgressViewUpdateHelper(this) - lastPlaybackControlsColor = accentColor() - binding.close.setOnClickListener { - onBackPressedDispatcher.onBackPressed() - } - binding.repeatButton.drawAboveSystemBars() - } - - private fun setUpMusicControllers() { - setUpPlayPauseFab() - setUpPrevNext() - setUpRepeatButton() - setUpShuffleButton() - setUpProgressSlider() - setupFavouriteToggle() - } - - private fun setupFavouriteToggle() { - binding.songFavourite.setOnClickListener { - toggleFavorite(MusicPlayerRemote.currentSong) - } - } - - private fun toggleFavorite(song: Song) { - lifecycleScope.launch(Dispatchers.IO) { - val playlist = repository.favoritePlaylist() - val songEntity = song.toSongEntity(playlist.playListId) - val isFavorite = repository.isSongFavorite(song.id) - if (isFavorite) { - repository.removeSongFromPlaylist(songEntity) - } else { - repository.insertSongs(listOf(song.toSongEntity(playlist.playListId))) - } - sendBroadcast(Intent(MusicService.FAVORITE_STATE_CHANGED)) - } - } - - private fun updateFavorite() { - lifecycleScope.launch(Dispatchers.IO) { - val isFavorite: Boolean = - repository.isSongFavorite(MusicPlayerRemote.currentSong.id) - withContext(Dispatchers.Main) { - binding.songFavourite.setImageResource(if (isFavorite) R.drawable.ic_favorite else R.drawable.ic_favorite_border) - } - } - } - - private fun setUpProgressSlider() { - binding.progressSlider.addOnChangeListener { _: Slider, progress: Float, fromUser: Boolean -> - if (fromUser) { - MusicPlayerRemote.seekTo(progress.toInt()) - onUpdateProgressViews( - MusicPlayerRemote.songProgressMillis, - MusicPlayerRemote.songDurationMillis - ) - } - } - } - - override fun onPause() { - super.onPause() - progressViewUpdateHelper.stop() - } - - override fun onResume() { - super.onResume() - progressViewUpdateHelper.start() - } - - private fun setUpPrevNext() { - binding.nextButton.setOnClickListener { MusicPlayerRemote.playNextSong() } - binding.previousButton.setOnClickListener { MusicPlayerRemote.back() } - } - - private fun setUpShuffleButton() { - binding.shuffleButton.setOnClickListener { MusicPlayerRemote.toggleShuffleMode() } - } - - private fun setUpRepeatButton() { - binding.repeatButton.setOnClickListener { MusicPlayerRemote.cycleRepeatMode() } - } - - private fun setUpPlayPauseFab() { - binding.playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler()) - } - - override fun onRepeatModeChanged() { - super.onRepeatModeChanged() - updateRepeatState() - } - - override fun onShuffleModeChanged() { - super.onShuffleModeChanged() - updateShuffleState() - } - - override fun onPlayStateChanged() { - super.onPlayStateChanged() - updatePlayPauseDrawableState() - } - - override fun onServiceConnected() { - super.onServiceConnected() - updatePlayPauseDrawableState() - updateSong() - updateRepeatState() - updateShuffleState() - updateFavorite() - } - - private fun updatePlayPauseDrawableState() { - if (MusicPlayerRemote.isPlaying) { - binding.playPauseButton.setImageResource(R.drawable.ic_pause) - } else { - binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow) - } - } - - fun updateShuffleState() { - when (MusicPlayerRemote.shuffleMode) { - MusicService.SHUFFLE_MODE_SHUFFLE -> binding.shuffleButton.setColorFilter( - lastPlaybackControlsColor, - PorterDuff.Mode.SRC_IN - ) - - else -> binding.shuffleButton.setColorFilter( - lastDisabledPlaybackControlsColor, - PorterDuff.Mode.SRC_IN - ) - } - } - - private fun updateRepeatState() { - when (MusicPlayerRemote.repeatMode) { - MusicService.REPEAT_MODE_NONE -> { - binding.repeatButton.setImageResource(R.drawable.ic_repeat) - binding.repeatButton.setColorFilter( - lastDisabledPlaybackControlsColor, - PorterDuff.Mode.SRC_IN - ) - } - - MusicService.REPEAT_MODE_ALL -> { - binding.repeatButton.setImageResource(R.drawable.ic_repeat) - binding.repeatButton.setColorFilter( - lastPlaybackControlsColor, - PorterDuff.Mode.SRC_IN - ) - } - - MusicService.REPEAT_MODE_THIS -> { - binding.repeatButton.setImageResource(R.drawable.ic_repeat_one) - binding.repeatButton.setColorFilter( - lastPlaybackControlsColor, - PorterDuff.Mode.SRC_IN - ) - } - } - } - - override fun onPlayingMetaChanged() { - super.onPlayingMetaChanged() - updateSong() - updateFavorite() - } - - override fun onFavoriteStateChanged() { - super.onFavoriteStateChanged() - updateFavorite() - } - - private fun updateSong() { - val song = MusicPlayerRemote.currentSong - - binding.songTitle.text = song.title - binding.songText.text = song.artistName - - Glide.with(this) - .load(RetroGlideExtension.getSongModel(song)) - .songCoverOptions(song) - .transform(BlurTransformation.Builder(this).build()) - .into(binding.image) - } - - override fun onUpdateProgressViews(progress: Int, total: Int) { - binding.progressSlider.run { - valueTo = total.toFloat() - value = progress.toFloat().coerceIn(valueFrom, valueTo) - } - - binding.songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong()) - binding.songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong()) - } -} diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/ErrorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/ErrorActivity.kt deleted file mode 100644 index 6823b80f8..000000000 --- a/app/src/main/java/code/name/monkey/retromusic/activities/ErrorActivity.kt +++ /dev/null @@ -1,80 +0,0 @@ -package code.name.monkey.retromusic.activities - -import android.os.Bundle -import android.widget.Button -import android.widget.ImageView -import androidx.appcompat.app.AppCompatActivity -import cat.ereza.customactivityoncrash.CustomActivityOnCrash -import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.util.FileUtils.createFile -import code.name.monkey.retromusic.util.Share.shareFile -import com.google.android.material.dialog.MaterialAlertDialogBuilder -import java.text.DateFormat -import java.text.SimpleDateFormat -import java.util.* - -class ErrorActivity : AppCompatActivity() { - private val dayFormat: DateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()) - private val reportPrefix = "bug_report-" - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(cat.ereza.customactivityoncrash.R.layout.customactivityoncrash_default_error_activity) - - val restartButton = - findViewById