Skip to content

S
soulfood
Commit 4e9a8c20 authored by charley.punshon's avatar charley.punshon
Browse files
Options

Song screen

parent 73392276
Hide whitespace changes
Inline Side-by-side
Showing with 326 additions and 224 deletions
.idea/workspace.xml
View file @ 4e9a8c20
......@@ -6,7 +6,7 @@
</shared>
</component>
<component name="AndroidLogFilters">
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="testing" />
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="HelpME!!!" />
<option name="TOOL_WINDOW_LOG_LEVEL" value="verbose" />
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
</component>
......@@ -15,78 +15,22 @@
</component>
<component name="ChangeListManager">
<list default="true" id="2e150a74-2388-4ba3-8805-625472c5af43" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/AmericanAsyncTask.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/AsyncTask.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChillAsyncTask.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/EnergeticAsyncTask.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/FrenchAsyncTask.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/HappyAsyncTask.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/IndianAsyncTask.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ItalianAsyncTask.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/JapaneseAsyncTask.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MexicanAsyncTask.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChineseAsyncTask.java" 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" />
<change beforePath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/javaCompile.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/taskHistory.bin" afterDir="false" />
<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$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__artifacts_spotify_app_remote_release_unspecified_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__artifacts_spotify_app_remote_release_unspecified_jar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__artifacts_spotify_auth_release_1_1_unspecified_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__artifacts_spotify_auth_release_1_1_unspecified_jar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.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/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" 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/AsyncTask.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChillAsyncTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChillAsyncTask.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/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/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/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/soul food.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/spotify-app-remote-release/spotify-app-remote-release.iml" beforeDir="false" afterPath="$PROJECT_DIR$/spotify-app-remote-release/spotify-app-remote-release.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/spotify-auth-release-1.1/spotify-auth-release-1.1.iml" beforeDir="false" afterPath="$PROJECT_DIR$/spotify-auth-release-1.1/spotify-auth-release-1.1.iml" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/app/out/" />
......@@ -119,24 +63,28 @@
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="java" value="5" />
<entry key="xml" value="3" />
<entry key="class" value="1" />
<entry key="java" value="22" />
<entry key="xml" value="7" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="JAVA" value="5" />
<entry key="XML" value="3" />
<entry key="CLASS" value="1" />
<entry key="JAVA" value="22" />
<entry key="XML" value="7" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="java" value="3" />
<entry key="java" value="1406" />
<entry key="txt" value="58" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="JAVA" value="3" />
<entry key="JAVA" value="1406" />
<entry key="PLAIN_TEXT" value="58" />
</counts>
</usages-collector>
</session>
......@@ -144,31 +92,10 @@
<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/res/values/strings.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1668">
<caret line="126" selection-start-line="126" selection-end-line="126" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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="439">
<caret line="65" column="26" selection-start-line="65" selection-start-column="26" selection-end-line="65" selection-end-column="26" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<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="295">
<caret line="156" column="51" selection-start-line="156" selection-start-column="51" selection-end-line="156" selection-end-column="51" />
<state relative-caret-position="111">
<caret line="92" column="20" lean-forward="true" selection-start-line="92" selection-start-column="16" selection-end-line="92" selection-end-column="20" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#701#709#0" expanded="true" />
......@@ -187,44 +114,37 @@
</entry>
</file>
<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/java/com/example/soulfood_assignment2/JapaneseAsyncTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-33">
<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>
</file>
<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/res/values/strings.xml">
<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 relative-caret-position="156">
<caret line="34" column="46" selection-start-line="34" selection-start-column="24" selection-end-line="34" selection-end-column="46" />
</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">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ItalianAsyncTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="79">
<caret line="28" column="35" selection-start-line="28" selection-start-column="35" selection-end-line="28" selection-end-column="35" />
<state relative-caret-position="180">
<caret line="15" column="35" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="35" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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>
</file>
<file pinned="false" current-in-tab="false">
<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="259">
<caret line="56" column="35" selection-start-line="56" selection-start-column="35" selection-end-line="56" selection-end-column="35" />
<state relative-caret-position="235">
<caret line="74" column="69" lean-forward="true" selection-start-line="74" selection-start-column="69" selection-end-line="74" selection-end-column="69" />
<folding>
<element signature="e#6295#6296#0" expanded="true" />
<element signature="e#6339#6340#0" expanded="true" />
......@@ -233,16 +153,52 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<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="323">
<caret line="33" column="9" lean-forward="true" selection-start-line="33" selection-start-column="9" selection-end-line="33" selection-end-column="9" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#472#473#0" expanded="true" />
<element signature="e#510#511#0" expanded="true" />
<element signature="e#1076#1077#0" expanded="true" />
<element signature="e#1115#1116#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/AmericanAsyncTask.java">
<provider selected="true" editor-type-id="text-editor" />
<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="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>
</file>
<file pinned="false" current-in-tab="false">
<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>
</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="190">
<caret line="28" column="35" selection-start-line="28" selection-start-column="35" selection-end-line="28" selection-end-column="35" />
</state>
</provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/AmericanAsyncTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="16" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="16" />
<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>
......@@ -253,6 +209,7 @@
<option name="RECENT_TEMPLATES">
<list>
<option value="Class" />
<option value="valueResourceFile" />
</list>
</option>
</component>
......@@ -277,7 +234,6 @@
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/app/src/main/java/databaseInterface.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/databaseInterface.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/IndividualPlaylistScreen.java" />
<option value="$PROJECT_DIR$/settings.gradle" />
......@@ -286,11 +242,16 @@
<option value="$PROJECT_DIR$/app/build.gradle" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_swt_view_screen.xml" />
<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/homeScreen.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/build_playlist.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" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChillAsyncTask.java" />
<option value="$PROJECT_DIR$/app/src/main/res/values/strings.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/searchScreen.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" />
</list>
</option>
</component>
......@@ -421,20 +382,26 @@
<property name="sync.plugin.last.upgrade.timestamp" value="1558040125070" />
</component>
<component name="RecentsManager">
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
<key name="CreateClassDialog.RecentsKey">
<recent name="com.example.soulfood_assignment2" />
</key>
<key name="ExtractSuperBase.RECENT_KEYS">
<recent name="com.example.soulfood_assignment2" />
</key>
<key name="android.template.packageName">
<recent name="com.example.test1" />
<recent name="com.example.soulfood_assignment2" />
</key>
<key name="android.template.parentActivityClass">
<recent name="" />
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
<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" />
</key>
<key name="android.template.parentActivityClass">
<recent name="" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
......@@ -520,6 +487,14 @@
<option name="presentableId" value="Default" />
<updated>1557754250007</updated>
</task>
<task id="LOCAL-00001" summary="Async Tasks, search screen and search results">
<created>1558267120792</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1558267120793</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="TodoView">
......@@ -533,6 +508,7 @@
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="801" extended-state="6" />
<editor active="true" />
<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" />
......@@ -543,15 +519,15 @@
<window_info id="Designer" order="6" />
<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.3288889" />
<window_info anchor="bottom" id="Logcat" order="1" sideWeight="0.49959838" weight="0.3440703" />
<window_info anchor="bottom" id="Run" order="0" sideWeight="0.49959838" visible="true" weight="0.32863188" />
<window_info anchor="bottom" id="Logcat" order="1" sideWeight="0.49959838" 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" weight="0.32796487" />
<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="Build" order="7" sideWeight="0.49932885" visible="true" weight="0.31593794" />
<window_info anchor="bottom" id="Find" order="8" weight="0.329429" />
<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" />
<window_info anchor="right" id="Device File Explorer" order="0" side_tool="true" />
<window_info anchor="right" id="Capture Analysis" order="1" />
......@@ -590,6 +566,10 @@
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="Async Tasks, search screen and search results" />
<option name="LAST_COMMIT_MESSAGE" value="Async Tasks, search screen and search results" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_home_screen.xml">
<provider editor-type-id="text-editor" />
......@@ -605,20 +585,9 @@
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/IndividualPlaylist.java" />
<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="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="816">
<caret line="60" column="5" selection-start-line="60" selection-start-column="5" selection-end-line="60" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<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/java/com/example/soulfood_assignment2/AsyncTask.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="315">
......@@ -629,13 +598,6 @@
</state>
</provider>
</entry>
<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="450">
<caret line="35" selection-start-line="35" selection-end-line="35" />
</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="60">
......@@ -675,67 +637,152 @@
</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/SpotifyClass.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="259">
<caret line="56" column="35" selection-start-line="56" selection-start-column="35" selection-end-line="56" selection-end-column="35" />
<state relative-caret-position="-433">
<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/homeScreen.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="826">
<caret line="65" column="26" selection-start-line="65" selection-start-column="26" selection-end-line="65" selection-end-column="26" />
<folding>
<element signature="e#6295#6296#0" expanded="true" />
<element signature="e#6339#6340#0" expanded="true" />
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/AmericanAsyncTask.java">
<provider selected="true" editor-type-id="text-editor" />
<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="file://$PROJECT_DIR$/app/src/main/res/values/strings.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="1668">
<caret line="126" selection-start-line="126" selection-end-line="126" />
<state relative-caret-position="149">
<caret line="30" selection-start-line="30" selection-end-line="30" />
</state>
</provider>
</entry>
<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/BuildPlaylist.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="79">
<caret line="28" column="35" selection-start-line="28" selection-start-column="35" selection-end-line="28" selection-end-column="35" />
<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>
<provider editor-type-id="android-designer2" />
</entry>
<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 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="411">
<caret line="60" column="5" selection-start-line="60" selection-start-column="5" selection-end-line="60" 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">
<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">
<state relative-caret-position="-33">
<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="380">
<caret line="107" column="23" selection-start-line="107" selection-start-column="23" selection-end-line="107" selection-end-column="23" />
</state>
</provider>
</entry>
<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/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/FrenchAsyncTask.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="7" selection-start-line="7" selection-end-line="7" selection-end-column="79" />
</state>
</provider>
</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/AsyncTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="439">
<caret line="65" column="26" selection-start-line="65" selection-start-column="26" selection-end-line="65" selection-end-column="26" />
<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/HappyAsyncTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="7" column="28" selection-start-line="7" selection-start-column="28" selection-end-line="19" />
</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">
<caret line="15" column="8" selection-start-line="15" selection-start-column="8" selection-end-line="15" selection-end-column="8" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/AmericanAsyncTask.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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/JapaneseAsyncTask.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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="156">
<caret line="34" column="46" selection-start-line="34" selection-start-column="24" selection-end-line="34" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ItalianAsyncTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="15" column="35" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="35" />
</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="190">
<caret line="28" column="35" selection-start-line="28" selection-start-column="35" selection-end-line="28" selection-end-column="35" />
</state>
</provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<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="295">
<caret line="156" column="51" selection-start-line="156" selection-start-column="51" selection-end-line="156" selection-end-column="51" />
<state relative-caret-position="111">
<caret line="92" column="20" lean-forward="true" selection-start-line="92" selection-start-column="16" selection-end-line="92" selection-end-column="20" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#701#709#0" expanded="true" />
......@@ -752,5 +799,41 @@
</state>
</provider>
</entry>
<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="235">
<caret line="74" column="69" lean-forward="true" selection-start-line="74" selection-start-column="69" selection-end-line="74" selection-end-column="69" />
<folding>
<element signature="e#6295#6296#0" expanded="true" />
<element signature="e#6339#6340#0" expanded="true" />
</folding>
</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="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/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/ThaiAsyncTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="33" column="9" lean-forward="true" selection-start-line="33" selection-start-column="9" selection-end-line="33" selection-end-column="9" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#472#473#0" expanded="true" />
<element signature="e#510#511#0" expanded="true" />
<element signature="e#1076#1077#0" expanded="true" />
<element signature="e#1115#1116#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
app/src/main/java/com/example/soulfood_assignment2/AsyncTask.java deleted 100644 → 0
View file @ 73392276
package com.example.soulfood_assignment2;
import android.app.Activity;
import android.util.Log;
import java.util.ArrayList;
public class AsyncTask extends android.os.AsyncTask<ArrayList<String>, Integer, ArrayList<String>> {
public ArrayList<String> chineseResults;
@Override
protected ArrayList<String> doInBackground(ArrayList<String>... params) {
databaseInterface dbi = new databaseInterface();
chineseResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.chinese, databaseInterface.Vibe.any, databaseInterface.Time.any);
return chineseResults;
}
}
app/src/main/java/com/example/soulfood_assignment2/ChillAsyncTask.java
View file @ 4e9a8c20
......@@ -2,6 +2,7 @@ package com.example.soulfood_assignment2;
import android.os.AsyncTask;
import android.util.Log;
import android.support.v7.app.AppCompatActivity;
import java.util.ArrayList;
......@@ -10,10 +11,12 @@ public class ChillAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
chillResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.any, databaseInterface.Vibe.chill, databaseInterface.Time.any);
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 0 → 100644
View file @ 4e9a8c20
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/ThaiAsyncTask.java
View file @ 4e9a8c20
package com.example.soulfood_assignment2;
import android.content.Context;
import android.os.AsyncTask;
import android.util.Log;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import java.util.ArrayList;
public class ThaiAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
public ArrayList<String> thaiResults;
public class ThaiAsyncTask extends AsyncTask<Void, Void, ArrayAdapter<String>> {
public ArrayList<String> thaiResults = new ArrayList<>();
public ListView listView;
public Context context;
public ThaiAsyncTask(Context context) {
this.context = context;
}
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
thaiResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.thai, databaseInterface.Vibe.any, databaseInterface.Time.any);
for(int i = 0; i < thaiResults.size(); i++) {
Log.d("ThaiResults!!", thaiResults.get(i));
protected ArrayAdapter<String> doInBackground(Void... params) {
try {
databaseInterface dbi = new databaseInterface();
thaiResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.thai, databaseInterface.Vibe.any, databaseInterface.Time.any);
ArrayAdapter thaiAdapter = new ArrayAdapter<String>(
context, android.R.layout.simple_list_item_1, thaiResults
);
return thaiAdapter;
} catch (Exception e) {
e.printStackTrace();
}
return thaiResults;
return null;
}
@Override
protected void onPostExecute(ArrayAdapter thaiAdapter) {
listView.setAdapter(thaiAdapter);
}
}
app/src/main/java/com/example/soulfood_assignment2/build_playlist.java
View file @ 4e9a8c20
......@@ -29,10 +29,6 @@ public class build_playlist extends AppCompatActivity {
ArrayAdapter<String> timeOfDayAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_dropdown_item, timeOfDay);
timeOfDaySpinner.setAdapter(timeOfDayAdapter);
String[] occasions = new String[] {"None", "Dinner Party", "Family Meal", "Solo Meal"};
Spinner occasionsSpinner = findViewById(R.id.occasion_dropdown);
ArrayAdapter<String> occasionsAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_dropdown_item, occasions);
occasionsSpinner.setAdapter(occasionsAdapter);
}
......
app/src/main/java/com/example/soulfood_assignment2/searchScreen.java
View file @ 4e9a8c20
package com.example.soulfood_assignment2;
import android.app.Activity;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
......@@ -10,8 +11,8 @@ import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.SearchView;
import android.widget.TextView;
import java.util.AbstractList;
import java.util.ArrayList;
import java.util.Arrays;
......@@ -32,6 +33,8 @@ public class searchScreen extends AppCompatActivity {
public ArrayList<String> happyResults;
public ArrayList<String> energeticResults;
public static ArrayList<String> testArray;
public Intent vibeView;
......@@ -52,19 +55,20 @@ public class searchScreen extends AppCompatActivity {
searchResults.setAdapter(adapter);
searchResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
AsyncTask asyncTask =new AsyncTask();
asyncTask.execute();
chineseResults = asyncTask.chineseResults;
ChineseAsyncTask chineseAsyncTask = new ChineseAsyncTask();
chineseAsyncTask.execute();
chineseResults = chineseAsyncTask.chineseResults;
tagNamePage("Chinese", chineseResults);
break;
case 1:
ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask();
ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(this);
thaiAsyncTask.listView = findViewById(R.id.tagListView);
thaiAsyncTask.execute();
thaiResults = thaiAsyncTask.thaiResults;
tagNamePage("Thai", thaiResults);
break;
case 2:
......@@ -160,4 +164,6 @@ public class searchScreen extends AppCompatActivity {
return super.onCreateOptionsMenu(menu);
}
}
\ No newline at end of file
app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java
View file @ 4e9a8c20
......@@ -36,7 +36,6 @@ public class swtViewScreen extends AppCompatActivity {
public ArrayAdapter<String> chineseAdapter;
public ArrayAdapter<String> thaiAdapter;
public ArrayAdapter<String> indianAdapter;
public ArrayAdapter<String> japaneseAdapter;
public ArrayAdapter<String> italianAdapter;
......@@ -62,13 +61,12 @@ public class swtViewScreen extends AppCompatActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_swt_view_screen);
String title = getIntent().getStringExtra("tag_name");
final ArrayList<String> chineseIDs = getIntent().getStringArrayListExtra("results_array");
final ArrayList<String> testArray = getIntent().getStringArrayListExtra("results_array");
tagNameView = findViewById(R.id.tagTextView);
tagNameView.setText(title);
chineseResults.addAll(Arrays.asList(getResources().getStringArray(R.array.chineseSearchResultsArray)));
thaiResults.addAll(Arrays.asList(getResources().getStringArray(R.array.thaiSearchResultsArray)));
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)));
......@@ -82,9 +80,6 @@ public class swtViewScreen extends AppCompatActivity {
chineseAdapter = new ArrayAdapter<String>(
this, android.R.layout.simple_list_item_1, chineseResults
);
thaiAdapter = new ArrayAdapter<String>(
this, android.R.layout.simple_list_item_1, thaiResults
);
indianAdapter = new ArrayAdapter<String>(
this, android.R.layout.simple_list_item_1, indianResults
);
......@@ -122,9 +117,7 @@ public class swtViewScreen extends AppCompatActivity {
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
SpotifyClass spotifyClass = MainActivity.spotifyClass;
spotifyClass.pauseSong();
spotifyClass.playSong("0RvQJoaiQC3sYafoDTdiEJ");
songPage(chineseResults.get(0));
break;
case 1:
songPage(chineseResults.get(1));
......@@ -148,12 +141,14 @@ public class swtViewScreen extends AppCompatActivity {
}
});
} else if(tagNameView.getText().toString().equals("Songs with 'Thai' Tag")) {
tagResults.setAdapter(thaiAdapter);
tagResults.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
SpotifyClass spotifyClass = MainActivity.spotifyClass;
spotifyClass.pauseSong();
spotifyClass.playSong("0RvQJoaiQC3sYafoDTdiEJ");
break;
case 1:
songPage(thaiResults.get(1));
......
app/src/main/res/values/strings.xml
View file @ 4e9a8c20
......@@ -33,13 +33,6 @@
<item>Deja Vu</item>
</string-array>
<string-array name="thaiSearchResultsArray">
<item>คู่คอง (เพลงประกอบละคร นาคี)</item>
<item>ซมซาน</item>
<item>ตลอดเวลา</item>
<item>เพลงไม่รัก</item>
<item>หนูคนเดียว</item>
<item>เมด อิน ไทยแลนด์ </item>
<item>เมื่อไม่มีเธอ</item>
</string-array>
<string-array name="indianSearchResultsArray">
<item>Lullaby from Home</item>
......
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