Skip to content

S
soulfood
Commit 188982d7 authored by charley.punshon's avatar charley.punshon
Browse files
Options

Merge branch 'master' of... 

Merge branch 'master' of /Users/charleypunshon/AndriodStudioProjects/soulfood_working with conflicts.
parent 97b9b53f
Show whitespace changes
Inline Side-by-side
Showing with 183 additions and 216 deletions
.idea/codeStyles/Project.xml 0 → 100644
View file @ 188982d7
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<Objective-C-extensions>
<file>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
</file>
<class>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
</class>
<extensions>
<pair source="cpp" header="h" fileNamingConvention="NONE" />
<pair source="c" header="h" fileNamingConvention="NONE" />
</extensions>
</Objective-C-extensions>
</code_scheme>
</component>
\ No newline at end of file
.idea/workspace.xml
View file @ 188982d7
......@@ -13,7 +13,7 @@
<last-search-timestamp>1558099117772</last-search-timestamp>
</component>
<component name="ChangeListManager">
<list default="true" id="2e150a74-2388-4ba3-8805-625472c5af43" name="Default Changelist" comment="">
<list default="true" id="2e150a74-2388-4ba3-8805-625472c5af43" name="Default Changelist" comment="As good as working build">
<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" />
......@@ -22,12 +22,11 @@
<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/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/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/playlistView.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/playlistView.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlists.xml" beforeDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/app/out/" />
......@@ -61,29 +60,29 @@
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="class" value="1" />
<entry key="java" value="55" />
<entry key="xml" value="29" />
<entry key="java" value="57" />
<entry key="xml" value="33" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CLASS" value="1" />
<entry key="JAVA" value="55" />
<entry key="XML" value="29" />
<entry key="JAVA" value="57" />
<entry key="XML" value="33" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="java" value="5497" />
<entry key="txt" value="596" />
<entry key="xml" value="192" />
<entry key="java" value="5599" />
<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="5497" />
<entry key="PLAIN_TEXT" value="596" />
<entry key="XML" value="192" />
<entry key="JAVA" value="5599" />
<entry key="PLAIN_TEXT" value="661" />
<entry key="XML" value="193" />
</counts>
</usages-collector>
</session>
......@@ -100,40 +99,46 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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/playlistView.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" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<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>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/playlistView.java">
<file pinned="false" current-in-tab="false">
<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>
</file>
<file pinned="false" current-in-tab="false">
<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="179">
<caret line="84" column="45" lean-forward="true" selection-start-line="84" selection-start-column="45" selection-end-line="84" selection-end-column="45" />
<state relative-caret-position="139">
<caret line="56" selection-start-line="56" selection-end-line="56" />
<folding>
<element signature="imports" 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/AsyncronousTask.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="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="180">
<caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="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/ThaiAsyncTask.java">
<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="-109">
<caret line="45" column="44" selection-start-line="45" selection-start-column="44" selection-end-line="45" selection-end-column="44" />
<state relative-caret-position="114">
<caret line="45" selection-start-line="45" selection-end-line="45" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......@@ -142,10 +147,26 @@
</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 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" />
</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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="147" column="22" selection-start-line="147" selection-start-column="12" selection-end-line="147" selection-end-column="22" />
<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" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#701#709#0" expanded="true" />
......@@ -163,15 +184,6 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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="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/res/layout/activity_playlist_view.xml">
<provider editor-type-id="text-editor">
......@@ -182,24 +194,6 @@
<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="107">
<caret line="133" column="4" selection-start-line="133" selection-start-column="4" selection-end-line="140" selection-end-column="5" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
......@@ -250,8 +244,6 @@
<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/res/layout/activity_saved_playlists.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_playlist_view.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view.xml" />
......@@ -262,10 +254,14 @@
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java" />
<option value="$PROJECT_DIR$/app/src/main/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/swtViewScreen.java" />
</list>
</option>
</component>
......@@ -564,7 +560,14 @@
<option name="project" value="LOCAL" />
<updated>1558290738536</updated>
</task>
<option name="localTasksCounter" value="8" />
<task id="LOCAL-00008" summary="Half working build playlist feature.">
<created>1558295645577</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1558295645577</updated>
</task>
<option name="localTasksCounter" value="9" />
<servers />
</component>
<component name="TodoView">
......@@ -581,7 +584,7 @@
<editor active="true" />
<layout>
<window_info id="Captures" order="0" side_tool="true" weight="0.25" />
<window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.17310444" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.17310444" />
<window_info id="Structure" order="2" side_tool="true" />
<window_info id="Favorites" order="3" side_tool="true" />
<window_info id="Build Variants" order="4" side_tool="true" />
......@@ -590,10 +593,10 @@
<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 active="true" anchor="bottom" id="Logcat" order="1" sideWeight="0.49959838" visible="true" weight="0.34273624" />
<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.32722145" />
<window_info anchor="bottom" id="Terminal" order="4" visible="true" 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="Build" order="7" sideWeight="0.49932885" weight="0.31593794" />
......@@ -644,10 +647,10 @@
<MESSAGE value="Song screen view with Title, tags and button." />
<MESSAGE value="Song screen view with method added to Play button." />
<MESSAGE value="Song screen view with methods on both pause and play buttons." />
<option name="LAST_COMMIT_MESSAGE" value="Song screen view with methods on both pause and play buttons." />
<MESSAGE value="Half working build playlist feature." />
<option name="LAST_COMMIT_MESSAGE" value="Half working build playlist feature." />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/IndividualPlaylist.java" />
<entry file="file://$PROJECT_DIR$/app/src/main/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" />
......@@ -788,18 +791,6 @@
<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/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_saved_playlists.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="295">
<caret line="30" column="72" selection-start-line="30" selection-start-column="72" selection-end-line="30" selection-end-column="72" />
</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" />
......@@ -842,14 +833,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_swt_view_screen.xml">
<provider editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
</state>
</provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_with_tag_view.xml">
<provider editor-type-id="text-editor">
<state relative-caret-position="735">
......@@ -862,16 +845,6 @@
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="233">
<caret line="160" column="99" selection-start-line="160" selection-start-column="16" selection-end-line="160" selection-end-column="99" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationPage.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="363">
......@@ -921,10 +894,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists.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="60">
<caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
<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/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>
......@@ -936,54 +916,81 @@
</provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java">
<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/java/com/example/soulfood_assignment2/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-109">
<caret line="45" column="44" selection-start-line="45" selection-start-column="44" selection-end-line="45" selection-end-column="44" />
<state relative-caret-position="114">
<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/swtViewScreen.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="136">
<caret line="147" column="22" selection-start-line="147" selection-start-column="12" selection-end-line="147" selection-end-column="22" />
<state relative-caret-position="139">
<caret line="56" selection-start-line="56" selection-end-line="56" />
<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>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/BuildPlaylist.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="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="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>
</provider>
<provider editor-type-id="android-designer2" />
</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/playlistView.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="691">
<caret line="92" column="46" selection-start-line="92" selection-start-column="46" selection-end-line="92" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/playlistView.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/SavedPlaylists2.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="179">
<caret line="84" column="45" lean-forward="true" selection-start-line="84" selection-start-column="45" selection-end-line="84" selection-end-column="45" />
<state relative-caret-position="180">
<caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
</state>
</provider>
</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="129">
<caret line="173" column="100" selection-start-line="173" selection-start-column="100" selection-end-line="173" selection-end-column="100" />
<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>
......
app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists.java deleted 100644 → 0
View file @ 97b9b53f
package com.example.soulfood_assignment2;
import android.content.Context;
import android.content.SharedPreferences;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import java.util.ArrayList;
public class SavedPlaylist extends AppCompatActivity {
public static SharedPreferences playlists;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_saved_playlists);
playlists = getPreferences(Context.MODE_PRIVATE);
SharedPreferences.Editor editor = playlists.edit();
editor.putString("playlist 1", "1");
editor.commit();
ArrayList<String> saved = new ArrayList<>();
saved.add("Playlist " + playlists.getString("playlist 1", "0"));
saved.add("Playlist " + playlists.getString("playlist 2", "0"));
saved.add("Playlist " + playlists.getString("playlist 3", "0"));
for (String s: saved) {
if(s.equals("Playlist 0")) {
saved.remove(s);
}
}
ListView listView = findViewById(R.id.listViewPlaylists);
ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, saved);
listView.setAdapter(adapter);
}
}
app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists2.java 0 → 100644
View file @ 188982d7
package com.example.soulfood_assignment2;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
public class SavedPlaylists2 extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_saved_playlists2);
}
}
app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java
View file @ 188982d7
......@@ -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[7];
public String[] songNames = new String[20];
public ListView listView;
public Context context;
public databaseInterface.Cuisine cuisine;
......
app/src/main/java/com/example/soulfood_assignment2/playlistView.java
View file @ 188982d7
......@@ -19,6 +19,7 @@ import static com.example.soulfood_assignment2.databaseInterface.Vibe.chill;
import static com.example.soulfood_assignment2.databaseInterface.Vibe.energetic;
public class playlistView extends AppCompatActivity {
databaseInterface.Cuisine cuisineTag;
databaseInterface.Vibe vibeTag;
databaseInterface.Time timeTag;
......
app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java
View file @ 188982d7
......@@ -156,22 +156,22 @@ public class swtViewScreen extends AppCompatActivity {
songPage(thaiAsyncTask.songNames[0], thaiAsyncTask.attributesSong1.get(0), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 1:
//songPage(thaiResults.get(1));
songPage(thaiAsyncTask.songNames[1], thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 2:
//songPage(thaiResults.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(4), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 4:
//songPage(chineseResults.get(4));
songPage(thaiAsyncTask.songNames[4], thaiAsyncTask.attributesSong1.get(5), 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;
}
}
......
app/src/main/res/layout/activity_saved_playlists.xml deleted 100644 → 0
View file @ 97b9b53f
<?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.SavedPlaylists">
<TextView
android:id="@+id/textView10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:text="Saved Playlists"
app:layout_constraintBottom_toTopOf="@+id/_dynamic"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.49" />
<ListView
android:layout_width="395dp"
android:layout_height="640dp"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="36dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView10" />
</android.support.constraint.ConstraintLayout>
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