Skip to content

S
soulfood
Commit 06f709c7 authored by charley.punshon's avatar charley.punshon
Browse files
Options

Half working build playlist feature.

parent e18aa589
Hide whitespace changes
Inline Side-by-side
Showing with 376 additions and 282 deletions
.idea/workspace.xml
View file @ 06f709c7
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
</shared> </shared>
</component> </component>
<component name="AndroidLogFilters"> <component name="AndroidLogFilters">
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="endmysuffering" />
<option name="TOOL_WINDOW_LOG_LEVEL" value="verbose" /> <option name="TOOL_WINDOW_LOG_LEVEL" value="verbose" />
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" /> <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
</component> </component>
...@@ -14,7 +13,7 @@ ...@@ -14,7 +13,7 @@
<last-search-timestamp>1558099117772</last-search-timestamp> <last-search-timestamp>1558099117772</last-search-timestamp>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="2e150a74-2388-4ba3-8805-625472c5af43" name="Default Changelist" comment="Song screen view with method added to Play button."> <list default="true" id="2e150a74-2388-4ba3-8805-625472c5af43" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/classAnalysis.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/classAnalysis.bin" afterDir="false" />
...@@ -23,10 +22,12 @@ ...@@ -23,10 +22,12 @@
<change beforePath="$PROJECT_DIR$/.gradle/4.10.1/taskHistory/taskHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/taskHistory/taskHistory.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/taskHistory/taskHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/taskHistory/taskHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationPage.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationPage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/playlistView.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/playlistView.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/app/out/" /> <ignored path="$PROJECT_DIR$/app/out/" />
...@@ -60,28 +61,28 @@ ...@@ -60,28 +61,28 @@
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
<counts> <counts>
<entry key="class" value="1" /> <entry key="class" value="1" />
<entry key="java" value="45" /> <entry key="java" value="55" />
<entry key="xml" value="27" /> <entry key="xml" value="29" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="CLASS" value="1" /> <entry key="CLASS" value="1" />
<entry key="JAVA" value="45" /> <entry key="JAVA" value="55" />
<entry key="XML" value="27" /> <entry key="XML" value="29" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.edit"> <usages-collector id="statistics.file.extensions.edit">
<counts> <counts>
<entry key="java" value="3228" /> <entry key="java" value="5497" />
<entry key="txt" value="550" /> <entry key="txt" value="596" />
<entry key="xml" value="192" /> <entry key="xml" value="192" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="JAVA" value="3228" /> <entry key="JAVA" value="5497" />
<entry key="PLAIN_TEXT" value="550" /> <entry key="PLAIN_TEXT" value="596" />
<entry key="XML" value="192" /> <entry key="XML" value="192" />
</counts> </counts>
</usages-collector> </usages-collector>
...@@ -90,44 +91,49 @@ ...@@ -90,44 +91,49 @@
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="279">
<caret line="116" column="34" selection-start-line="116" selection-start-column="34" selection-end-line="116" selection-end-column="34" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/databaseInterface.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="355"> <state relative-caret-position="1840">
<caret line="154" column="31" selection-start-line="154" selection-start-column="31" selection-end-line="154" selection-end-column="31" /> <caret line="141" column="61" selection-start-line="141" selection-start-column="29" selection-end-line="141" selection-end-column="61" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#701#709#0" expanded="true" />
<element signature="e#769#777#0" expanded="true" />
<element signature="e#839#847#0" expanded="true" />
<element signature="e#911#919#0" expanded="true" />
<element signature="e#982#990#0" expanded="true" />
<element signature="e#1053#1061#0" expanded="true" />
<element signature="e#1123#1131#0" expanded="true" />
<element signature="e#1195#1203#0" expanded="true" />
<element signature="e#1264#1272#0" expanded="true" />
<element signature="e#1333#1341#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view2.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/playlistView.java">
<provider editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor">
<provider selected="true" editor-type-id="android-designer2" /> <state relative-caret-position="179">
<caret line="84" column="45" lean-forward="true" selection-start-line="84" selection-start-column="45" selection-end-line="84" selection-end-column="45" />
</state>
</provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/AsyncronousTask.java">
<provider editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor">
<provider selected="true" editor-type-id="android-designer2" /> <state relative-caret-position="60">
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</state>
</provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="382"> <state relative-caret-position="-109">
<caret line="71" selection-start-line="71" selection-end-line="71" /> <caret line="45" column="44" selection-start-line="45" selection-start-column="44" selection-end-line="45" selection-end-column="44" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -136,62 +142,62 @@ ...@@ -136,62 +142,62 @@
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="233"> <state relative-caret-position="136">
<caret line="160" column="99" lean-forward="true" selection-start-line="160" selection-start-column="16" selection-end-line="160" selection-end-column="99" /> <caret line="147" column="22" selection-start-line="147" selection-start-column="12" selection-end-line="147" selection-end-column="22" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#701#709#0" expanded="true" />
<element signature="e#769#777#0" expanded="true" />
<element signature="e#839#847#0" expanded="true" />
<element signature="e#911#919#0" expanded="true" />
<element signature="e#982#990#0" expanded="true" />
<element signature="e#1053#1061#0" expanded="true" />
<element signature="e#1123#1131#0" expanded="true" />
<element signature="e#1195#1203#0" expanded="true" />
<element signature="e#1264#1272#0" expanded="true" />
<element signature="e#1333#1341#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationPage.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="318">
<caret line="35" column="91" selection-start-line="35" selection-start-column="91" selection-end-line="35" selection-end-column="91" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/BuildPlaylist.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90"> <state relative-caret-position="60">
<caret line="10" column="49" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="49" /> <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SpotifyClass.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_playlist_view.xml">
<provider selected="true" editor-type-id="text-editor"> <provider editor-type-id="text-editor">
<state relative-caret-position="-533"> <state relative-caret-position="285">
<caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" /> <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
</state> </state>
</provider> </provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_with_tag_view.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java">
<provider editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="735"> <state relative-caret-position="107">
<caret line="49" column="15" selection-start-line="49" selection-start-column="15" selection-end-line="49" selection-end-column="15" /> <caret line="133" column="4" selection-start-line="133" selection-start-column="4" selection-end-line="140" selection-end-column="5" />
</state> </state>
</provider> </provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_swt_view_screen.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists.java">
<provider editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165"> <state relative-caret-position="60">
<caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" /> <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
</state> </state>
</provider> </provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry> </entry>
</file> </file>
</leaf> </leaf>
...@@ -217,6 +223,8 @@ ...@@ -217,6 +223,8 @@
<find>MainActivity</find> <find>MainActivity</find>
<find>log.d</find> <find>log.d</find>
<find>soul</find> <find>soul</find>
<find>public ListView tagResults;</find>
<find>tagResults</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -243,20 +251,21 @@ ...@@ -243,20 +251,21 @@
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_with_tag_view.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_with_tag_view.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlists.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlists.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_playlist_view.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_playlist_view.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationScreen.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationScreen.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view2.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view2.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationPage.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationPage.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/playlistView.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -548,7 +557,14 @@ ...@@ -548,7 +557,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1558289946112</updated> <updated>1558289946112</updated>
</task> </task>
<option name="localTasksCounter" value="7" /> <task id="LOCAL-00007" summary="Song screen view with methods on both pause and play buttons.">
<created>1558290738536</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1558290738536</updated>
</task>
<option name="localTasksCounter" value="8" />
<servers /> <servers />
</component> </component>
<component name="TodoView"> <component name="TodoView">
...@@ -562,6 +578,7 @@ ...@@ -562,6 +578,7 @@
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="801" extended-state="6" /> <frame x="0" y="23" width="1440" height="801" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info id="Captures" order="0" side_tool="true" weight="0.25" /> <window_info id="Captures" order="0" side_tool="true" weight="0.25" />
<window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.17310444" /> <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.17310444" />
...@@ -573,13 +590,13 @@ ...@@ -573,13 +590,13 @@
<window_info id="Resources Explorer" order="7" /> <window_info id="Resources Explorer" order="7" />
<window_info id="Capture Tool" order="8" /> <window_info id="Capture Tool" order="8" />
<window_info anchor="bottom" id="Run" order="0" sideWeight="0.49959838" weight="0.32863188" /> <window_info anchor="bottom" id="Run" order="0" sideWeight="0.49959838" weight="0.32863188" />
<window_info anchor="bottom" id="Logcat" order="1" sideWeight="0.49959838" weight="0.34273624" /> <window_info active="true" anchor="bottom" id="Logcat" order="1" sideWeight="0.49959838" visible="true" weight="0.34273624" />
<window_info anchor="bottom" id="TODO" order="2" sideWeight="0.49959838" weight="0.32796487" /> <window_info anchor="bottom" id="TODO" order="2" sideWeight="0.49959838" weight="0.32796487" />
<window_info anchor="bottom" id="Debug" order="3" /> <window_info anchor="bottom" id="Debug" order="3" />
<window_info anchor="bottom" id="Terminal" order="4" weight="0.32722145" /> <window_info anchor="bottom" id="Terminal" order="4" weight="0.32722145" />
<window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.50067115" side_tool="true" weight="0.3133236" /> <window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.50067115" side_tool="true" weight="0.3133236" />
<window_info anchor="bottom" id="Version Control" order="6" sideWeight="0.49959838" weight="0.32796487" /> <window_info anchor="bottom" id="Version Control" order="6" sideWeight="0.49959838" weight="0.32796487" />
<window_info anchor="bottom" id="Build" order="7" sideWeight="0.49932885" visible="true" weight="0.31593794" /> <window_info anchor="bottom" id="Build" order="7" sideWeight="0.49932885" weight="0.31593794" />
<window_info anchor="bottom" id="Find" order="8" weight="0.32863188" /> <window_info anchor="bottom" id="Find" order="8" weight="0.32863188" />
<window_info anchor="bottom" id="Android Profiler" order="9" /> <window_info anchor="bottom" id="Android Profiler" order="9" />
<window_info anchor="right" id="Device File Explorer" order="0" side_tool="true" /> <window_info anchor="right" id="Device File Explorer" order="0" side_tool="true" />
...@@ -626,7 +643,8 @@ ...@@ -626,7 +643,8 @@
<MESSAGE value="Song screen view with button" /> <MESSAGE value="Song screen view with button" />
<MESSAGE value="Song screen view with Title, tags and button." /> <MESSAGE value="Song screen view with Title, tags and button." />
<MESSAGE value="Song screen view with method added to Play button." /> <MESSAGE value="Song screen view with method added to Play button." />
<option name="LAST_COMMIT_MESSAGE" value="Song screen view with method added to Play button." /> <MESSAGE value="Song screen view with methods on both pause and play buttons." />
<option name="LAST_COMMIT_MESSAGE" value="Song screen view with methods on both pause and play buttons." />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/IndividualPlaylist.java" /> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/IndividualPlaylist.java" />
...@@ -664,13 +682,6 @@ ...@@ -664,13 +682,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/AsyncronousTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/spotify-app-remote-release-0.6.1.aar/da12db46d5e106401f72308d15f848bc/jars/classes.jar!/com/spotify/android/appremote/internal/SdkRemoteClientConnector.class"> <entry file="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/spotify-app-remote-release-0.6.1.aar/da12db46d5e106401f72308d15f848bc/jars/classes.jar!/com/spotify/android/appremote/internal/SdkRemoteClientConnector.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380"> <state relative-caret-position="380">
...@@ -765,9 +776,6 @@ ...@@ -765,9 +776,6 @@
</provider> </provider>
<provider editor-type-id="android-designer2" /> <provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists.java">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_loading_screen.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_loading_screen.xml">
<provider editor-type-id="text-editor" /> <provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" /> <provider selected="true" editor-type-id="android-designer2" />
...@@ -780,9 +788,6 @@ ...@@ -780,9 +788,6 @@
<provider editor-type-id="text-editor" /> <provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" /> <provider selected="true" editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/playlistView.java">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/build_playlist.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/build_playlist.xml">
<provider editor-type-id="text-editor" /> <provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" /> <provider selected="true" editor-type-id="android-designer2" />
...@@ -795,105 +800,156 @@ ...@@ -795,105 +800,156 @@
</provider> </provider>
<provider editor-type-id="android-designer2" /> <provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationScreen.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="836"> <state relative-caret-position="150">
<caret line="78" selection-start-line="78" selection-end-line="78" /> <caret line="10" column="32" selection-start-line="10" selection-start-column="32" selection-end-line="10" selection-end-column="32" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_song_screen_view.xml">
<provider editor-type-id="text-editor" /> <provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" /> <provider selected="true" editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_playlist_view.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/homeScreen.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="295">
<caret line="70" column="4" selection-start-line="70" selection-start-column="4" selection-end-line="73" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SpotifyClass.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-533">
<caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="10" column="49" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_swt_view_screen.xml">
<provider editor-type-id="text-editor"> <provider editor-type-id="text-editor">
<state relative-caret-position="285"> <state relative-caret-position="165">
<caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" /> <caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
</state> </state>
</provider> </provider>
<provider selected="true" editor-type-id="android-designer2" /> <provider selected="true" editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_with_tag_view.xml">
<provider selected="true" editor-type-id="text-editor"> <provider editor-type-id="text-editor">
<state relative-caret-position="107"> <state relative-caret-position="735">
<caret line="133" column="4" selection-start-line="133" selection-start-column="4" selection-end-line="140" selection-end-column="5" /> <caret line="49" column="15" selection-start-line="49" selection-start-column="15" selection-end-line="49" selection-end-column="15" />
</state> </state>
</provider> </provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view2.xml">
<provider editor-type-id="text-editor" /> <provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" /> <provider selected="true" editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationScreen.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="233">
<caret line="10" column="32" selection-start-line="10" selection-start-column="32" selection-end-line="10" selection-end-column="32" /> <caret line="160" column="99" selection-start-line="160" selection-start-column="16" selection-end-line="160" selection-end-column="99" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_song_screen_view.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationPage.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="363">
<caret line="43" column="75" selection-start-line="43" selection-start-column="75" selection-end-line="43" selection-end-column="75" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml">
<provider editor-type-id="text-editor" /> <provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" /> <provider selected="true" editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/databaseInterface.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="44"> <state relative-caret-position="262">
<caret line="141" column="61" selection-start-line="141" selection-start-column="29" selection-end-line="141" selection-end-column="61" /> <caret line="39" column="13" selection-start-line="39" selection-start-column="13" selection-end-line="39" selection-end-column="13" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/BuildPlaylist.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/AsyncronousTask.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60"> <state relative-caret-position="60">
<caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" /> <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/databaseInterface.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306"> <state relative-caret-position="1840">
<caret line="34" column="4" selection-start-line="34" selection-start-column="4" selection-end-line="37" selection-end-column="5" /> <caret line="141" column="61" selection-start-line="141" selection-start-column="29" selection-end-line="141" selection-end-column="61" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/homeScreen.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="295"> <state relative-caret-position="107">
<caret line="70" column="4" selection-start-line="70" selection-start-column="4" selection-end-line="73" selection-end-column="5" /> <caret line="133" column="4" selection-start-line="133" selection-start-column="4" selection-end-line="140" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SpotifyClass.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-533"> <state relative-caret-position="60">
<caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" /> <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_playlist_view.xml">
<provider editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
</state>
</provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90"> <state relative-caret-position="-109">
<caret line="10" column="49" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="49" /> <caret line="45" column="44" selection-start-line="45" selection-start-column="44" selection-end-line="45" selection-end-column="44" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="355"> <state relative-caret-position="136">
<caret line="154" column="31" selection-start-line="154" selection-start-column="31" selection-end-line="154" selection-end-column="31" /> <caret line="147" column="22" selection-start-line="147" selection-start-column="12" selection-end-line="147" selection-end-column="22" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#701#709#0" expanded="true" /> <element signature="e#701#709#0" expanded="true" />
...@@ -910,54 +966,24 @@ ...@@ -910,54 +966,24 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/BuildPlaylist.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="382"> <state relative-caret-position="60">
<caret line="71" selection-start-line="71" selection-end-line="71" /> <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_swt_view_screen.xml">
<provider editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
</state>
</provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_with_tag_view.xml">
<provider editor-type-id="text-editor">
<state relative-caret-position="735">
<caret line="49" column="15" selection-start-line="49" selection-start-column="15" selection-end-line="49" selection-end-column="15" />
</state> </state>
</provider> </provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view2.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="233"> <state relative-caret-position="279">
<caret line="160" column="99" lean-forward="true" selection-start-line="160" selection-start-column="16" selection-end-line="160" selection-end-column="99" /> <caret line="116" column="34" selection-start-line="116" selection-start-column="34" selection-end-line="116" selection-end-column="34" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationPage.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/playlistView.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="318"> <state relative-caret-position="179">
<caret line="35" column="91" selection-start-line="35" selection-start-column="91" selection-end-line="35" selection-end-column="91" /> <caret line="84" column="45" lean-forward="true" selection-start-line="84" selection-start-column="45" selection-end-line="84" selection-end-column="45" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java
View file @ 06f709c7
...@@ -22,12 +22,18 @@ public class ThaiAsyncTask extends AsyncTask<Void, Void, ArrayAdapter<String>> ...@@ -22,12 +22,18 @@ public class ThaiAsyncTask extends AsyncTask<Void, Void, ArrayAdapter<String>>
public ArrayList<String> attributesSong7 = new ArrayList<>(); public ArrayList<String> attributesSong7 = new ArrayList<>();
public ArrayList<String> songNamesList = new ArrayList<>(); public ArrayList<String> songNamesList = new ArrayList<>();
public String[] songNames = new String[7]; public String[] songNames = new String[7];
public String test;
public ListView listView; public ListView listView;
public Context context; public Context context;
public databaseInterface.Cuisine cuisine;
public databaseInterface.Vibe vibe;
public databaseInterface.Time time;
public ThaiAsyncTask(Context context, databaseInterface.Cuisine cuisine, databaseInterface.Time time, databaseInterface.Vibe vibe) {
public ThaiAsyncTask(Context context) {
this.context = context; this.context = context;
this.cuisine = cuisine;
this.vibe = vibe;
this.time = time;
} }
...@@ -37,7 +43,7 @@ public class ThaiAsyncTask extends AsyncTask<Void, Void, ArrayAdapter<String>> ...@@ -37,7 +43,7 @@ public class ThaiAsyncTask extends AsyncTask<Void, Void, ArrayAdapter<String>>
try { try {
databaseInterface dbi = new databaseInterface(); databaseInterface dbi = new databaseInterface();
thaiResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.thai, databaseInterface.Vibe.any, databaseInterface.Time.any); thaiResults = dbi.getPlaylistByAttributes(cuisine, vibe, time);
for(int i = 0; i < thaiResults.size(); i++) { for(int i = 0; i < thaiResults.size(); i++) {
songNames[i] = dbi.getSongTitle(thaiResults.get(i)); songNames[i] = dbi.getSongTitle(thaiResults.get(i));
} }
......
app/src/main/java/com/example/soulfood_assignment2/build_playlist.java
View file @ 06f709c7
...@@ -3,37 +3,120 @@ package com.example.soulfood_assignment2; ...@@ -3,37 +3,120 @@ package com.example.soulfood_assignment2;
import android.content.Intent; import android.content.Intent;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.Spinner; import android.widget.Spinner;
import java.lang.reflect.Array;
import java.util.ArrayList;
import static com.example.soulfood_assignment2.databaseInterface.Cuisine.american;
import static com.example.soulfood_assignment2.databaseInterface.Cuisine.any;
import static com.example.soulfood_assignment2.databaseInterface.Cuisine.chinese;
import static com.example.soulfood_assignment2.databaseInterface.Cuisine.french;
import static com.example.soulfood_assignment2.databaseInterface.Cuisine.indian;
import static com.example.soulfood_assignment2.databaseInterface.Cuisine.italian;
import static com.example.soulfood_assignment2.databaseInterface.Cuisine.thai;
import static com.example.soulfood_assignment2.databaseInterface.Vibe.calming;
import static com.example.soulfood_assignment2.databaseInterface.Vibe.chill;
import static com.example.soulfood_assignment2.databaseInterface.Vibe.energetic;
public class build_playlist extends AppCompatActivity { public class build_playlist extends AppCompatActivity {
String vibe;
String cuisine;
String timeOfDay;
databaseInterface.Cuisine cuisineTag;
databaseInterface.Vibe vibeTag;
databaseInterface.Time timeTag;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.build_playlist); setContentView(R.layout.build_playlist);
String[] vibes = new String[] {"None", "Chilled", "Energetic", "Relaxing"}; ArrayList<String> vibes = new ArrayList<>();
vibes.add("any");
vibes.add("chilled");
vibes.add("energetic");
vibes.add("relaxing");
Spinner vibesSpinner = findViewById(R.id.vibe_dropdown); Spinner vibesSpinner = findViewById(R.id.vibe_dropdown);
ArrayAdapter<String> vibesAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_dropdown_item, vibes); ArrayAdapter<String> vibesAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_dropdown_item, vibes);
vibesSpinner.setAdapter(vibesAdapter); vibesSpinner.setAdapter(vibesAdapter);
String[] cuisines = new String[] {"None", "Chinese", "Thai", "Indian", "Italian", "American", "French", "Spanish"}; vibesSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> arg0, View arg1, int position, long arg3) {
vibe = vibes.get(position);
}
@Override
public void onNothingSelected(AdapterView<?> arg0) {
}
});
ArrayList<String> cuisines = new ArrayList<>();
cuisines.add("any");
cuisines.add("chinese");
cuisines.add("thai");
cuisines.add("indian");
cuisines.add("italian");
cuisines.add("american");
cuisines.add("french");
cuisines.add("spanish");
Spinner cuisineSpinner = findViewById(R.id.cuisine_dropdown); Spinner cuisineSpinner = findViewById(R.id.cuisine_dropdown);
ArrayAdapter<String> cuisineAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_dropdown_item, cuisines); ArrayAdapter<String> cuisineAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_dropdown_item, cuisines);
cuisineSpinner.setAdapter(cuisineAdapter); cuisineSpinner.setAdapter(cuisineAdapter);
String[] timeOfDay = new String[] {"None", "Breakfast", "Lunch", "Dinner"}; cuisineSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> arg0, View arg1, int position, long arg3) {
cuisine = cuisines.get(position);
}
@Override
public void onNothingSelected(AdapterView<?> arg0) {
}
});
ArrayList<String> timeOfDays = new ArrayList<>();
timeOfDays.add("any");
timeOfDays.add("breakfast");
timeOfDays.add("lunch");
timeOfDays.add("dinner");
Spinner timeOfDaySpinner = findViewById(R.id.tod_dropdown); Spinner timeOfDaySpinner = findViewById(R.id.tod_dropdown);
ArrayAdapter<String> timeOfDayAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_dropdown_item, timeOfDay); ArrayAdapter<String> timeOfDayAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_dropdown_item, timeOfDays);
timeOfDaySpinner.setAdapter(timeOfDayAdapter); timeOfDaySpinner.setAdapter(timeOfDayAdapter);
cuisineSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> arg0, View arg1, int position, long arg3) {
timeOfDay = timeOfDays.get(position);
}
@Override
public void onNothingSelected(AdapterView<?> arg0) {
}
});
} }
public void buildPlaylistOnClick(View view) { public void buildPlaylistOnClick(View view) {
Intent intent = new Intent(this, playlistView.class); Intent intent = new Intent(this, playlistView.class);
intent.putExtra("vibe", vibe);
Log.d("VibeBitch!", vibe);
intent.putExtra("cuisine", cuisine);
intent.putExtra("timeofday", timeOfDay);
startActivity(intent); startActivity(intent);
} }
......
app/src/main/java/com/example/soulfood_assignment2/playlistView.java
View file @ 06f709c7
...@@ -2,12 +2,93 @@ package com.example.soulfood_assignment2; ...@@ -2,12 +2,93 @@ package com.example.soulfood_assignment2;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
import android.widget.ListView;
import static com.example.soulfood_assignment2.databaseInterface.Cuisine.american;
import static com.example.soulfood_assignment2.databaseInterface.Cuisine.any;
import static com.example.soulfood_assignment2.databaseInterface.Cuisine.chinese;
import static com.example.soulfood_assignment2.databaseInterface.Cuisine.french;
import static com.example.soulfood_assignment2.databaseInterface.Cuisine.indian;
import static com.example.soulfood_assignment2.databaseInterface.Cuisine.italian;
import static com.example.soulfood_assignment2.databaseInterface.Cuisine.thai;
import static com.example.soulfood_assignment2.databaseInterface.Time.breakfast;
import static com.example.soulfood_assignment2.databaseInterface.Time.dinner;
import static com.example.soulfood_assignment2.databaseInterface.Time.lunch;
import static com.example.soulfood_assignment2.databaseInterface.Vibe.calming;
import static com.example.soulfood_assignment2.databaseInterface.Vibe.chill;
import static com.example.soulfood_assignment2.databaseInterface.Vibe.energetic;
public class playlistView extends AppCompatActivity { public class playlistView extends AppCompatActivity {
databaseInterface.Cuisine cuisineTag;
databaseInterface.Vibe vibeTag;
databaseInterface.Time timeTag;
ListView playlistView;
String cuisine;
String vibe;
String timeOfDay;
String anyVibe = "any";
String anyTime = "any";
String anyCuisine = "any";
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_playlist_view); setContentView(R.layout.activity_playlist_view);
cuisine = getIntent().getStringExtra("cuisine");
vibe = getIntent().getStringExtra("vibe");
timeOfDay = getIntent().getStringExtra("timeofday");
if(cuisine == null) {
cuisineTag = any;
} else if(cuisine.equalsIgnoreCase(anyCuisine)) {
cuisineTag = any;
} else if(cuisine.equalsIgnoreCase("chinese")) {
cuisineTag = chinese;
} else if(cuisine.equalsIgnoreCase("thai")) {
cuisineTag = thai;
} else if(cuisine.equalsIgnoreCase("indian")) {
cuisineTag = indian;
} else if(cuisine.equalsIgnoreCase("italian")) {
cuisineTag = italian;
} else if(cuisine.equalsIgnoreCase("american")) {
cuisineTag = american;
} else if(cuisine.equalsIgnoreCase("french")) {
cuisineTag = french;
}
if(vibe == null) {
vibeTag = databaseInterface.Vibe.any;
} else if(vibe.equalsIgnoreCase(anyVibe)) {
vibeTag = databaseInterface.Vibe.any;
} else if(vibe.equalsIgnoreCase("chilled")) {
vibeTag = chill;
} else if(vibe.equalsIgnoreCase("energetic")) {
vibeTag = energetic;
} else if(vibe.equalsIgnoreCase("relaxed")) {
vibeTag = calming;
}
if(timeOfDay == null) {
timeTag = databaseInterface.Time.any;
} else if(timeOfDay.equalsIgnoreCase(anyTime)) {
timeTag = databaseInterface.Time.any;
} else if(timeOfDay.equalsIgnoreCase("breakfast")) {
timeTag = breakfast;
} else if(timeOfDay.equalsIgnoreCase("lunch")) {
timeTag = lunch;
} else if(timeOfDay.equalsIgnoreCase("dinner")) {
timeTag = dinner;
}
ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(this, cuisineTag, timeTag, vibeTag);
thaiAsyncTask.listView = findViewById(R.id.playlistView);
thaiAsyncTask.execute();
playlistView = thaiAsyncTask.listView;
} }
} }
app/src/main/java/com/example/soulfood_assignment2/settings.java
View file @ 06f709c7
...@@ -29,10 +29,6 @@ public class settings extends AppCompatActivity { ...@@ -29,10 +29,6 @@ public class settings extends AppCompatActivity {
setContentView(R.layout.activity_settings); setContentView(R.layout.activity_settings);
initControls(); initControls();
Integer[] textSize = new Integer[] {18, 20, 24}; // get off Jade
Spinner eqSpinner = findViewById(R.id.eq_dropdown);
ArrayAdapter<Integer> spinnerAdapter = new ArrayAdapter<>(this, simple_spinner_dropdown_item, textSize);
eqSpinner.setAdapter(spinnerAdapter);
final MediaPlayer mp = MediaPlayer.create(this, R.raw.beepsoundeffect); final MediaPlayer mp = MediaPlayer.create(this, R.raw.beepsoundeffect);
Button revertToFactorySettings = findViewById(R.id.factorySettings); Button revertToFactorySettings = findViewById(R.id.factorySettings);
......
app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java
View file @ 06f709c7
...@@ -142,7 +142,7 @@ public class swtViewScreen extends AppCompatActivity { ...@@ -142,7 +142,7 @@ public class swtViewScreen extends AppCompatActivity {
}); });
} else if(tagNameView.getText().toString().equals("Songs with 'Thai' Tag")) { } else if(tagNameView.getText().toString().equals("Songs with 'Thai' Tag")) {
ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(swtViewScreen.this); ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(swtViewScreen.this, databaseInterface.Cuisine.thai, databaseInterface.Time.any, databaseInterface.Vibe.any);
thaiAsyncTask.listView = findViewById(R.id.charleyNeedsHelp); thaiAsyncTask.listView = findViewById(R.id.charleyNeedsHelp);
thaiAsyncTask.execute(); thaiAsyncTask.execute();
tagResults = thaiAsyncTask.listView; tagResults = thaiAsyncTask.listView;
......
app/src/main/res/layout/activity_settings.xml
View file @ 06f709c7
...@@ -12,99 +12,14 @@ ...@@ -12,99 +12,14 @@
android:layout_height="41dp" android:layout_height="41dp"
android:layout_marginStart="62dp" android:layout_marginStart="62dp"
android:layout_marginLeft="62dp" android:layout_marginLeft="62dp"
android:layout_marginTop="104dp"
android:layout_marginEnd="44dp" android:layout_marginEnd="44dp"
android:layout_marginRight="44dp" android:layout_marginRight="44dp"
android:layout_marginBottom="41dp" android:layout_marginBottom="50dp"
android:text="Test" android:text="Test"
android:textColor="#000000" android:textColor="#000000"
app:layout_constraintBottom_toTopOf="@+id/button" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/occasion_dropdown4" />
<Spinner
android:id="@+id/occasion_dropdown4"
android:layout_width="247dp"
android:layout_height="30dp"
android:layout_marginStart="59dp"
android:layout_marginLeft="59dp"
android:layout_marginTop="42dp"
android:layout_marginEnd="20dp"
android:layout_marginRight="20dp"
android:background="?android:attr/colorButtonNormal"
android:spinnerMode="dropdown"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/textView15"
app:layout_constraintTop_toBottomOf="@+id/textsizeDropdown" />
<TextView
android:id="@+id/textView15"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="28dp"
android:layout_marginLeft="28dp"
android:layout_marginTop="52dp"
android:text="Colour Blind"
android:textColor="#000000"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView14" />
<Spinner
android:id="@+id/textsizeDropdown"
android:layout_width="247dp"
android:layout_height="30dp"
android:layout_marginStart="58dp"
android:layout_marginLeft="58dp"
android:layout_marginTop="42dp"
android:layout_marginEnd="20dp"
android:layout_marginRight="20dp"
android:background="?android:attr/colorButtonNormal"
android:spinnerMode="dropdown"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/textView14"
app:layout_constraintTop_toBottomOf="@+id/eq_dropdown" />
<TextView
android:id="@+id/textView14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="29dp"
android:layout_marginLeft="29dp"
android:layout_marginTop="42dp"
android:text="Text Size"
android:textColor="#000000"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView13" />
<Spinner
android:id="@+id/eq_dropdown"
android:layout_width="247dp"
android:layout_height="30dp"
android:layout_marginStart="95dp"
android:layout_marginLeft="95dp"
android:layout_marginTop="36dp"
android:layout_marginEnd="20dp"
android:layout_marginRight="20dp"
android:background="?android:attr/colorButtonNormal"
android:spinnerMode="dropdown"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.95" app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toEndOf="@+id/textView13"
app:layout_constraintTop_toBottomOf="@+id/seekBar" />
<TextView
android:id="@+id/textView13"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginLeft="44dp"
android:layout_marginTop="48dp"
android:text="EQ"
android:textColor="#000000"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView12" />
<TextView <TextView
android:id="@+id/textView11" android:id="@+id/textView11"
...@@ -127,9 +42,11 @@ ...@@ -127,9 +42,11 @@
android:layout_height="25dp" android:layout_height="25dp"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginTop="16dp" android:layout_marginTop="80dp"
android:layout_marginEnd="22dp" android:layout_marginEnd="22dp"
android:layout_marginRight="22dp" android:layout_marginRight="22dp"
android:layout_marginBottom="478dp"
app:layout_constraintBottom_toTopOf="@+id/factorySettings"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/textView12" app:layout_constraintStart_toEndOf="@+id/textView12"
app:layout_constraintTop_toBottomOf="@+id/textView11" /> app:layout_constraintTop_toBottomOf="@+id/textView11" />
...@@ -140,30 +57,15 @@ ...@@ -140,30 +57,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="32dp" android:layout_marginStart="32dp"
android:layout_marginLeft="32dp" android:layout_marginLeft="32dp"
android:layout_marginTop="25dp" android:layout_marginTop="80dp"
android:layout_marginEnd="60dp" android:layout_marginEnd="60dp"
android:layout_marginRight="60dp" android:layout_marginRight="60dp"
android:layout_marginBottom="484dp"
android:text="Volume" android:text="Volume"
android:textColor="#000000" android:textColor="#000000"
app:layout_constraintBottom_toTopOf="@+id/factorySettings"
app:layout_constraintEnd_toStartOf="@+id/seekBar" app:layout_constraintEnd_toStartOf="@+id/seekBar"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView11" /> app:layout_constraintTop_toBottomOf="@+id/textView11" />
<Button
android:id="@+id/button"
android:layout_width="303dp"
android:layout_height="36dp"
android:layout_marginStart="62dp"
android:layout_marginLeft="62dp"
android:layout_marginTop="30dp"
android:layout_marginEnd="44dp"
android:layout_marginRight="44dp"
android:layout_marginBottom="200dp"
android:text="Apply"
android:textColor="#000000"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/factorySettings"
app:layout_constraintVertical_bias="1.0" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment