Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'retro/dev' into dev

Browse source 
# Conflicts:
#	.github/ISSUE_TEMPLATE/bug_report.md
#	README.md
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/code/name/monkey/retromusic/App.kt
#	app/src/main/java/code/name/monkey/retromusic/Constants.kt
#	app/src/main/java/code/name/monkey/retromusic/activities/LyricsActivity.kt
#	app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt
#	app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt
#	app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt
#	app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt
#	app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt
#	app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt
#	app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.java
#	app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt
#	app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt
#	app/src/main/java/code/name/monkey/retromusic/extensions/DrawableExtensions.kt
#	app/src/main/java/code/name/monkey/retromusic/fragments/DetailListFragment.kt
#	app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsFragment.kt
#	app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt
#	app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.java
#	app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt
#	app/src/main/java/code/name/monkey/retromusic/fragments/library/LibraryFragment.kt
#	app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt
#	app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt
#	app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt
#	app/src/main/java/code/name/monkey/retromusic/model/Artist.kt
#	app/src/main/java/code/name/monkey/retromusic/model/Song.kt
#	app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt
#	app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt
#	app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt
#	app/src/main/java/code/name/monkey/retromusic/repository/AlbumRepository.kt
#	app/src/main/java/code/name/monkey/retromusic/service/MusicService.java
#	app/src/main/java/code/name/monkey/retromusic/util/AppRater.kt
#	app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java
#	app/src/main/java/code/name/monkey/retromusic/util/PremiumShow.kt
#	app/src/main/java/code/name/monkey/retromusic/util/RingtoneManager.kt
#	app/src/main/java/code/name/monkey/retromusic/util/SAFUtil.java
#	app/src/main/res/layout-sw600dp/item_list_no_image.xml
#	app/src/main/res/layout/activity_donation.xml
#	app/src/main/res/layout/activity_pro_version.xml
#	app/src/main/res/layout/fragment_blur.xml
#	app/src/main/res/layout/fragment_classic_player.xml
#	app/src/main/res/layout/fragment_color_player.xml
#	app/src/main/res/layout/fragment_fit.xml
#	app/src/main/res/layout/fragment_flat_player.xml
#	app/src/main/res/layout/fragment_full.xml
#	app/src/main/res/layout/fragment_gradient_player.xml
#	app/src/main/res/layout/fragment_home_player.xml
#	app/src/main/res/layout/fragment_peak_player.xml
#	app/src/main/res/layout/fragment_plain_player.xml
#	app/src/main/res/layout/fragment_simple_player.xml
#	app/src/main/res/layout/fragment_tiny_player.xml
#	app/src/main/res/layout/item_storage.xml
#	app/src/main/res/layout/sliding_music_panel_layout.xml
#	app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
#	app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
#	app/src/main/res/values-fa-rIR/strings.xml
This commit is contained in:
JFronny 2022-05-14 14:28:31 +02:00
commit 4df292bddf
No known key found for this signature in database
GPG key ID: E76429612C2929F4
925 changed files with 37703 additions and 63683 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/bug_report.md vendored
View file

@ -13,7 +13,7 @@ assignees: ''
[ ] Yes
-->
**Have you read the [FAQ](https://www.github.com/h4h13/RetroMusicPlayer/tree/dev/FAQ.md)?**
**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.**

34
.github/workflows/android.yml vendored Normal file
View file

@ -0,0 +1,34 @@
name: Android CI
on:
push:
branches: [ dev ]
pull_request:
branches: [ dev ]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: set up JDK 11
uses: actions/setup-java@v2
with:
java-version: '11'
distribution: 'temurin'
cache: gradle
- name: Generate temporary keystore
run: keytool -genkey -v -storetype pkcs12 -keystore store.p12 -storepass android -alias android -keyalg RSA -keysize 2048 -validity 10000 -dname CN=CI
- name: Write retro.properties
run: |
cat >retro.properties <<EOF
storeFile=$PWD/store.p12
keyAlias=android
storePassword=android
keyPassword=android
EOF
- name: Build with Gradle
run: ./gradlew build