Skip to content

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

My final commit.

parent 6726c3b4
Show whitespace changes
Inline Side-by-side
Showing with 166 additions and 216 deletions
.idea/workspace.xml
View file @ fa7ba703
......@@ -22,13 +22,13 @@
<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/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/ImageDownload.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java" 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/SavedPlaylists.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongScreenView.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/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/res/layout/activity_playlist_view.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_playlist_view.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_search_screen.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_search_screen.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_swt_view_screen.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_swt_view_screen.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/build_playlist.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/build_playlist.xml" 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" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/app/out/" />
......@@ -64,28 +64,28 @@
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="class" value="1" />
<entry key="java" value="98" />
<entry key="java" value="106" />
<entry key="xml" value="53" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CLASS" value="1" />
<entry key="JAVA" value="98" />
<entry key="JAVA" value="106" />
<entry key="XML" value="53" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="java" value="5851" />
<entry key="txt" value="736" />
<entry key="java" value="5865" />
<entry key="txt" value="764" />
<entry key="xml" value="193" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="JAVA" value="5851" />
<entry key="PLAIN_TEXT" value="736" />
<entry key="JAVA" value="5865" />
<entry key="PLAIN_TEXT" value="764" />
<entry key="XML" value="193" />
</counts>
</usages-collector>
......@@ -94,95 +94,105 @@
<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">
<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="329">
<caret line="124" column="5" selection-start-line="124" selection-start-column="5" selection-end-line="124" selection-end-column="5" />
<state relative-caret-position="105">
<caret line="7" column="10" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
</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">
<file pinned="false" current-in-tab="true">
<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="276">
<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 relative-caret-position="572">
<caret line="118" lean-forward="true" selection-start-line="118" selection-end-line="118" />
</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">
<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="269">
<caret line="98" column="55" selection-start-line="98" selection-start-column="55" selection-end-line="98" selection-end-column="55" />
<state relative-caret-position="-2188">
<caret line="12" column="57" selection-start-line="12" selection-start-column="57" selection-end-line="12" selection-end-column="57" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_search_screen.xml">
<provider editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="26" column="35" selection-start-line="26" selection-start-column="35" selection-end-line="26" selection-end-column="35" />
</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/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/SpotifyClass.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</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/src/main/java/com/example/soulfood_assignment2/BuildPlaylist.java">
<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="60">
<caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
<caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
</state>
</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/SongScreenView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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 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="-88">
<caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
<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/searchScreen.java">
<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="329">
<caret line="122" column="51" selection-start-line="122" selection-start-column="51" selection-end-line="122" selection-end-column="51" />
<state relative-caret-position="-164">
<caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
<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/res/layout/activity_playlist_view.xml">
<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="285">
<caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
<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="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="90">
<caret line="6" column="23" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
......@@ -247,7 +257,6 @@
<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/settings.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/playlistView.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/build_playlist.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/build_playlist.xml" />
......@@ -255,6 +264,7 @@
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_search_screen.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.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/playlistView.java" />
</list>
</option>
</component>
......@@ -567,7 +577,14 @@
<option name="project" value="LOCAL" />
<updated>1558305576932</updated>
</task>
<option name="localTasksCounter" value="10" />
<task id="LOCAL-00010" summary="Navigation elements added.">
<created>1558307132579</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1558307132579</updated>
</task>
<option name="localTasksCounter" value="11" />
<servers />
</component>
<component name="TodoView">
......@@ -593,12 +610,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" 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="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.32722145" />
<window_info anchor="bottom" id="Version Control" order="6" sideWeight="0.49959838" visible="true" weight="0.0" />
<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" />
......@@ -649,10 +666,10 @@
<MESSAGE value="Song screen view with methods on both pause and play buttons." />
<MESSAGE value="Half working build playlist feature." />
<MESSAGE value="Cleaned up code for the search view." />
<option name="LAST_COMMIT_MESSAGE" value="Cleaned up code for the search view." />
<MESSAGE value="Navigation elements added." />
<option name="LAST_COMMIT_MESSAGE" value="Navigation elements added." />
</component>
<component name="editorHistoryManager">
<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">
<state relative-caret-position="180">
......@@ -750,13 +767,6 @@
<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_song_information_page.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
......@@ -780,13 +790,6 @@
</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="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/SavedPlaylists2.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
......@@ -794,16 +797,6 @@
</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/AsyncronousTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
......@@ -828,20 +821,6 @@
</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="-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/SongInformationPage.java">
<provider selected="true" editor-type-id="text-editor">
<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_playlist_view.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
......@@ -866,13 +845,6 @@
</state>
</provider>
</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="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/res/layout/activity_song_with_tag_view.xml">
<provider editor-type-id="text-editor">
<state relative-caret-position="735">
......@@ -889,16 +861,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/settings.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<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/res/layout/activity_home_screen.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
......@@ -935,20 +897,6 @@
</state>
</provider>
</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="269">
<caret line="98" column="55" selection-start-line="98" selection-start-column="55" selection-end-line="98" selection-end-column="55" />
</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="329">
<caret line="122" column="51" selection-start-line="122" selection-start-column="51" selection-end-line="122" selection-end-column="51" />
</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">
......@@ -973,5 +921,87 @@
</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="-2188">
<caret line="12" column="57" selection-start-line="12" selection-start-column="57" selection-end-line="12" selection-end-column="57" />
</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="90">
<caret line="6" column="23" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
</state>
</provider>
</entry>
<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="105">
<caret line="7" column="10" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SpotifyClass.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
<folding>
<element signature="imports" 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="30">
<caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
</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="-88">
<caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ImageDownload.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-368">
<caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</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="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/SavedPlaylists.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-164">
<caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</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="572">
<caret line="118" lean-forward="true" selection-start-line="118" selection-end-line="118" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
app/src/main/java/com/example/soulfood_assignment2/ImageDownload.java deleted 100644 → 0
View file @ 6726c3b4
package com.example.soulfood_assignment2;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.AsyncTask;
import android.widget.ImageView;
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
public class ImageDownload extends AsyncTask<Void, Integer, Bitmap> {
private ImageView imageView;
@Override
protected void onPostExecute(Bitmap bitmap) {
imageView.setImageBitmap(bitmap);
}
protected Bitmap doInBackground(Void... voids) {
String input = "https://www.google.com/url?sa=i&source=images&cd=&ved=2ahUKEwjTiLq3kILiAhUy-YUKHWIGAfsQjRx6BAgBEAU&url=%2Furl%3Fsa%3Di%26source%3Dimages%26cd%3D%26ved%3D%26url%3Dhttps%253A%252F%252Fwww.livescience.com%252F65030-usda-kitten-cannibalism-research.html%26psig%3DAOvVaw332JT_6QbGREdBtXpwrLdP%26ust%3D1557067990379601&psig=AOvVaw332JT_6QbGREdBtXpwrLdP&ust=1557067990379601";
try {
URL someURL = new URL(input);
URLConnection conn = someURL.openConnection();
InputStream is = conn.getInputStream();
BufferedInputStream stream = new BufferedInputStream(is);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
int intInput = stream.read();
int ticker = 0;
while(intInput != 1) {
ticker++;
if(ticker%100 == 0) {
publishProgress(baos.size());
}
baos.write(intInput);
intInput = stream.read();
}
byte[] imageBytes = baos.toByteArray();
Bitmap bmp = BitmapFactory.decodeByteArray(imageBytes,0, imageBytes.length);
return bmp;
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
}
app/src/main/java/com/example/soulfood_assignment2/MainActivity.java
View file @ fa7ba703
package com.example.soulfood_assignment2;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.View;
import android.widget.ProgressBar;
......@@ -11,9 +11,6 @@ import android.widget.Toast;
import com.spotify.android.appremote.api.ConnectionParams;
import com.spotify.android.appremote.api.Connector;
import com.spotify.android.appremote.api.SpotifyAppRemote;
import com.spotify.android.appremote.api.error.CouldNotFindSpotifyApp;
import com.spotify.android.appremote.api.error.NotLoggedInException;
import com.spotify.android.appremote.api.error.UserNotAuthorizedException;
import com.spotify.sdk.android.authentication.AuthenticationClient;
import com.spotify.sdk.android.authentication.AuthenticationRequest;
import com.spotify.sdk.android.authentication.AuthenticationResponse;
......
app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists.java
View file @ fa7ba703
......@@ -2,9 +2,8 @@ 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.support.v7.app.AppCompatActivity;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.Toast;
......
app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java
View file @ fa7ba703
package com.example.soulfood_assignment2;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.widget.TextView;
......
app/src/main/java/com/example/soulfood_assignment2/playlistView.java
View file @ fa7ba703
......@@ -96,7 +96,7 @@ public class playlistView extends AppCompatActivity {
playlistView = thaiAsyncTask.listView;
Button save = (Button)findViewById(R.id.saveButton);
save.setOnClickListener(save()); //when the button is pressed save should be implemeted
//save.setOnClickListener(save()); //when the button is pressed save should be implemeted
// but unfortunately i cant find the array list to put in
}
......@@ -108,11 +108,11 @@ public class playlistView extends AppCompatActivity {
*/
private void save(ArrayList<String> songs) {
databaseInterface dbi = new databaseInterface(); // so we can use database methods
String id = dbi.savePlaylist(songs); // save in the database, hopefully
// String id = dbi.savePlaylist(songs); // save in the database, hopefully
// that method returns the saved id so we can put it in the shared preference
SavedPlaylists savedPlaylists = new SavedPlaylists(); //so we can save in the shared preference
savedPlaylists.savePlaylist(id); // saves as a shared preference
// savedPlaylists.savePlaylist(id); // saves as a shared preference
}
}
app/src/main/java/com/example/soulfood_assignment2/searchScreen.java
View file @ fa7ba703
package com.example.soulfood_assignment2;
import android.app.Activity;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
import android.support.v7.app.AppCompatActivity;
import android.view.Menu;
import android.view.View;
import android.widget.AdapterView;
......@@ -13,7 +11,6 @@ import android.widget.ListView;
import android.widget.SearchView;
import android.widget.Toast;
import java.util.AbstractList;
import java.util.ArrayList;
import java.util.Arrays;
......
app/src/main/java/com/example/soulfood_assignment2/settings.java
View file @ fa7ba703
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;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.SeekBar;
import android.widget.Spinner;
import android.widget.Toast;
import static android.R.layout.simple_spinner_dropdown_item;
public class settings extends AppCompatActivity {
public SeekBar volSeekBar;
......
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