Skip to content

S
soulfood
Commit 1bd3a808 authored by jade.woodward's avatar jade.woodward
Browse files
Options

Merge branch 'master' of https://git.yorkdc.net:8888/charley.punshon/soulfood

parents e52ed63a 93c291f6
Hide whitespace changes
Inline Side-by-side
Showing with 370 additions and 742 deletions
.idea/workspace.xml
View file @ 1bd3a808
......@@ -14,6 +14,10 @@
</component>
<component name="ChangeListManager">
<list default="true" id="2e150a74-2388-4ba3-8805-625472c5af43" name="Default Changelist" comment="As good as working build">
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylistView.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlist_view.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlists.xml" 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/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/classAnalysis.bin" afterDir="false" />
......@@ -21,12 +25,18 @@
<change beforePath="$PROJECT_DIR$/.gradle/4.10.1/taskHistory/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/taskHistory/taskHistory.bin" 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$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" 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/SavedPlaylists.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists2.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/Listener.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/Listener.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/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/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/homeScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/homeScreen.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.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/res/layout/activity_saved_playlists.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.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>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/app/out/" />
......@@ -53,34 +63,36 @@
<session id="1618975579">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="1" />
<entry key="project.open.time.1" value="1" />
<entry key="project.opened" value="1" />
<entry key="project.open.time.2" value="1" />
<entry key="project.opened" value="2" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="class" value="1" />
<entry key="java" value="57" />
<entry key="xml" value="33" />
<entry key="java" value="89" />
<entry key="xml" value="41" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CLASS" value="1" />
<entry key="JAVA" value="57" />
<entry key="XML" value="33" />
<entry key="JAVA" value="89" />
<entry key="XML" value="41" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="java" value="5599" />
<entry key="java" value="5803" />
<entry key="txt" value="661" />
<entry key="xml" value="193" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="JAVA" value="5599" />
<entry key="JAVA" value="5803" />
<entry key="PLAIN_TEXT" value="661" />
<entry key="XML" value="193" />
</counts>
......@@ -89,35 +101,31 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<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/playlistView.java">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="691">
<caret line="92" column="46" selection-start-line="92" selection-start-column="46" selection-end-line="92" selection-end-column="46" />
<state relative-caret-position="386">
<caret line="78" column="5" selection-start-line="78" selection-start-column="5" selection-end-line="78" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1130#1270#0" expanded="true" />
<element signature="e#1269#1270#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlists2.xml">
<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>
</file>
<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/homeScreen.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="139">
<caret line="56" selection-start-line="56" selection-end-line="56" />
<state relative-caret-position="261">
<caret line="75" column="4" selection-start-line="75" selection-start-column="4" selection-end-line="78" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......@@ -126,72 +134,69 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists2.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="180">
<caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
<state relative-caret-position="402">
<caret line="115" column="38" selection-start-line="115" selection-start-column="38" selection-end-line="115" selection-end-column="38" />
</state>
</provider>
</entry>
</file>
<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/playlistView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="114">
<caret line="45" selection-start-line="45" selection-end-line="45" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="211">
<caret line="81" column="45" lean-forward="true" selection-start-line="81" selection-start-column="45" selection-end-line="81" selection-end-column="45" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/build_playlist.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-71">
<caret line="9" column="30" selection-start-line="9" selection-start-column="30" selection-end-line="9" selection-end-column="30" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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" />
<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="-91">
<caret line="10" column="49" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="49" />
</state>
</provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java">
<file pinned="false" current-in-tab="false">
<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="129">
<caret line="173" column="100" selection-start-line="173" selection-start-column="100" selection-end-line="173" selection-end-column="100" />
<state relative-caret-position="-31">
<caret line="22" column="7" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChineseAsyncTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="13" selection-start-line="13" selection-end-line="13" />
<folding>
<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>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-179">
<caret line="24" selection-start-line="24" selection-end-line="24" />
</state>
</provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry>
</file>
</leaf>
......@@ -234,7 +239,6 @@
<option value="$PROJECT_DIR$/build.gradle" />
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/app/build.gradle" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/homeScreen.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChineseAsyncImpl.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/AsyncTask.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChineseAsyncTask.java" />
......@@ -243,25 +247,29 @@
<option value="$PROJECT_DIR$/app/src/main/res/layout/build_playlist.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_swt_view_screen.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/java/com/example/soulfood_assignment2/MainActivity.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/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/res/layout/activity_song_screen_view2.xml" />
<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/build_playlist.java" />
<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/playlistView.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/SavedPlaylists.java" />
<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/SavedPlaylists2.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/Listener.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlist_view.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylistView.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/homeScreen.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/searchScreen.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.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/settings.java" />
</list>
</option>
</component>
......@@ -275,9 +283,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane" />
<pane id="AndroidView" />
<pane id="PackagesPane" />
<pane id="Scope">
<subPane subId="Scope 'Project Files'; set:Project Files; class com.intellij.psi.search.scope.ProjectFilesScope">
<expand>
......@@ -393,6 +398,9 @@
<select />
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="ProjectPane" />
<pane id="AndroidView" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -420,8 +428,8 @@
<recent name="com.example.soulfood_assignment2" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/app/src/main/res/layout" />
<recent name="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2" />
<recent name="$PROJECT_DIR$/app/src/main/res/layout" />
</key>
<key name="android.template.parentActivityClass">
<recent name="" />
......@@ -580,8 +588,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="801" extended-state="6" />
<editor active="true" />
<frame x="0" y="23" width="1440" height="801" extended-state="0" />
<layout>
<window_info id="Captures" order="0" side_tool="true" weight="0.25" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.17310444" />
......@@ -593,12 +600,12 @@
<window_info id="Resources Explorer" order="7" />
<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="Logcat" order="1" sideWeight="0.49959838" weight="0.34273624" />
<window_info 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="Debug" order="3" />
<window_info anchor="bottom" id="Terminal" order="4" visible="true" 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="Version Control" order="6" sideWeight="0.49959838" weight="0.32796487" />
<window_info anchor="bottom" id="Version Control" order="6" sideWeight="0.49959838" weight="0.32722145" />
<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="Android Profiler" order="9" />
......@@ -651,10 +658,6 @@
<option name="LAST_COMMIT_MESSAGE" value="Half working build playlist feature." />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_individual_playlist.xml" />
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_individual_playlist.xml" />
<entry file="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/spotify-app-remote-release-0.6.1.aar/c6916b27e6bb07c1ecebea46c4dc5fc0/jars/classes.jar!/com/spotify/android/appremote/internal/RemoteServiceIo.class" />
<entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-28/java/lang/Thread.java" />
<entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-28/java/util/concurrent/ThreadPoolExecutor.java" />
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
......@@ -692,13 +695,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChineseAsyncImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChineseAsyncImpl.java" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/FrenchAsyncTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
......@@ -706,16 +703,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/AsyncTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" column="18" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/AsyncTask.java" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/HappyAsyncTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
......@@ -723,16 +711,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChineseAsyncTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="19" column="1" selection-start-line="19" selection-start-column="1" selection-end-line="19" selection-end-column="1" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChillAsyncTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
......@@ -783,213 +761,222 @@
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_home_screen.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view.xml" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationScreen.java" />
<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/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/res/layout/activity_main.xml">
<provider editor-type-id="text-editor" />
<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>
</provider>
<provider selected="true" editor-type-id="android-designer2" />
</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 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">
<state relative-caret-position="150">
<caret line="10" column="32" selection-start-line="10" selection-start-column="32" selection-end-line="10" selection-end-column="32" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_song_screen_view.xml">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.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/homeScreen.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/databaseInterface.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" />
<state relative-caret-position="1840">
<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>
</provider>
</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/BuildPlaylist.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 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" />
</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" />
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/build_playlist.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</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">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_playlist_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 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/res/layout/activity_song_screen_view2.xml">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_home_screen.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/SongInformationPage.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/Listener.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 relative-caret-position="165">
<caret line="14" column="63" selection-start-line="14" selection-start-column="63" selection-end-line="14" selection-end-column="63" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlist_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/settings.java">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlists2.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/SavedPlaylistView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="262">
<caret line="39" column="13" selection-start-line="39" selection-start-column="13" selection-end-line="39" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="60">
<caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/AsyncronousTask.java">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlists.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="15" column="31" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists.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" />
<caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/databaseInterface.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists2.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1840">
<caret line="141" column="61" selection-start-line="141" selection-start-column="29" selection-end-line="141" selection-end-column="61" />
<state relative-caret-position="180">
<caret line="13" selection-start-line="13" selection-end-line="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1399">
<caret line="45" selection-start-line="45" selection-end-line="45" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java">
<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="107">
<caret line="133" column="4" selection-start-line="133" selection-start-column="4" selection-end-line="140" selection-end-column="5" />
<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://$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/ThaiAsyncTask.java">
<provider selected="true" editor-type-id="text-editor">
<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" />
<state relative-caret-position="166">
<caret line="23" column="45" selection-start-line="23" selection-start-column="45" selection-end-line="23" selection-end-column="45" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</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/ChineseAsyncTask.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 relative-caret-position="195">
<caret line="13" selection-start-line="13" selection-end-line="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<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" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-179">
<caret line="24" selection-start-line="24" selection-end-line="24" />
</state>
</provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/build_playlist.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</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" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-71">
<caret line="9" column="30" selection-start-line="9" selection-start-column="30" selection-end-line="9" 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/MainActivity.java">
<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="114">
<caret line="45" selection-start-line="45" selection-end-line="45" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="-91">
<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/java/com/example/soulfood_assignment2/ThaiAsyncTask.java">
<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="139">
<caret line="56" selection-start-line="56" selection-end-line="56" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="-31">
<caret line="22" column="7" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlists.xml">
<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="225">
<caret line="15" column="31" lean-forward="true" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
<state relative-caret-position="402">
<caret line="115" column="38" selection-start-line="115" selection-start-column="38" selection-end-line="115" selection-end-column="38" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/playlistView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="691">
<caret line="92" column="46" selection-start-line="92" selection-start-column="46" selection-end-line="92" selection-end-column="46" />
<state relative-caret-position="211">
<caret line="81" column="45" lean-forward="true" selection-start-line="81" selection-start-column="45" selection-end-line="81" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlists2.xml">
<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/SavedPlaylists2.java">
<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="180">
<caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
<state relative-caret-position="261">
<caret line="75" column="4" selection-start-line="75" selection-start-column="4" selection-end-line="78" 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/swtViewScreen.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="129">
<caret line="173" column="100" selection-start-line="173" selection-start-column="100" selection-end-line="173" selection-end-column="100" />
<state relative-caret-position="386">
<caret line="78" column="5" selection-start-line="78" selection-start-column="5" selection-end-line="78" selection-end-column="5" />
<folding>
<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" />
<element signature="e#1130#1270#0" expanded="true" />
<element signature="e#1269#1270#0" expanded="true" />
</folding>
</state>
</provider>
......
app/src/main/AndroidManifest.xml
View file @ 1bd3a808
......@@ -11,7 +11,8 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".SongInformationPage"></activity>
<activity android:name=".SavedPlaylistView"></activity>
<activity android:name=".SongInformationPage" />
<activity android:name=".SongScreenView" />
<activity android:name=".playlistView" />
<activity android:name=".SavedPlaylists" />
......
app/src/main/java/com/example/soulfood_assignment2/AmericanAsyncTask.java deleted 100644 → 0
View file @ e52ed63a
package com.example.soulfood_assignment2;
import android.os.AsyncTask;
import android.util.Log;
import java.util.ArrayList;
public class AmericanAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
public ArrayList<String> americanResults;
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
americanResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.american, databaseInterface.Vibe.any, databaseInterface.Time.any);
for(int i = 0; i < americanResults.size(); i++) {
Log.d("AmericanResults!!", americanResults.get(i));
}
return americanResults;
}
}
app/src/main/java/com/example/soulfood_assignment2/ChillAsyncTask.java deleted 100644 → 0
View file @ e52ed63a
package com.example.soulfood_assignment2;
import android.os.AsyncTask;
import android.util.Log;
import android.support.v7.app.AppCompatActivity;
import java.util.ArrayList;
public class ChillAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
public ArrayList<String> chillResults;
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
chillResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.any, databaseInterface.Vibe.chill, databaseInterface.Time.any);
for(int i = 0; i < chillResults.size(); i++) {
Log.d("ChillResults!!", chillResults.get(i));
}
return chillResults;
}
}
app/src/main/java/com/example/soulfood_assignment2/ChineseAsyncTask.java deleted 100644 → 0
View file @ e52ed63a
package com.example.soulfood_assignment2;
import android.os.AsyncTask;
import android.util.Log;
import java.util.ArrayList;
public class ChineseAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
public ArrayList<String> chineseResults;
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
chineseResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.chinese, databaseInterface.Vibe.any, databaseInterface.Time.any);
for (int i = 0; i < chineseResults.size(); i++) {
Log.d("HappyResults!!", chineseResults.get(i));
}
return chineseResults;
}
}
app/src/main/java/com/example/soulfood_assignment2/EnergeticAsyncTask.java deleted 100644 → 0
View file @ e52ed63a
package com.example.soulfood_assignment2;
import android.os.AsyncTask;
import android.util.Log;
import java.util.ArrayList;
public class EnergeticAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
public ArrayList<String> energeticResults;
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
energeticResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.any, databaseInterface.Vibe.energetic, databaseInterface.Time.any);
for(int i = 0; i < energeticResults.size(); i++) {
Log.d("EnergeticResults!!", energeticResults.get(i));
}
return energeticResults;
}
}
app/src/main/java/com/example/soulfood_assignment2/FrenchAsyncTask.java deleted 100644 → 0
View file @ e52ed63a
package com.example.soulfood_assignment2;
import android.os.AsyncTask;
import android.util.Log;
import java.util.ArrayList;
public class FrenchAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
public ArrayList<String> frenchResults;
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
frenchResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.french, databaseInterface.Vibe.any, databaseInterface.Time.any);
for(int i = 0; i < frenchResults.size(); i++) {
Log.d("FrenchResults!!", frenchResults.get(i));
}
return frenchResults;
}
}
app/src/main/java/com/example/soulfood_assignment2/HappyAsyncTask.java deleted 100644 → 0
View file @ e52ed63a
package com.example.soulfood_assignment2;
import android.os.AsyncTask;
import android.util.Log;
import java.util.ArrayList;
public class HappyAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
public ArrayList<String> happyResults;
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
happyResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.any, databaseInterface.Vibe.happy, databaseInterface.Time.any);
for(int i = 0; i < happyResults.size(); i++) {
Log.d("HappyResults!!", happyResults.get(i));
}
return happyResults;
}
}
app/src/main/java/com/example/soulfood_assignment2/IndianAsyncTask.java deleted 100644 → 0
View file @ e52ed63a
package com.example.soulfood_assignment2;
import android.os.AsyncTask;
import android.util.Log;
import java.util.ArrayList;
public class IndianAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
public ArrayList<String> indianResults;
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
indianResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.indian, databaseInterface.Vibe.any, databaseInterface.Time.any);
for(int i = 0; i < indianResults.size(); i++) {
Log.d("IndianResults!!", indianResults.get(i));
}
return indianResults;
}
}
app/src/main/java/com/example/soulfood_assignment2/ItalianAsyncTask.java deleted 100644 → 0
View file @ e52ed63a
package com.example.soulfood_assignment2;
import android.os.AsyncTask;
import android.util.Log;
import java.util.ArrayList;
public class ItalianAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
public ArrayList<String> italianResults;
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
italianResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.italian, databaseInterface.Vibe.any, databaseInterface.Time.any);
for(int i = 0; i < italianResults.size(); i++) {
Log.d("ItalianResults!!", italianResults.get(i));
}
return italianResults;
}
}
app/src/main/java/com/example/soulfood_assignment2/JapaneseAsyncTask.java deleted 100644 → 0
View file @ e52ed63a
package com.example.soulfood_assignment2;
import android.os.AsyncTask;
import android.util.Log;
import java.util.ArrayList;
public class JapaneseAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
public ArrayList<String> japaneseResults;
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
japaneseResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.japanese, databaseInterface.Vibe.any, databaseInterface.Time.any);
for(int i = 0; i < japaneseResults.size(); i++) {
Log.d("JapaneseResults!!", japaneseResults.get(i));
}
return japaneseResults;
}
}
app/src/main/java/com/example/soulfood_assignment2/Listener.java
View file @ 1bd3a808
......@@ -12,7 +12,7 @@ public class Listener implements View.OnClickListener {
Log.d("Testing", "Button pressed");
Intent i = new Intent(v.getContext(), SavedPlaylists.class);
Intent i = new Intent(v.getContext(), SavedPlaylistView.class);
v.getContext().startActivity(i);
}
}
app/src/main/java/com/example/soulfood_assignment2/MexicanAsyncTask.java deleted 100644 → 0
View file @ e52ed63a
package com.example.soulfood_assignment2;
import android.os.AsyncTask;
import android.util.Log;
import java.util.ArrayList;
public class MexicanAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
public ArrayList<String> mexicanResults;
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
mexicanResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.mexican, databaseInterface.Vibe.any, databaseInterface.Time.any);
for(int i = 0; i < mexicanResults.size(); i++) {
Log.d("MexicanResults!!", mexicanResults.get(i));
}
return mexicanResults;
}
}
app/src/main/java/com/example/soulfood_assignment2/SavedPlaylistView.java 0 → 100644
View file @ 1bd3a808
package com.example.soulfood_assignment2;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
public class SavedPlaylistView extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_saved_playlists);
}
}
app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java
View file @ 1bd3a808
......@@ -21,7 +21,7 @@ public class ThaiAsyncTask extends AsyncTask<Void, Void, ArrayAdapter<String>>
public ArrayList<String> attributesSong6 = new ArrayList<>();
public ArrayList<String> attributesSong7 = new ArrayList<>();
public ArrayList<String> songNamesList = new ArrayList<>();
public String[] songNames = new String[20];
public String[] songNames = new String[8];
public ListView listView;
public Context context;
public databaseInterface.Cuisine cuisine;
......
app/src/main/java/com/example/soulfood_assignment2/build_playlist.java
View file @ 1bd3a808
......@@ -114,7 +114,6 @@ public class build_playlist extends AppCompatActivity {
public void buildPlaylistOnClick(View view) {
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);
......
app/src/main/java/com/example/soulfood_assignment2/homeScreen.java
View file @ 1bd3a808
......@@ -72,4 +72,9 @@ public class homeScreen extends AppCompatActivity {
Intent intent = new Intent(this, settings.class);
startActivity(intent);
}
public void savedViewOnClick(View view) {
Intent intent = new Intent(this, SavedPlaylists.class);
startActivity(intent);
}
}
app/src/main/java/com/example/soulfood_assignment2/searchScreen.java
View file @ 1bd3a808
......@@ -23,20 +23,6 @@ public class searchScreen extends AppCompatActivity {
public ListView songResults;
public ArrayAdapter<String> adapter;
public ArrayList<String> chineseResults;
public ArrayList<String> thaiResults;
public ArrayList<String> indianResults;
public ArrayList<String> japaneseResults;
public ArrayList<String> italianResults;
public ArrayList<String> mexicanResults;
public ArrayList<String> frenchResults;
public ArrayList<String> americanResults;
public ArrayList<String> chillResults;
public ArrayList<String> happyResults;
public ArrayList<String> energeticResults;
public Intent vibeView;
@Override
......@@ -60,68 +46,38 @@ public class searchScreen extends AppCompatActivity {
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
ChineseAsyncTask chineseAsyncTask = new ChineseAsyncTask();
chineseAsyncTask.execute();
chineseResults = chineseAsyncTask.chineseResults;
tagNamePage("Chinese", chineseResults);
tagNamePage("Chinese");
break;
case 1:
tagNamePage("Thai", thaiResults);
tagNamePage("Thai");
break;
case 2:
IndianAsyncTask indianAsyncTask = new IndianAsyncTask();
indianAsyncTask.execute();
indianResults = indianAsyncTask.indianResults;
tagNamePage("Indian", indianResults);
tagNamePage("Indian");
break;
case 3:
JapaneseAsyncTask japaneseAsyncTask = new JapaneseAsyncTask();
japaneseAsyncTask.execute();
japaneseResults = japaneseAsyncTask.japaneseResults;
tagNamePage("Japanese", japaneseResults);
tagNamePage("Japanese");
break;
case 4:
ItalianAsyncTask italianAsyncTask = new ItalianAsyncTask();
italianAsyncTask.execute();
italianResults = italianAsyncTask.italianResults;
tagNamePage("Italian", italianResults);
tagNamePage("Italian");
break;
case 5:
MexicanAsyncTask mexicanAsyncTask = new MexicanAsyncTask();
mexicanAsyncTask.execute();
mexicanResults = mexicanAsyncTask.mexicanResults;
tagNamePage("Mexican", mexicanResults);
tagNamePage("Mexican");
break;
case 6:
FrenchAsyncTask frenchAsyncTask = new FrenchAsyncTask();
frenchAsyncTask.execute();
frenchResults = frenchAsyncTask.frenchResults;
tagNamePage("French", frenchResults);
tagNamePage("French");
break;
case 7:
AmericanAsyncTask americanAsyncTask = new AmericanAsyncTask();
americanAsyncTask.execute();
americanResults = americanAsyncTask.americanResults;
tagNamePage("American", americanResults);
tagNamePage("American");
break;
case 8:
ChillAsyncTask chillAsyncTask = new ChillAsyncTask();
chillAsyncTask.execute();
chillResults = chillAsyncTask.chillResults;
tagNamePage("Chill", chillResults);
break;
// tagNamePage("Chill");
// break;
case 9:
HappyAsyncTask happyAsyncTask = new HappyAsyncTask();
happyAsyncTask.execute();
happyResults = happyAsyncTask.happyResults;
tagNamePage("Happy", happyResults);
break;
//tagNamePage("Happy");
//break;
case 10:
EnergeticAsyncTask energeticAsyncTask = new EnergeticAsyncTask();
energeticAsyncTask.execute();
energeticResults = energeticAsyncTask.energeticResults;
tagNamePage("energetic", energeticResults);
break;
//tagNamePage("energetic");
//break;
}
}
......@@ -131,12 +87,11 @@ public class searchScreen extends AppCompatActivity {
}
public void tagNamePage(String tagNameMethod, ArrayList<String> results) {
public void tagNamePage(String tagNameMethod) {
String tagView = "Songs with '" + tagNameMethod +"' Tag";
vibeView = new Intent(searchScreen.this, swtViewScreen.class);
vibeView.putExtra("tag_name", tagView);
vibeView.putExtra("tag_name_selected", tagNameMethod);
vibeView.putExtra("array_list",results);
startActivity(vibeView);
}
......
app/src/main/java/com/example/soulfood_assignment2/settings.java
View file @ 1bd3a808
......@@ -2,6 +2,7 @@ package com.example.soulfood_assignment2;
import android.R.layout;
import android.content.Context;
import android.content.Intent;
import android.media.AudioManager;
import android.media.MediaPlayer;
import android.provider.MediaStore;
......@@ -71,4 +72,9 @@ public class settings extends AppCompatActivity {
e.printStackTrace();
}
}
public void homeScreenViewOnClick(View view) {
Intent intent = new Intent(this, homeScreen.class);
startActivity(intent);
}
}
app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java
View file @ 1bd3a808
......@@ -2,57 +2,18 @@ package com.example.soulfood_assignment2;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.media.MediaPlayer;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.TextView;
import com.spotify.android.appremote.api.SpotifyAppRemote;
import java.util.ArrayList;
import java.util.Arrays;
public class swtViewScreen extends AppCompatActivity {
public ListView tagResults;
public Intent songView;
public ArrayList<String> chineseResults = new ArrayList<String>();
public ArrayList<String> thaiResults = new ArrayList<String>();
public ArrayList<String> indianResults = new ArrayList<String>();
public ArrayList<String> japaneseResults = new ArrayList<String>();
public ArrayList<String> italianResults = new ArrayList<String>();
public ArrayList<String> mexicanResults = new ArrayList<String>();
public ArrayList<String> frenchResults = new ArrayList<String>();
public ArrayList<String> americanResults = new ArrayList<String>();
public ArrayList<String> chillResults = new ArrayList<String>();
public ArrayList<String> happyResults = new ArrayList<String>();
public ArrayAdapter<String> chineseAdapter;
public ArrayAdapter<String> indianAdapter;
public ArrayAdapter<String> japaneseAdapter;
public ArrayAdapter<String> italianAdapter;
public ArrayAdapter<String> mexicanAdapter;
public ArrayAdapter<String> frenchAdapter;
public ArrayAdapter<String> americanAdapter;
public ArrayAdapter<String> chillAdapter;
public ArrayAdapter<String> happyAdapter;
public ArrayAdapter<String> energeticAdapter;
TextView tagNameView;
databaseInterface di;
public MainActivity ma = new MainActivity();
@SuppressLint("StaticFieldLeak")
......@@ -61,81 +22,41 @@ public class swtViewScreen extends AppCompatActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_song_with_tag_view);
String title = getIntent().getStringExtra("tag_name");
final ArrayList<String> testArray = getIntent().getStringArrayListExtra("results_array");
tagNameView = findViewById(R.id.tagTextView2);
tagNameView.setText(title);
chineseResults.addAll(Arrays.asList(getResources().getStringArray(R.array.chineseSearchResultsArray)));
indianResults.addAll(Arrays.asList(getResources().getStringArray(R.array.indianSearchResultsArray)));
japaneseResults.addAll(Arrays.asList(getResources().getStringArray(R.array.japaneseSearchResultsArray)));
italianResults.addAll(Arrays.asList(getResources().getStringArray(R.array.italianSearchResultsArray)));
mexicanResults.addAll(Arrays.asList(getResources().getStringArray(R.array.mexicanSearchResultsArray)));
frenchResults.addAll(Arrays.asList(getResources().getStringArray(R.array.frenchSearchResultsArray)));
americanResults.addAll(Arrays.asList(getResources().getStringArray(R.array.americanSearchResultsArray)));
chillResults.addAll(Arrays.asList(getResources().getStringArray(R.array.chilledSearchResultsArray)));
happyResults.addAll(Arrays.asList(getResources().getStringArray(R.array.happySearchResultsArray)));
chineseAdapter = new ArrayAdapter<String>(
this, android.R.layout.simple_list_item_1, chineseResults
);
indianAdapter = new ArrayAdapter<String>(
this, android.R.layout.simple_list_item_1, indianResults
);
japaneseAdapter = new ArrayAdapter<String>(
this, android.R.layout.simple_list_item_1, japaneseResults
);
italianAdapter = new ArrayAdapter<String>(
this, android.R.layout.simple_list_item_1, italianResults
);
mexicanAdapter = new ArrayAdapter<String>(
this, android.R.layout.simple_list_item_1, mexicanResults
);
frenchAdapter = new ArrayAdapter<String>(
this, android.R.layout.simple_list_item_1, frenchResults
);
americanAdapter = new ArrayAdapter<String>(
this, android.R.layout.simple_list_item_1, americanResults
);
chillAdapter = new ArrayAdapter<String>(
this, android.R.layout.simple_list_item_1, chillResults
);
happyAdapter = new ArrayAdapter<String>(
this, android.R.layout.simple_list_item_1, happyResults
);
//tagResults = findViewById(R.id.charleyNeedsHelp);
if (tagNameView.getText().toString().equals("Songs with 'Chinese' Tag")) {
tagResults.setAdapter(chineseAdapter);
ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(swtViewScreen.this, databaseInterface.Cuisine.chinese, databaseInterface.Time.any, databaseInterface.Vibe.any);
thaiAsyncTask.listView = findViewById(R.id.charleyNeedsHelp);
thaiAsyncTask.execute();
tagResults = thaiAsyncTask.listView;
tagResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
//songPage(chineseResults.get(0));
songPage(thaiAsyncTask.songNames[0], thaiAsyncTask.attributesSong1.get(0), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 1:
//songPage(chineseResults.get(1));
songPage(thaiAsyncTask.songNames[1], thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 2:
//songPage(chineseResults.get(2));
songPage(thaiAsyncTask.songNames[2], thaiAsyncTask.attributesSong1.get(2), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 3:
//songPage(chineseResults.get(3));
songPage(thaiAsyncTask.songNames[3], thaiAsyncTask.attributesSong1.get(3), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 4:
//songPage(chineseResults.get(4));
songPage(thaiAsyncTask.songNames[4], thaiAsyncTask.attributesSong1.get(4), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 5:
//songPage(chineseResults.get(5));
songPage(thaiAsyncTask.songNames[5], thaiAsyncTask.attributesSong1.get(5), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 6:
//songPage(chineseResults.get(6));
songPage(thaiAsyncTask.songNames[6], thaiAsyncTask.attributesSong1.get(6), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
}
}
......@@ -147,7 +68,6 @@ public class swtViewScreen extends AppCompatActivity {
thaiAsyncTask.execute();
tagResults = thaiAsyncTask.listView;
tagResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
......@@ -177,285 +97,206 @@ public class swtViewScreen extends AppCompatActivity {
}
});
} else if (tagNameView.getText().toString().equals("Songs with 'Indian' Tag")) {
tagResults.setAdapter(indianAdapter);
ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(swtViewScreen.this, databaseInterface.Cuisine.indian, databaseInterface.Time.any, databaseInterface.Vibe.any);
thaiAsyncTask.listView = findViewById(R.id.charleyNeedsHelp);
thaiAsyncTask.execute();
tagResults = thaiAsyncTask.listView;
tagResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
MediaPlayer mp = MediaPlayer.create(swtViewScreen.this, R.raw.beepsoundeffect);
mp.start();
//spotify api player
songPage(thaiAsyncTask.songNames[0], thaiAsyncTask.attributesSong1.get(0), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 1:
//spotify api player
songPage(thaiAsyncTask.songNames[1], thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 2:
//spotify api player
songPage(thaiAsyncTask.songNames[2], thaiAsyncTask.attributesSong1.get(2), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 3:
//spotify api player
songPage(thaiAsyncTask.songNames[3], thaiAsyncTask.attributesSong1.get(3), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 4:
//spotify api player
songPage(thaiAsyncTask.songNames[4], thaiAsyncTask.attributesSong1.get(4), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 5:
//spotify api player
songPage(thaiAsyncTask.songNames[5], thaiAsyncTask.attributesSong1.get(5), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 6:
//spotify api player
songPage(thaiAsyncTask.songNames[6], thaiAsyncTask.attributesSong1.get(6), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
}
}
});
} else if (tagNameView.getText().toString().equals("Songs with 'Japanese' Tag")) {
tagResults.setAdapter(japaneseAdapter);
ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(swtViewScreen.this, databaseInterface.Cuisine.japanese, databaseInterface.Time.any, databaseInterface.Vibe.any);
thaiAsyncTask.listView = findViewById(R.id.charleyNeedsHelp);
thaiAsyncTask.execute();
tagResults = thaiAsyncTask.listView;
tagResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
MediaPlayer mp = MediaPlayer.create(swtViewScreen.this, R.raw.beepsoundeffect);
mp.start();
//spotify api player
songPage(thaiAsyncTask.songNames[0], thaiAsyncTask.attributesSong1.get(0), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 1:
//spotify api player
songPage(thaiAsyncTask.songNames[1], thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 2:
//spotify api player
songPage(thaiAsyncTask.songNames[2], thaiAsyncTask.attributesSong1.get(2), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 3:
//spotify api player
songPage(thaiAsyncTask.songNames[3], thaiAsyncTask.attributesSong1.get(3), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 4:
//spotify api player
songPage(thaiAsyncTask.songNames[4], thaiAsyncTask.attributesSong1.get(4), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 5:
//spotify api player
songPage(thaiAsyncTask.songNames[5], thaiAsyncTask.attributesSong1.get(5), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 6:
//spotify api player
songPage(thaiAsyncTask.songNames[6], thaiAsyncTask.attributesSong1.get(6), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
}
}
});
} else if (tagNameView.getText().toString().equals("Songs with 'Italian' Tag")) {
tagResults.setAdapter(italianAdapter);
ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(swtViewScreen.this, databaseInterface.Cuisine.italian, databaseInterface.Time.any, databaseInterface.Vibe.any);
thaiAsyncTask.listView = findViewById(R.id.charleyNeedsHelp);
thaiAsyncTask.execute();
tagResults = thaiAsyncTask.listView;
tagResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
MediaPlayer mp = MediaPlayer.create(swtViewScreen.this, R.raw.beepsoundeffect);
mp.start();
//spotify api player
songPage(thaiAsyncTask.songNames[0], thaiAsyncTask.attributesSong1.get(0), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 1:
//spotify api player
songPage(thaiAsyncTask.songNames[1], thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 2:
//spotify api player
songPage(thaiAsyncTask.songNames[2], thaiAsyncTask.attributesSong1.get(2), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 3:
//spotify api player
songPage(thaiAsyncTask.songNames[3], thaiAsyncTask.attributesSong1.get(3), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 4:
//spotify api player
songPage(thaiAsyncTask.songNames[4], thaiAsyncTask.attributesSong1.get(4), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 5:
//spotify api player
songPage(thaiAsyncTask.songNames[5], thaiAsyncTask.attributesSong1.get(5), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 6:
//spotify api player
songPage(thaiAsyncTask.songNames[6], thaiAsyncTask.attributesSong1.get(6), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
}
}
});
} else if (tagNameView.getText().toString().equals("Songs with 'Mexican' Tag")) {
tagResults.setAdapter(mexicanAdapter);
ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(swtViewScreen.this, databaseInterface.Cuisine.mexican, databaseInterface.Time.any, databaseInterface.Vibe.any);
thaiAsyncTask.listView = findViewById(R.id.charleyNeedsHelp);
thaiAsyncTask.execute();
tagResults = thaiAsyncTask.listView;
tagResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
MediaPlayer mp = MediaPlayer.create(swtViewScreen.this, R.raw.beepsoundeffect);
mp.start();
//spotify api player
songPage(thaiAsyncTask.songNames[0], thaiAsyncTask.attributesSong1.get(0), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 1:
//spotify api player
songPage(thaiAsyncTask.songNames[1], thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 2:
//spotify api player
songPage(thaiAsyncTask.songNames[2], thaiAsyncTask.attributesSong1.get(2), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 3:
//spotify api player
songPage(thaiAsyncTask.songNames[3], thaiAsyncTask.attributesSong1.get(3), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 4:
//spotify api player
songPage(thaiAsyncTask.songNames[4], thaiAsyncTask.attributesSong1.get(4), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 5:
//spotify api player
songPage(thaiAsyncTask.songNames[5], thaiAsyncTask.attributesSong1.get(5), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 6:
//spotify api player
songPage(thaiAsyncTask.songNames[6], thaiAsyncTask.attributesSong1.get(6), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
}
}
});
} else if (tagNameView.getText().toString().equals("Songs with 'French' Tag")) {
tagResults.setAdapter(frenchAdapter);
ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(swtViewScreen.this, databaseInterface.Cuisine.french, databaseInterface.Time.any, databaseInterface.Vibe.any);
thaiAsyncTask.listView = findViewById(R.id.charleyNeedsHelp);
thaiAsyncTask.execute();
tagResults = thaiAsyncTask.listView;
tagResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
MediaPlayer mp = MediaPlayer.create(swtViewScreen.this, R.raw.beepsoundeffect);
mp.start();
//spotify api player
songPage(thaiAsyncTask.songNames[0], thaiAsyncTask.attributesSong1.get(0), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 1:
//spotify api player
songPage(thaiAsyncTask.songNames[1], thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 2:
//spotify api player
songPage(thaiAsyncTask.songNames[2], thaiAsyncTask.attributesSong1.get(2), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 3:
//spotify api player
songPage(thaiAsyncTask.songNames[3], thaiAsyncTask.attributesSong1.get(3), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 4:
//spotify api player
songPage(thaiAsyncTask.songNames[4], thaiAsyncTask.attributesSong1.get(4), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 5:
//spotify api player
songPage(thaiAsyncTask.songNames[5], thaiAsyncTask.attributesSong1.get(5), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 6:
//spotify api player
songPage(thaiAsyncTask.songNames[6], thaiAsyncTask.attributesSong1.get(6), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
}
}
});
} else if (tagNameView.getText().toString().equals("Songs with 'American' Tag")) {
tagResults.setAdapter(americanAdapter);
tagResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
MediaPlayer mp = MediaPlayer.create(swtViewScreen.this, R.raw.beepsoundeffect);
mp.start();
//spotify api player
break;
case 1:
//spotify api player
break;
case 2:
//spotify api player
break;
case 3:
//spotify api player
break;
case 4:
//spotify api player
break;
case 5:
//spotify api player
break;
case 6:
//spotify api player
break;
}
}
});
} else if (tagNameView.getText().toString().equals("Songs with 'Chill' Tag")) {
tagResults.setAdapter(chillAdapter);
tagResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
MediaPlayer mp = MediaPlayer.create(swtViewScreen.this, R.raw.beepsoundeffect);
mp.start();
//spotify api player
break;
case 1:
//spotify api player
break;
case 2:
//spotify api player
break;
case 3:
//spotify api player
break;
case 4:
//spotify api player
break;
case 5:
//spotify api player
break;
case 6:
//spotify api player
break;
case 7:
//spotify api player
break;
case 8:
//spotify api player
break;
case 9:
//spotify api player
break;
case 10:
//spotify api player
break;
}
}
});
} else if (tagNameView.getText().toString().equals("Songs with 'Happy' Tag")) {
tagResults.setAdapter(happyAdapter);
ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(swtViewScreen.this, databaseInterface.Cuisine.american, databaseInterface.Time.any, databaseInterface.Vibe.any);
thaiAsyncTask.listView = findViewById(R.id.charleyNeedsHelp);
thaiAsyncTask.execute();
tagResults = thaiAsyncTask.listView;
tagResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
MediaPlayer mp = MediaPlayer.create(swtViewScreen.this, R.raw.beepsoundeffect);
mp.start();
//spotify api player
songPage(thaiAsyncTask.songNames[0], thaiAsyncTask.attributesSong1.get(0), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 1:
//spotify api player
songPage(thaiAsyncTask.songNames[1], thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 2:
//spotify api player
songPage(thaiAsyncTask.songNames[2], thaiAsyncTask.attributesSong1.get(2), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 3:
//spotify api player
songPage(thaiAsyncTask.songNames[3], thaiAsyncTask.attributesSong1.get(3), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 4:
//spotify api player
songPage(thaiAsyncTask.songNames[4], thaiAsyncTask.attributesSong1.get(4), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 5:
//spotify api player
songPage(thaiAsyncTask.songNames[5], thaiAsyncTask.attributesSong1.get(5), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 6:
//spotify api player
break;
case 7:
//spotify api player
break;
case 8:
//spotify api player
break;
case 9:
//spotify api player
songPage(thaiAsyncTask.songNames[6], thaiAsyncTask.attributesSong1.get(6), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
}
}
});
}
}
public void songPage(String songName, String tag1, String tag2, String tag3) {
......
app/src/main/res/layout/activity_main.xml
View file @ 1bd3a808
......@@ -50,7 +50,7 @@
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="100dp"
android:onClick="savedPlaylistViewOnClick"
android:onClick="savedViewOnClick"
android:text="SAVED PLAYLISTS"
android:textColor="#000000"
android:textSize="24sp"
......
app/src/main/res/layout/activity_saved_playlist_view.xml 0 → 100644
View file @ 1bd3a808
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.example.soulfood_assignment2.SavedPlaylistView">
<ListView
android:id="@+id/savedPlaylists"
android:layout_width="wrap_content"
android:layout_height="500dp"
android:layout_marginTop="76dp"
android:layout_marginBottom="77dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView9"></ListView>
<TextView
android:id="@+id/textView7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="28dp"
android:text="SoulFood"
android:textColor="#000000"
android:textSize="36sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
app/src/main/res/layout/activity_settings.xml
View file @ 1bd3a808
......@@ -10,11 +10,7 @@
android:id="@+id/factorySettings"
android:layout_width="309dp"
android:layout_height="41dp"
android:layout_marginStart="62dp"
android:layout_marginLeft="62dp"
android:layout_marginEnd="44dp"
android:layout_marginRight="44dp"
android:layout_marginBottom="50dp"
android:layout_marginBottom="296dp"
android:text="Test"
android:textColor="#000000"
app:layout_constraintBottom_toBottomOf="parent"
......@@ -42,11 +38,9 @@
android:layout_height="25dp"
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="80dp"
android:layout_marginTop="140dp"
android:layout_marginEnd="22dp"
android:layout_marginRight="22dp"
android:layout_marginBottom="478dp"
app:layout_constraintBottom_toTopOf="@+id/factorySettings"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/textView12"
app:layout_constraintTop_toBottomOf="@+id/textView11" />
......@@ -57,15 +51,24 @@
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginLeft="32dp"
android:layout_marginTop="80dp"
android:layout_marginTop="144dp"
android:layout_marginEnd="60dp"
android:layout_marginRight="60dp"
android:layout_marginBottom="484dp"
android:text="Volume"
android:textColor="#000000"
app:layout_constraintBottom_toTopOf="@+id/factorySettings"
app:layout_constraintEnd_toStartOf="@+id/seekBar"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView11" />
<Button
android:id="@+id/homeScreenView"
android:layout_width="310dp"
android:layout_height="48dp"
android:layout_marginBottom="200dp"
android:onClick="homeScreenViewOnClick"
android:text="Back to home"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</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