Skip to content

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

Navigation elements added.

parent 93c291f6
Show whitespace changes
Inline Side-by-side
Showing with 239 additions and 192 deletions
.idea/workspace.xml
View file @ 031bf900
...@@ -13,11 +13,7 @@ ...@@ -13,11 +13,7 @@
<last-search-timestamp>1558099117772</last-search-timestamp> <last-search-timestamp>1558099117772</last-search-timestamp>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="2e150a74-2388-4ba3-8805-625472c5af43" name="Default Changelist" comment="As good as working build"> <list default="true" id="2e150a74-2388-4ba3-8805-625472c5af43" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylistView.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlist_view.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlists.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/classAnalysis.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/classAnalysis.bin" afterDir="false" />
...@@ -25,18 +21,14 @@ ...@@ -25,18 +21,14 @@
<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.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/4.10.1/taskHistory/taskHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/taskHistory/taskHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/Listener.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/Listener.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/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/build_playlist.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/homeScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/homeScreen.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/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/java/com/example/soulfood_assignment2/searchScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/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/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_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_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_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/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/build_playlist.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/build_playlist.xml" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/app/out/" /> <ignored path="$PROJECT_DIR$/app/out/" />
...@@ -72,28 +64,28 @@ ...@@ -72,28 +64,28 @@
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
<counts> <counts>
<entry key="class" value="1" /> <entry key="class" value="1" />
<entry key="java" value="89" /> <entry key="java" value="98" />
<entry key="xml" value="41" /> <entry key="xml" value="53" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="CLASS" value="1" /> <entry key="CLASS" value="1" />
<entry key="JAVA" value="89" /> <entry key="JAVA" value="98" />
<entry key="XML" value="41" /> <entry key="XML" value="53" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.edit"> <usages-collector id="statistics.file.extensions.edit">
<counts> <counts>
<entry key="java" value="5803" /> <entry key="java" value="5851" />
<entry key="txt" value="661" /> <entry key="txt" value="736" />
<entry key="xml" value="193" /> <entry key="xml" value="193" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="JAVA" value="5803" /> <entry key="JAVA" value="5851" />
<entry key="PLAIN_TEXT" value="661" /> <entry key="PLAIN_TEXT" value="736" />
<entry key="XML" value="193" /> <entry key="XML" value="193" />
</counts> </counts>
</usages-collector> </usages-collector>
...@@ -101,30 +93,19 @@ ...@@ -101,30 +93,19 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="386"> <state relative-caret-position="329">
<caret line="78" column="5" selection-start-line="78" selection-start-column="5" selection-end-line="78" selection-end-column="5" /> <caret line="124" column="5" selection-start-line="124" selection-start-column="5" selection-end-line="124" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1130#1270#0" expanded="true" />
<element signature="e#1269#1270#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
</file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<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/homeScreen.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="261"> <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" /> <caret line="75" column="4" selection-start-line="75" selection-start-column="4" selection-end-line="78" selection-end-column="5" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
...@@ -134,69 +115,72 @@ ...@@ -134,69 +115,72 @@
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="402"> <state relative-caret-position="269">
<caret line="115" column="38" selection-start-line="115" selection-start-column="38" selection-end-line="115" selection-end-column="38" /> <caret line="98" column="55" selection-start-line="98" selection-start-column="55" selection-end-line="98" selection-end-column="55" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/playlistView.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_search_screen.xml">
<provider selected="true" editor-type-id="text-editor"> <provider editor-type-id="text-editor">
<state relative-caret-position="211"> <state relative-caret-position="165">
<caret line="81" column="45" lean-forward="true" selection-start-line="81" selection-start-column="45" selection-end-line="81" selection-end-column="45" /> <caret line="26" column="35" selection-start-line="26" selection-start-column="35" selection-end-line="26" selection-end-column="35" />
</state> </state>
</provider> </provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_swt_view_screen.xml">
<provider selected="true" editor-type-id="text-editor"> <provider editor-type-id="text-editor">
<state relative-caret-position="-71"> <state relative-caret-position="165">
<caret line="9" column="30" selection-start-line="9" selection-start-column="30" selection-end-line="9" selection-end-column="30" /> <caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
</state> </state>
</provider> </provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/BuildPlaylist.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-91"> <state relative-caret-position="60">
<caret line="10" column="49" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="49" /> <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationPage.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/build_playlist.xml">
<provider selected="true" editor-type-id="text-editor"> <provider editor-type-id="text-editor" />
<state relative-caret-position="-31"> <provider selected="true" editor-type-id="android-designer2" />
<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>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChineseAsyncTask.java"> <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 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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195"> <state relative-caret-position="329">
<caret line="13" selection-start-line="13" selection-end-line="13" /> <caret line="122" column="51" selection-start-line="122" selection-start-column="51" selection-end-line="122" selection-end-column="51" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_playlist_view.xml">
<provider selected="true" editor-type-id="text-editor"> <provider editor-type-id="text-editor">
<state relative-caret-position="-179"> <state relative-caret-position="285">
<caret line="24" selection-start-line="24" selection-end-line="24" /> <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
</state> </state>
</provider> </provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry> </entry>
</file> </file>
</leaf> </leaf>
...@@ -244,8 +228,6 @@ ...@@ -244,8 +228,6 @@
<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/ChineseAsyncTask.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChillAsyncTask.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/res/values/strings.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/build_playlist.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_swt_view_screen.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_with_tag_view.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_with_tag_view.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view.xml" />
...@@ -254,22 +236,25 @@ ...@@ -254,22 +236,25 @@
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view2.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view2.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationPage.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongInformationPage.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.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/playlistView.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists.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/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/SavedPlaylists2.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/Listener.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/Listener.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlist_view.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlist_view.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylistView.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SavedPlaylistView.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/homeScreen.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/homeScreen.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java" /> <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" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
<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" />
</list> </list>
</option> </option>
</component> </component>
...@@ -575,7 +560,14 @@ ...@@ -575,7 +560,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1558295645577</updated> <updated>1558295645577</updated>
</task> </task>
<option name="localTasksCounter" value="9" /> <task id="LOCAL-00009" summary="Cleaned up code for the search view.">
<created>1558305576932</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1558305576932</updated>
</task>
<option name="localTasksCounter" value="10" />
<servers /> <servers />
</component> </component>
<component name="TodoView"> <component name="TodoView">
...@@ -589,6 +581,7 @@ ...@@ -589,6 +581,7 @@
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="801" extended-state="0" /> <frame x="0" y="23" width="1440" height="801" extended-state="0" />
<editor active="true" />
<layout> <layout>
<window_info id="Captures" order="0" side_tool="true" weight="0.25" /> <window_info id="Captures" order="0" side_tool="true" weight="0.25" />
<window_info active="true" 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" />
...@@ -655,7 +648,8 @@ ...@@ -655,7 +648,8 @@
<MESSAGE value="Song screen view with method added to Play 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." /> <MESSAGE value="Song screen view with methods on both pause and play buttons." />
<MESSAGE value="Half working build playlist feature." /> <MESSAGE value="Half working build playlist feature." />
<option name="LAST_COMMIT_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." />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-28/java/util/concurrent/ThreadPoolExecutor.java" /> <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-28/java/util/concurrent/ThreadPoolExecutor.java" />
...@@ -749,14 +743,6 @@ ...@@ -749,14 +743,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_search_screen.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="35" selection-start-line="11" selection-start-column="35" selection-end-line="11" selection-end-column="35" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_loading_screen.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_loading_screen.xml">
<provider editor-type-id="text-editor" /> <provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" /> <provider selected="true" editor-type-id="android-designer2" />
...@@ -771,63 +757,10 @@ ...@@ -771,63 +757,10 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_with_tag_view.xml">
<provider editor-type-id="text-editor">
<state relative-caret-position="735">
<caret line="49" column="15" selection-start-line="49" selection-start-column="15" selection-end-line="49" selection-end-column="15" />
</state>
</provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view2.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_information_page.xml">
<provider editor-type-id="text-editor" /> <provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" /> <provider selected="true" editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/databaseInterface.java">
<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>
</provider>
</entry>
<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>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/build_playlist.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_swt_view_screen.xml">
<provider editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
</state>
</provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_playlist_view.xml">
<provider editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
</state>
</provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_home_screen.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/Listener.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/Listener.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165"> <state relative-caret-position="165">
...@@ -835,25 +768,10 @@ ...@@ -835,25 +768,10 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlist_view.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlists2.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlists2.xml">
<provider editor-type-id="text-editor" /> <provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" /> <provider selected="true" editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/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_saved_playlists.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlists.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225"> <state relative-caret-position="225">
...@@ -893,16 +811,6 @@ ...@@ -893,16 +811,6 @@
</state> </state>
</provider> </provider>
</entry> </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="166">
<caret line="23" column="45" selection-start-line="23" selection-start-column="45" selection-end-line="23" selection-end-column="45" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChineseAsyncTask.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChineseAsyncTask.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195"> <state relative-caret-position="195">
...@@ -913,13 +821,6 @@ ...@@ -913,13 +821,6 @@
</state> </state>
</provider> </provider>
</entry> </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="-179">
<caret line="24" selection-start-line="24" selection-end-line="24" />
</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/swtViewScreen.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-71"> <state relative-caret-position="-71">
...@@ -941,27 +842,56 @@ ...@@ -941,27 +842,56 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_saved_playlist_view.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/databaseInterface.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="402"> <state relative-caret-position="411">
<caret line="115" column="38" selection-start-line="115" selection-start-column="38" selection-end-line="115" selection-end-column="38" /> <caret line="160" selection-start-line="160" selection-end-line="160" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/playlistView.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="211"> <state relative-caret-position="195">
<caret line="81" column="45" lean-forward="true" selection-start-line="81" selection-start-column="45" selection-end-line="81" selection-end-column="45" /> <caret line="13" selection-start-line="13" selection-end-line="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/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">
<caret line="49" column="15" selection-start-line="49" selection-start-column="15" selection-end-line="49" selection-end-column="15" />
</state> </state>
</provider> </provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view2.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml">
<provider editor-type-id="text-editor" /> <provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" /> <provider selected="true" editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/homeScreen.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="261"> <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" /> <caret line="75" column="4" selection-start-line="75" selection-start-column="4" selection-end-line="78" selection-end-column="5" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
...@@ -969,17 +899,79 @@ ...@@ -969,17 +899,79 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_home_screen.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/BuildPlaylist.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="386"> <state relative-caret-position="60">
<caret line="78" column="5" selection-start-line="78" selection-start-column="5" selection-end-line="78" selection-end-column="5" /> <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="329">
<caret line="124" column="5" selection-start-line="124" selection-start-column="5" selection-end-line="124" selection-end-column="5" />
</state>
</provider>
</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/java/com/example/soulfood_assignment2/homeScreen.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> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#1130#1270#0" expanded="true" />
<element signature="e#1269#1270#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/playlistView.java">
<provider selected="true" editor-type-id="text-editor">
<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">
<caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
</state>
</provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_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>
<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>
</component> </component>
</project> </project>
\ No newline at end of file
app/src/main/java/com/example/soulfood_assignment2/build_playlist.java
View file @ 031bf900
...@@ -119,6 +119,11 @@ public class build_playlist extends AppCompatActivity { ...@@ -119,6 +119,11 @@ public class build_playlist extends AppCompatActivity {
startActivity(intent); startActivity(intent);
} }
public void homeScreenViewOnClick(View view) {
Intent intent = new Intent(this, homeScreen.class);
startActivity(intent);
}
} }
app/src/main/java/com/example/soulfood_assignment2/playlistView.java
View file @ 031bf900
package com.example.soulfood_assignment2; package com.example.soulfood_assignment2;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
import android.view.View;
import android.widget.ListView; import android.widget.ListView;
import static com.example.soulfood_assignment2.databaseInterface.Cuisine.american; import static com.example.soulfood_assignment2.databaseInterface.Cuisine.american;
...@@ -92,4 +94,9 @@ public class playlistView extends AppCompatActivity { ...@@ -92,4 +94,9 @@ public class playlistView extends AppCompatActivity {
thaiAsyncTask.execute(); thaiAsyncTask.execute();
playlistView = thaiAsyncTask.listView; playlistView = thaiAsyncTask.listView;
} }
public void newSearchViewOnClick(View view) {
Intent intent = new Intent(this, build_playlist.class);
startActivity(intent);
}
} }
app/src/main/java/com/example/soulfood_assignment2/searchScreen.java
View file @ 031bf900
...@@ -119,5 +119,10 @@ public class searchScreen extends AppCompatActivity { ...@@ -119,5 +119,10 @@ public class searchScreen extends AppCompatActivity {
} }
public void homeScreenViewOnClick(View view) {
Intent intent = new Intent(this, homeScreen.class);
startActivity(intent);
}
} }
\ No newline at end of file
app/src/main/res/layout/activity_playlist_view.xml
View file @ 031bf900
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
android:layout_marginEnd="100dp" android:layout_marginEnd="100dp"
android:layout_marginRight="100dp" android:layout_marginRight="100dp"
android:layout_marginBottom="49dp" android:layout_marginBottom="49dp"
android:onClick="newSearchViewOnClick"
android:text="New Search" android:text="New Search"
app:layout_constraintBottom_toTopOf="@+id/playlistView" app:layout_constraintBottom_toTopOf="@+id/playlistView"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
......
app/src/main/res/layout/activity_search_screen.xml
View file @ 031bf900
...@@ -6,6 +6,21 @@ ...@@ -6,6 +6,21 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".searchScreen"> tools:context=".searchScreen">
<Button
android:id="@+id/button2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="36dp"
android:layout_marginLeft="36dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="21dp"
android:onClick="homeScreenViewOnClick"
android:text="Back"
app:layout_constraintBottom_toTopOf="@+id/textView4"
app:layout_constraintEnd_toStartOf="@+id/textView"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ListView <ListView
android:id="@+id/tagListView" android:id="@+id/tagListView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -29,8 +44,8 @@ ...@@ -29,8 +44,8 @@
android:typeface="sans" android:typeface="sans"
app:fontFamily="sans-serif" app:fontFamily="sans-serif"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498" app:layout_constraintHorizontal_bias="0.207"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toEndOf="@+id/button2"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<SearchView <SearchView
......
app/src/main/res/layout/activity_swt_view_screen.xml
View file @ 031bf900
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
android:id="@+id/songScreen" android:id="@+id/songScreen"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="500dp" android:layout_height="500dp"
android:layout_marginTop="52dp" android:layout_marginTop="36dp"
android:layout_marginBottom="71dp" android:layout_marginBottom="71dp"
android:visibility="visible" android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
...@@ -23,11 +23,13 @@ ...@@ -23,11 +23,13 @@
android:layout_width="128dp" android:layout_width="128dp"
android:layout_height="41dp" android:layout_height="41dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="21dp"
android:text="SoulFood" android:text="SoulFood"
android:textColor="#000000" android:textColor="#000000"
android:textSize="30sp" android:textSize="30sp"
android:typeface="sans" android:typeface="sans"
app:fontFamily="sans-serif" app:fontFamily="sans-serif"
app:layout_constraintBottom_toTopOf="@+id/tagTextView"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
...@@ -36,11 +38,13 @@ ...@@ -36,11 +38,13 @@
android:id="@+id/tagTextView" android:id="@+id/tagTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="75dp" android:layout_marginTop="25dp"
android:layout_marginBottom="41dp"
android:text='Songs with "" Tag' android:text='Songs with "" Tag'
android:textColor="#000000" android:textColor="#000000"
android:textSize="24sp" android:textSize="24sp"
app:layout_constraintBottom_toTopOf="@+id/songScreen"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toBottomOf="@+id/textView5" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/build_playlist.xml
View file @ 031bf900
...@@ -43,6 +43,8 @@ ...@@ -43,6 +43,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginEnd="150dp"
android:layout_marginRight="150dp"
android:layout_marginBottom="50dp" android:layout_marginBottom="50dp"
android:text="SoulFood" android:text="SoulFood"
android:textColor="#000000" android:textColor="#000000"
...@@ -51,8 +53,7 @@ ...@@ -51,8 +53,7 @@
app:fontFamily="sans-serif" app:fontFamily="sans-serif"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498" app:layout_constraintStart_toEndOf="@+id/button"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0" /> app:layout_constraintVertical_bias="0.0" />
...@@ -143,4 +144,21 @@ ...@@ -143,4 +144,21 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cuisine_dropdown" /> app:layout_constraintTop_toBottomOf="@+id/cuisine_dropdown" />
<Button
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="71dp"
android:layout_marginRight="71dp"
android:layout_marginBottom="21dp"
android:onClick="homeScreenViewOnClick"
android:text="Back"
app:layout_constraintBottom_toTopOf="@+id/textView4"
app:layout_constraintEnd_toStartOf="@+id/textView"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment