Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
Metro/app
History
Muntashir Al-Islam 2dea5c31ca Merge branch 'dev' of https://github.com/h4h13/RetroMusicPlayer into dev 
 Conflicts:
	app/src/main/java/io/github/muntashirakon/music/Constants.kt
	app/src/main/java/io/github/muntashirakon/music/adapter/GenreAdapter.kt
	app/src/main/java/io/github/muntashirakon/music/adapter/HomeAdapter.kt
	app/src/main/java/io/github/muntashirakon/music/adapter/SearchAdapter.kt
	app/src/main/java/io/github/muntashirakon/music/fragments/LibraryViewModel.kt
	app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsPlayerFragment.kt
	app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsRecyclerViewFragment.kt
	app/src/main/java/io/github/muntashirakon/music/fragments/genres/GenreDetailsFragment.kt
	app/src/main/java/io/github/muntashirakon/music/fragments/genres/GenresFragment.kt
	app/src/main/java/io/github/muntashirakon/music/fragments/home/HomeFragment.kt
	app/src/main/java/io/github/muntashirakon/music/fragments/search/SearchFragment.kt
	app/src/main/java/io/github/muntashirakon/music/interfaces/IGenreClickListener.kt
	app/src/main/java/io/github/muntashirakon/music/interfaces/IHomeClickListener.kt
	app/src/main/java/io/github/muntashirakon/music/preferences/AlbumCoverStylePreferenceDialog.kt
	app/src/main/java/io/github/muntashirakon/music/preferences/NowPlayingScreenPreferenceDialog.kt
	app/src/main/java/io/github/muntashirakon/music/service/notification/PlayingNotificationImpl.kt
	app/src/main/java/io/github/muntashirakon/music/util/MusicUtil.kt
	app/src/main/java/io/github/muntashirakon/music/util/PreferenceUtil.kt
	app/src/main/res/layout/activity_donation.xml
	app/src/main/res/layout/activity_pro_version.xml
	app/src/main/res/layout/card_other.xml
	app/src/main/res/layout/fragment_settings.xml
	app/src/main/res/layout/fragment_synced.xml
	app/src/main/res/layout/image.xml
	app/src/main/res/transition/change_bounds.xml
	appthemehelper/src/main/res/layout/ate_preference_custom.xml
2020-11-07 07:34:17 +06:00
..
src Merge branch 'dev' of https://github.com/h4h13/RetroMusicPlayer into dev 2020-11-07 07:34:17 +06:00
build.gradle Prepare for 4.0.010 2020-10-16 02:14:54 +06:00
proguard-rules.pro Fix package names after a merge 2020-10-16 00:14:02 +06:00