diff --git a/__tests__/App-test.tsx b/__tests__/App-test.tsx deleted file mode 100644 index 351e770..0000000 --- a/__tests__/App-test.tsx +++ /dev/null @@ -1,14 +0,0 @@ -/** - * @format - */ - -import 'react-native' -import React from 'react' -import App from '../App' - -// Note: test renderer must be required after react-native. -import renderer from 'react-test-renderer' - -it('renders correctly', () => { - renderer.create() -}) diff --git a/app/components/AlbumArt.tsx b/app/components/AlbumArt.tsx index f4ee673..5f69bc0 100644 --- a/app/components/AlbumArt.tsx +++ b/app/components/AlbumArt.tsx @@ -19,7 +19,7 @@ const AlbumArt: React.FC = ({ id, height, width }) => { const Placeholder = () => ( diff --git a/app/components/ArtistArt.tsx b/app/components/ArtistArt.tsx index 942b01b..9f0336c 100644 --- a/app/components/ArtistArt.tsx +++ b/app/components/ArtistArt.tsx @@ -131,7 +131,7 @@ const NoneUp: React.FC = ({ height, width }) => { return ( App) -TrackPlayer.registerPlaybackService(() => require('./app/service')) +TrackPlayer.registerPlaybackService(() => require('@app/service')) async function start() { await TrackPlayer.setupPlayer() @@ -28,12 +28,12 @@ async function start() { Capability.SkipToNext, Capability.SkipToPrevious, ], - playIcon: require('./res/notification/ic_stat_play.png'), - pauseIcon: require('./res/notification/ic_stat_pause.png'), - stopIcon: require('./res/notification/ic_stat_stop.png'), - nextIcon: require('./res/notification/ic_stat_next.png'), - previousIcon: require('./res/notification/ic_stat_previous.png'), - icon: require('./res/notification/ic_stat_play.png'), + playIcon: require('@res/icons/notification/ic_stat_play.png'), + pauseIcon: require('@res/icons/notification/ic_stat_pause.png'), + stopIcon: require('@res/icons/notification/ic_stat_stop.png'), + nextIcon: require('@res/icons/notification/ic_stat_next.png'), + previousIcon: require('@res/icons/notification/ic_stat_previous.png'), + icon: require('@res/icons/notification/ic_stat_play.png'), }) } start() diff --git a/ios/SubSonify.xcodeproj/project.pbxproj b/ios/SubSonify.xcodeproj/project.pbxproj index a3356e2..3beec8e 100644 --- a/ios/SubSonify.xcodeproj/project.pbxproj +++ b/ios/SubSonify.xcodeproj/project.pbxproj @@ -46,6 +46,24 @@ 82B69B2602364752AB31CC61 /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 436737B827214D6183FCA76D /* Octicons.ttf */; }; C4CC5DA88DF0438BA4D157CD /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A260BE9A793A4032B82A29DF /* SimpleLineIcons.ttf */; }; AB230364459D49B2A063B309 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 13D610D8ECEF4A5BAA028AA0 /* Zocial.ttf */; }; + 567FB00FF1F74A419B66ABBE /* Metropolis-Black.otf in Resources */ = {isa = PBXBuildFile; fileRef = 6141EAA1FB5C4842938BE0F6 /* Metropolis-Black.otf */; }; + 18AC15B1646F4E548B333602 /* Metropolis-BlackItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 1F0E9226A6D2436E8632D5E4 /* Metropolis-BlackItalic.otf */; }; + 4F3DBA74B7824BA8928F685C /* Metropolis-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 2EBF59CE26774A95AB369607 /* Metropolis-Bold.otf */; }; + 212A4D40242149F3854C9DEA /* Metropolis-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = D0829D0245894869A1A5E264 /* Metropolis-BoldItalic.otf */; }; + E4E70B6546264E3DABBD3600 /* Metropolis-ExtraBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9EDD15AF71364EFB94BB47C0 /* Metropolis-ExtraBold.otf */; }; + 0ACD2B2CAAB444D397696D62 /* Metropolis-ExtraBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 72133525A6A04E908A2011EC /* Metropolis-ExtraBoldItalic.otf */; }; + 0E869A498E3244909D1659C6 /* Metropolis-ExtraLight.otf in Resources */ = {isa = PBXBuildFile; fileRef = C4ACAD1537C443FE80356F7A /* Metropolis-ExtraLight.otf */; }; + 2B44C7CB64DE4A279E7ACC5A /* Metropolis-ExtraLightItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A761B540AF0040B0BFFD0132 /* Metropolis-ExtraLightItalic.otf */; }; + DE47C3EEE19A470DBDEAABA1 /* Metropolis-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = 62E15DA90FED405384B178B7 /* Metropolis-Light.otf */; }; + 0251B3F1B743461085E72ACA /* Metropolis-LightItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 980316CA7DC4471DA1DC0C25 /* Metropolis-LightItalic.otf */; }; + 16709163C28E4FCC8E342BC2 /* Metropolis-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 93115AEE1B094B06A921C202 /* Metropolis-Medium.otf */; }; + 4BE7406E65F344EFB094102B /* Metropolis-MediumItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 02A62F43E5AD4049B1D9CDD8 /* Metropolis-MediumItalic.otf */; }; + 01B810908231493FAD52B8FE /* Metropolis-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = AF73B5EC5C5F4D7DBC4C50BE /* Metropolis-Regular.otf */; }; + D9416BE548FE4C63B225BC90 /* Metropolis-RegularItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 5F17980A65F641DF903F9E92 /* Metropolis-RegularItalic.otf */; }; + 06C1D839F60844349268609D /* Metropolis-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 20165A152C2243539D7B1C04 /* Metropolis-SemiBold.otf */; }; + E32F701632154448AF483F48 /* Metropolis-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = C1CDCBBDA1094EDD81B0E157 /* Metropolis-SemiBoldItalic.otf */; }; + 0BB99FCB9B9A40C1B7345A22 /* Metropolis-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = 7D8CBC9BB3B246F7BB0801A2 /* Metropolis-Thin.otf */; }; + 09BE212270C1441486983DD0 /* Metropolis-ThinItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = BB1D35E9FF3A4687A3FB2FC5 /* Metropolis-ThinItalic.otf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -180,6 +198,24 @@ 436737B827214D6183FCA76D /* Octicons.ttf */ = {isa = PBXFileReference; name = "Octicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; A260BE9A793A4032B82A29DF /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; name = "SimpleLineIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; 13D610D8ECEF4A5BAA028AA0 /* Zocial.ttf */ = {isa = PBXFileReference; name = "Zocial.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 6141EAA1FB5C4842938BE0F6 /* Metropolis-Black.otf */ = {isa = PBXFileReference; name = "Metropolis-Black.otf"; path = "../res/fonts/Metropolis-Black.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 1F0E9226A6D2436E8632D5E4 /* Metropolis-BlackItalic.otf */ = {isa = PBXFileReference; name = "Metropolis-BlackItalic.otf"; path = "../res/fonts/Metropolis-BlackItalic.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 2EBF59CE26774A95AB369607 /* Metropolis-Bold.otf */ = {isa = PBXFileReference; name = "Metropolis-Bold.otf"; path = "../res/fonts/Metropolis-Bold.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + D0829D0245894869A1A5E264 /* Metropolis-BoldItalic.otf */ = {isa = PBXFileReference; name = "Metropolis-BoldItalic.otf"; path = "../res/fonts/Metropolis-BoldItalic.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 9EDD15AF71364EFB94BB47C0 /* Metropolis-ExtraBold.otf */ = {isa = PBXFileReference; name = "Metropolis-ExtraBold.otf"; path = "../res/fonts/Metropolis-ExtraBold.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 72133525A6A04E908A2011EC /* Metropolis-ExtraBoldItalic.otf */ = {isa = PBXFileReference; name = "Metropolis-ExtraBoldItalic.otf"; path = "../res/fonts/Metropolis-ExtraBoldItalic.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + C4ACAD1537C443FE80356F7A /* Metropolis-ExtraLight.otf */ = {isa = PBXFileReference; name = "Metropolis-ExtraLight.otf"; path = "../res/fonts/Metropolis-ExtraLight.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + A761B540AF0040B0BFFD0132 /* Metropolis-ExtraLightItalic.otf */ = {isa = PBXFileReference; name = "Metropolis-ExtraLightItalic.otf"; path = "../res/fonts/Metropolis-ExtraLightItalic.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 62E15DA90FED405384B178B7 /* Metropolis-Light.otf */ = {isa = PBXFileReference; name = "Metropolis-Light.otf"; path = "../res/fonts/Metropolis-Light.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 980316CA7DC4471DA1DC0C25 /* Metropolis-LightItalic.otf */ = {isa = PBXFileReference; name = "Metropolis-LightItalic.otf"; path = "../res/fonts/Metropolis-LightItalic.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 93115AEE1B094B06A921C202 /* Metropolis-Medium.otf */ = {isa = PBXFileReference; name = "Metropolis-Medium.otf"; path = "../res/fonts/Metropolis-Medium.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 02A62F43E5AD4049B1D9CDD8 /* Metropolis-MediumItalic.otf */ = {isa = PBXFileReference; name = "Metropolis-MediumItalic.otf"; path = "../res/fonts/Metropolis-MediumItalic.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + AF73B5EC5C5F4D7DBC4C50BE /* Metropolis-Regular.otf */ = {isa = PBXFileReference; name = "Metropolis-Regular.otf"; path = "../res/fonts/Metropolis-Regular.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 5F17980A65F641DF903F9E92 /* Metropolis-RegularItalic.otf */ = {isa = PBXFileReference; name = "Metropolis-RegularItalic.otf"; path = "../res/fonts/Metropolis-RegularItalic.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 20165A152C2243539D7B1C04 /* Metropolis-SemiBold.otf */ = {isa = PBXFileReference; name = "Metropolis-SemiBold.otf"; path = "../res/fonts/Metropolis-SemiBold.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + C1CDCBBDA1094EDD81B0E157 /* Metropolis-SemiBoldItalic.otf */ = {isa = PBXFileReference; name = "Metropolis-SemiBoldItalic.otf"; path = "../res/fonts/Metropolis-SemiBoldItalic.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 7D8CBC9BB3B246F7BB0801A2 /* Metropolis-Thin.otf */ = {isa = PBXFileReference; name = "Metropolis-Thin.otf"; path = "../res/fonts/Metropolis-Thin.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + BB1D35E9FF3A4687A3FB2FC5 /* Metropolis-ThinItalic.otf */ = {isa = PBXFileReference; name = "Metropolis-ThinItalic.otf"; path = "../res/fonts/Metropolis-ThinItalic.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -382,6 +418,24 @@ 436737B827214D6183FCA76D /* Octicons.ttf */, A260BE9A793A4032B82A29DF /* SimpleLineIcons.ttf */, 13D610D8ECEF4A5BAA028AA0 /* Zocial.ttf */, + 6141EAA1FB5C4842938BE0F6 /* Metropolis-Black.otf */, + 1F0E9226A6D2436E8632D5E4 /* Metropolis-BlackItalic.otf */, + 2EBF59CE26774A95AB369607 /* Metropolis-Bold.otf */, + D0829D0245894869A1A5E264 /* Metropolis-BoldItalic.otf */, + 9EDD15AF71364EFB94BB47C0 /* Metropolis-ExtraBold.otf */, + 72133525A6A04E908A2011EC /* Metropolis-ExtraBoldItalic.otf */, + C4ACAD1537C443FE80356F7A /* Metropolis-ExtraLight.otf */, + A761B540AF0040B0BFFD0132 /* Metropolis-ExtraLightItalic.otf */, + 62E15DA90FED405384B178B7 /* Metropolis-Light.otf */, + 980316CA7DC4471DA1DC0C25 /* Metropolis-LightItalic.otf */, + 93115AEE1B094B06A921C202 /* Metropolis-Medium.otf */, + 02A62F43E5AD4049B1D9CDD8 /* Metropolis-MediumItalic.otf */, + AF73B5EC5C5F4D7DBC4C50BE /* Metropolis-Regular.otf */, + 5F17980A65F641DF903F9E92 /* Metropolis-RegularItalic.otf */, + 20165A152C2243539D7B1C04 /* Metropolis-SemiBold.otf */, + C1CDCBBDA1094EDD81B0E157 /* Metropolis-SemiBoldItalic.otf */, + 7D8CBC9BB3B246F7BB0801A2 /* Metropolis-Thin.otf */, + BB1D35E9FF3A4687A3FB2FC5 /* Metropolis-ThinItalic.otf */, ); name = Resources; sourceTree = ""; @@ -587,6 +641,24 @@ 82B69B2602364752AB31CC61 /* Octicons.ttf in Resources */, C4CC5DA88DF0438BA4D157CD /* SimpleLineIcons.ttf in Resources */, AB230364459D49B2A063B309 /* Zocial.ttf in Resources */, + 567FB00FF1F74A419B66ABBE /* Metropolis-Black.otf in Resources */, + 18AC15B1646F4E548B333602 /* Metropolis-BlackItalic.otf in Resources */, + 4F3DBA74B7824BA8928F685C /* Metropolis-Bold.otf in Resources */, + 212A4D40242149F3854C9DEA /* Metropolis-BoldItalic.otf in Resources */, + E4E70B6546264E3DABBD3600 /* Metropolis-ExtraBold.otf in Resources */, + 0ACD2B2CAAB444D397696D62 /* Metropolis-ExtraBoldItalic.otf in Resources */, + 0E869A498E3244909D1659C6 /* Metropolis-ExtraLight.otf in Resources */, + 2B44C7CB64DE4A279E7ACC5A /* Metropolis-ExtraLightItalic.otf in Resources */, + DE47C3EEE19A470DBDEAABA1 /* Metropolis-Light.otf in Resources */, + 0251B3F1B743461085E72ACA /* Metropolis-LightItalic.otf in Resources */, + 16709163C28E4FCC8E342BC2 /* Metropolis-Medium.otf in Resources */, + 4BE7406E65F344EFB094102B /* Metropolis-MediumItalic.otf in Resources */, + 01B810908231493FAD52B8FE /* Metropolis-Regular.otf in Resources */, + D9416BE548FE4C63B225BC90 /* Metropolis-RegularItalic.otf in Resources */, + 06C1D839F60844349268609D /* Metropolis-SemiBold.otf in Resources */, + E32F701632154448AF483F48 /* Metropolis-SemiBoldItalic.otf in Resources */, + 0BB99FCB9B9A40C1B7345A22 /* Metropolis-Thin.otf in Resources */, + 09BE212270C1441486983DD0 /* Metropolis-ThinItalic.otf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/react-native.config.js b/react-native.config.js index be7d438..9005947 100644 --- a/react-native.config.js +++ b/react-native.config.js @@ -3,5 +3,5 @@ module.exports = { ios: {}, android: {}, }, - assets: ['./assets/fonts'], + assets: ['./res/fonts'], } diff --git a/assets/fonts/Metropolis-Black.otf b/res/fonts/Metropolis-Black.otf similarity index 100% rename from assets/fonts/Metropolis-Black.otf rename to res/fonts/Metropolis-Black.otf diff --git a/assets/fonts/Metropolis-BlackItalic.otf b/res/fonts/Metropolis-BlackItalic.otf similarity index 100% rename from assets/fonts/Metropolis-BlackItalic.otf rename to res/fonts/Metropolis-BlackItalic.otf diff --git a/assets/fonts/Metropolis-Bold.otf b/res/fonts/Metropolis-Bold.otf similarity index 100% rename from assets/fonts/Metropolis-Bold.otf rename to res/fonts/Metropolis-Bold.otf diff --git a/assets/fonts/Metropolis-BoldItalic.otf b/res/fonts/Metropolis-BoldItalic.otf similarity index 100% rename from assets/fonts/Metropolis-BoldItalic.otf rename to res/fonts/Metropolis-BoldItalic.otf diff --git a/assets/fonts/Metropolis-ExtraBold.otf b/res/fonts/Metropolis-ExtraBold.otf similarity index 100% rename from assets/fonts/Metropolis-ExtraBold.otf rename to res/fonts/Metropolis-ExtraBold.otf diff --git a/assets/fonts/Metropolis-ExtraBoldItalic.otf b/res/fonts/Metropolis-ExtraBoldItalic.otf similarity index 100% rename from assets/fonts/Metropolis-ExtraBoldItalic.otf rename to res/fonts/Metropolis-ExtraBoldItalic.otf diff --git a/assets/fonts/Metropolis-ExtraLight.otf b/res/fonts/Metropolis-ExtraLight.otf similarity index 100% rename from assets/fonts/Metropolis-ExtraLight.otf rename to res/fonts/Metropolis-ExtraLight.otf diff --git a/assets/fonts/Metropolis-ExtraLightItalic.otf b/res/fonts/Metropolis-ExtraLightItalic.otf similarity index 100% rename from assets/fonts/Metropolis-ExtraLightItalic.otf rename to res/fonts/Metropolis-ExtraLightItalic.otf diff --git a/assets/fonts/Metropolis-Light.otf b/res/fonts/Metropolis-Light.otf similarity index 100% rename from assets/fonts/Metropolis-Light.otf rename to res/fonts/Metropolis-Light.otf diff --git a/assets/fonts/Metropolis-LightItalic.otf b/res/fonts/Metropolis-LightItalic.otf similarity index 100% rename from assets/fonts/Metropolis-LightItalic.otf rename to res/fonts/Metropolis-LightItalic.otf diff --git a/assets/fonts/Metropolis-Medium.otf b/res/fonts/Metropolis-Medium.otf similarity index 100% rename from assets/fonts/Metropolis-Medium.otf rename to res/fonts/Metropolis-Medium.otf diff --git a/assets/fonts/Metropolis-MediumItalic.otf b/res/fonts/Metropolis-MediumItalic.otf similarity index 100% rename from assets/fonts/Metropolis-MediumItalic.otf rename to res/fonts/Metropolis-MediumItalic.otf diff --git a/assets/fonts/Metropolis-Regular.otf b/res/fonts/Metropolis-Regular.otf similarity index 100% rename from assets/fonts/Metropolis-Regular.otf rename to res/fonts/Metropolis-Regular.otf diff --git a/assets/fonts/Metropolis-RegularItalic.otf b/res/fonts/Metropolis-RegularItalic.otf similarity index 100% rename from assets/fonts/Metropolis-RegularItalic.otf rename to res/fonts/Metropolis-RegularItalic.otf diff --git a/assets/fonts/Metropolis-SemiBold.otf b/res/fonts/Metropolis-SemiBold.otf similarity index 100% rename from assets/fonts/Metropolis-SemiBold.otf rename to res/fonts/Metropolis-SemiBold.otf diff --git a/assets/fonts/Metropolis-SemiBoldItalic.otf b/res/fonts/Metropolis-SemiBoldItalic.otf similarity index 100% rename from assets/fonts/Metropolis-SemiBoldItalic.otf rename to res/fonts/Metropolis-SemiBoldItalic.otf diff --git a/assets/fonts/Metropolis-Thin.otf b/res/fonts/Metropolis-Thin.otf similarity index 100% rename from assets/fonts/Metropolis-Thin.otf rename to res/fonts/Metropolis-Thin.otf diff --git a/assets/fonts/Metropolis-ThinItalic.otf b/res/fonts/Metropolis-ThinItalic.otf similarity index 100% rename from assets/fonts/Metropolis-ThinItalic.otf rename to res/fonts/Metropolis-ThinItalic.otf diff --git a/res/arrow_left-fill.png b/res/icons/arrow_left-fill.png similarity index 100% rename from res/arrow_left-fill.png rename to res/icons/arrow_left-fill.png diff --git a/res/chevron_right-fill.png b/res/icons/chevron_right-fill.png similarity index 100% rename from res/chevron_right-fill.png rename to res/icons/chevron_right-fill.png diff --git a/res/chevron_right.png b/res/icons/chevron_right.png similarity index 100% rename from res/chevron_right.png rename to res/icons/chevron_right.png diff --git a/res/home-fill.png b/res/icons/home-fill.png similarity index 100% rename from res/home-fill.png rename to res/icons/home-fill.png diff --git a/res/home.png b/res/icons/home.png similarity index 100% rename from res/home.png rename to res/icons/home.png diff --git a/res/library-fill.png b/res/icons/library-fill.png similarity index 100% rename from res/library-fill.png rename to res/icons/library-fill.png diff --git a/res/library.png b/res/icons/library.png similarity index 100% rename from res/library.png rename to res/icons/library.png diff --git a/res/mic_on-fill.png b/res/icons/mic_on-fill.png similarity index 100% rename from res/mic_on-fill.png rename to res/icons/mic_on-fill.png diff --git a/res/mic_on.png b/res/icons/mic_on.png similarity index 100% rename from res/mic_on.png rename to res/icons/mic_on.png diff --git a/res/more_vertical.png b/res/icons/more_vertical.png similarity index 100% rename from res/more_vertical.png rename to res/icons/more_vertical.png diff --git a/res/music_notes-fill.png b/res/icons/music_notes-fill.png similarity index 100% rename from res/music_notes-fill.png rename to res/icons/music_notes-fill.png diff --git a/res/music_notes.png b/res/icons/music_notes.png similarity index 100% rename from res/music_notes.png rename to res/icons/music_notes.png diff --git a/res/next-fill.png b/res/icons/next-fill.png similarity index 100% rename from res/next-fill.png rename to res/icons/next-fill.png diff --git a/res/next.png b/res/icons/next.png similarity index 100% rename from res/next.png rename to res/icons/next.png diff --git a/res/notification/ic_stat_next.png b/res/icons/notification/ic_stat_next.png similarity index 100% rename from res/notification/ic_stat_next.png rename to res/icons/notification/ic_stat_next.png diff --git a/res/notification/ic_stat_next@1.5x.png b/res/icons/notification/ic_stat_next@1.5x.png similarity index 100% rename from res/notification/ic_stat_next@1.5x.png rename to res/icons/notification/ic_stat_next@1.5x.png diff --git a/res/notification/ic_stat_next@2x.png b/res/icons/notification/ic_stat_next@2x.png similarity index 100% rename from res/notification/ic_stat_next@2x.png rename to res/icons/notification/ic_stat_next@2x.png diff --git a/res/notification/ic_stat_next@3x.png b/res/icons/notification/ic_stat_next@3x.png similarity index 100% rename from res/notification/ic_stat_next@3x.png rename to res/icons/notification/ic_stat_next@3x.png diff --git a/res/notification/ic_stat_next@4x.png b/res/icons/notification/ic_stat_next@4x.png similarity index 100% rename from res/notification/ic_stat_next@4x.png rename to res/icons/notification/ic_stat_next@4x.png diff --git a/res/notification/ic_stat_pause.png b/res/icons/notification/ic_stat_pause.png similarity index 100% rename from res/notification/ic_stat_pause.png rename to res/icons/notification/ic_stat_pause.png diff --git a/res/notification/ic_stat_pause@1.5x.png b/res/icons/notification/ic_stat_pause@1.5x.png similarity index 100% rename from res/notification/ic_stat_pause@1.5x.png rename to res/icons/notification/ic_stat_pause@1.5x.png diff --git a/res/notification/ic_stat_pause@2x.png b/res/icons/notification/ic_stat_pause@2x.png similarity index 100% rename from res/notification/ic_stat_pause@2x.png rename to res/icons/notification/ic_stat_pause@2x.png diff --git a/res/notification/ic_stat_pause@3x.png b/res/icons/notification/ic_stat_pause@3x.png similarity index 100% rename from res/notification/ic_stat_pause@3x.png rename to res/icons/notification/ic_stat_pause@3x.png diff --git a/res/notification/ic_stat_pause@4x.png b/res/icons/notification/ic_stat_pause@4x.png similarity index 100% rename from res/notification/ic_stat_pause@4x.png rename to res/icons/notification/ic_stat_pause@4x.png diff --git a/res/notification/ic_stat_play.png b/res/icons/notification/ic_stat_play.png similarity index 100% rename from res/notification/ic_stat_play.png rename to res/icons/notification/ic_stat_play.png diff --git a/res/notification/ic_stat_play@1.5x.png b/res/icons/notification/ic_stat_play@1.5x.png similarity index 100% rename from res/notification/ic_stat_play@1.5x.png rename to res/icons/notification/ic_stat_play@1.5x.png diff --git a/res/notification/ic_stat_play@2x.png b/res/icons/notification/ic_stat_play@2x.png similarity index 100% rename from res/notification/ic_stat_play@2x.png rename to res/icons/notification/ic_stat_play@2x.png diff --git a/res/notification/ic_stat_play@3x.png b/res/icons/notification/ic_stat_play@3x.png similarity index 100% rename from res/notification/ic_stat_play@3x.png rename to res/icons/notification/ic_stat_play@3x.png diff --git a/res/notification/ic_stat_play@4x.png b/res/icons/notification/ic_stat_play@4x.png similarity index 100% rename from res/notification/ic_stat_play@4x.png rename to res/icons/notification/ic_stat_play@4x.png diff --git a/res/notification/ic_stat_previous.png b/res/icons/notification/ic_stat_previous.png similarity index 100% rename from res/notification/ic_stat_previous.png rename to res/icons/notification/ic_stat_previous.png diff --git a/res/notification/ic_stat_previous@1.5x.png b/res/icons/notification/ic_stat_previous@1.5x.png similarity index 100% rename from res/notification/ic_stat_previous@1.5x.png rename to res/icons/notification/ic_stat_previous@1.5x.png diff --git a/res/notification/ic_stat_previous@2x.png b/res/icons/notification/ic_stat_previous@2x.png similarity index 100% rename from res/notification/ic_stat_previous@2x.png rename to res/icons/notification/ic_stat_previous@2x.png diff --git a/res/notification/ic_stat_previous@3x.png b/res/icons/notification/ic_stat_previous@3x.png similarity index 100% rename from res/notification/ic_stat_previous@3x.png rename to res/icons/notification/ic_stat_previous@3x.png diff --git a/res/notification/ic_stat_previous@4x.png b/res/icons/notification/ic_stat_previous@4x.png similarity index 100% rename from res/notification/ic_stat_previous@4x.png rename to res/icons/notification/ic_stat_previous@4x.png diff --git a/res/notification/ic_stat_stop.png b/res/icons/notification/ic_stat_stop.png similarity index 100% rename from res/notification/ic_stat_stop.png rename to res/icons/notification/ic_stat_stop.png diff --git a/res/notification/ic_stat_stop@1.5x.png b/res/icons/notification/ic_stat_stop@1.5x.png similarity index 100% rename from res/notification/ic_stat_stop@1.5x.png rename to res/icons/notification/ic_stat_stop@1.5x.png diff --git a/res/notification/ic_stat_stop@2x.png b/res/icons/notification/ic_stat_stop@2x.png similarity index 100% rename from res/notification/ic_stat_stop@2x.png rename to res/icons/notification/ic_stat_stop@2x.png diff --git a/res/notification/ic_stat_stop@3x.png b/res/icons/notification/ic_stat_stop@3x.png similarity index 100% rename from res/notification/ic_stat_stop@3x.png rename to res/icons/notification/ic_stat_stop@3x.png diff --git a/res/notification/ic_stat_stop@4x.png b/res/icons/notification/ic_stat_stop@4x.png similarity index 100% rename from res/notification/ic_stat_stop@4x.png rename to res/icons/notification/ic_stat_stop@4x.png diff --git a/res/pause-fill.png b/res/icons/pause-fill.png similarity index 100% rename from res/pause-fill.png rename to res/icons/pause-fill.png diff --git a/res/pause_circle-fill.png b/res/icons/pause_circle-fill.png similarity index 100% rename from res/pause_circle-fill.png rename to res/icons/pause_circle-fill.png diff --git a/res/play-fill.png b/res/icons/play-fill.png similarity index 100% rename from res/play-fill.png rename to res/icons/play-fill.png diff --git a/res/play_circle-fill.png b/res/icons/play_circle-fill.png similarity index 100% rename from res/play_circle-fill.png rename to res/icons/play_circle-fill.png diff --git a/res/previous-fill.png b/res/icons/previous-fill.png similarity index 100% rename from res/previous-fill.png rename to res/icons/previous-fill.png diff --git a/res/record-l.png b/res/icons/record-l.png similarity index 100% rename from res/record-l.png rename to res/icons/record-l.png diff --git a/res/record-m.png b/res/icons/record-m.png similarity index 100% rename from res/record-m.png rename to res/icons/record-m.png diff --git a/res/record.png b/res/icons/record.png similarity index 100% rename from res/record.png rename to res/icons/record.png diff --git a/res/search-fill.png b/res/icons/search-fill.png similarity index 100% rename from res/search-fill.png rename to res/icons/search-fill.png diff --git a/res/search.png b/res/icons/search.png similarity index 100% rename from res/search.png rename to res/icons/search.png diff --git a/res/settings-fill.png b/res/icons/settings-fill.png similarity index 100% rename from res/settings-fill.png rename to res/icons/settings-fill.png diff --git a/res/settings.png b/res/icons/settings.png similarity index 100% rename from res/settings.png rename to res/icons/settings.png diff --git a/res/star-fill.png b/res/icons/star-fill.png similarity index 100% rename from res/star-fill.png rename to res/icons/star-fill.png diff --git a/res/star.png b/res/icons/star.png similarity index 100% rename from res/star.png rename to res/icons/star.png diff --git a/res/stop-fill.png b/res/icons/stop-fill.png similarity index 100% rename from res/stop-fill.png rename to res/icons/stop-fill.png