Skip to content

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

Song screen view with button

parent 3275a2a9
Show whitespace changes
Inline Side-by-side
Showing with 247 additions and 233 deletions
.idea/workspace.xml
View file @ cdd3785a
......@@ -6,6 +6,7 @@
</shared>
</component>
<component name="AndroidLogFilters">
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="thai" />
<option name="TOOL_WINDOW_LOG_LEVEL" value="verbose" />
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
</component>
......@@ -14,6 +15,7 @@
</component>
<component name="ChangeListManager">
<list default="true" id="2e150a74-2388-4ba3-8805-625472c5af43" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_song_with_tag_view.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/classAnalysis.bin" afterDir="false" />
......@@ -24,6 +26,9 @@
<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/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/searchScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/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" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/app/out/" />
......@@ -57,38 +62,52 @@
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="class" value="1" />
<entry key="java" value="22" />
<entry key="xml" value="7" />
<entry key="java" value="24" />
<entry key="xml" value="12" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CLASS" value="1" />
<entry key="JAVA" value="22" />
<entry key="XML" value="7" />
<entry key="JAVA" value="24" />
<entry key="XML" value="12" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="java" value="1513" />
<entry key="txt" value="69" />
<entry key="java" value="1768" />
<entry key="txt" value="210" />
<entry key="xml" value="95" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="JAVA" value="1513" />
<entry key="PLAIN_TEXT" value="69" />
<entry key="JAVA" value="1768" />
<entry key="PLAIN_TEXT" value="210" />
<entry key="XML" value="95" />
</counts>
</usages-collector>
</session>
</component>
<component name="FileEditorManager">
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="34" selection-start-line="34" selection-end-line="34" />
<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/swtViewScreen.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="817">
<caret line="108" column="21" lean-forward="true" selection-start-line="108" selection-start-column="21" selection-end-line="108" selection-end-column="21" />
<state relative-caret-position="375">
<caret line="77" selection-start-line="77" selection-end-line="77" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#701#709#0" expanded="true" />
......@@ -106,38 +125,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/JapaneseAsyncTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="156">
<caret line="34" column="46" selection-start-line="34" selection-start-column="24" selection-end-line="34" selection-end-column="46" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ItalianAsyncTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="15" column="35" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="35" />
</state>
</provider>
</entry>
</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/searchScreen.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="164">
<caret line="70" column="48" lean-forward="true" selection-start-line="70" selection-start-column="48" selection-end-line="70" selection-end-column="48" />
<state relative-caret-position="-1079">
<caret line="68" column="61" selection-start-line="68" selection-start-column="61" selection-end-line="68" selection-end-column="61" />
<folding>
<element signature="e#6295#6296#0" expanded="true" />
<element signature="e#6339#6340#0" expanded="true" />
......@@ -147,32 +139,32 @@
</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/SongScreenView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="28" column="60" selection-start-line="28" selection-start-column="60" selection-end-line="28" selection-end-column="60" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#472#473#0" expanded="true" />
<element signature="e#510#511#0" expanded="true" />
<element signature="e#1076#1077#0" expanded="true" />
<element signature="e#1115#1116#0" expanded="true" />
</folding>
<state>
<caret column="8" selection-start-column="8" selection-end-column="8" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java">
<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" />
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_with_tag_view.xml">
<provider editor-type-id="text-editor">
<state relative-caret-position="150">
<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>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view.xml">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/build_playlist.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
......@@ -180,22 +172,38 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_swt_view_screen.xml">
<provider editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="28" column="35" selection-start-line="28" selection-start-column="35" selection-end-line="28" selection-end-column="35" />
<state 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/AmericanAsyncTask.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
<state relative-caret-position="365">
<caret line="45" selection-start-line="45" selection-end-line="45" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#502#503#0" expanded="true" />
<element signature="e#539#540#0" expanded="true" />
<element signature="e#1367#1368#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_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>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
......@@ -203,6 +211,7 @@
<list>
<option value="Class" />
<option value="valueResourceFile" />
<option value="layoutResourceFile" />
</list>
</option>
</component>
......@@ -234,7 +243,6 @@
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/app/build.gradle" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_swt_view_screen.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/homeScreen.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChineseAsyncImpl.java" />
......@@ -242,9 +250,12 @@
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChineseAsyncTask.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChillAsyncTask.java" />
<option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
<option value="$PROJECT_DIR$/app/src/main/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/java/com/example/soulfood_assignment2/swtViewScreen.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/ThaiAsyncTask.java" />
</list>
</option>
</component>
......@@ -273,6 +284,19 @@
<item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="app" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="soulfood_working" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="app" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="build" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="soulfood_working" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="app" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="build" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="generated" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="soulfood_working" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
......@@ -494,7 +518,14 @@
<option name="project" value="LOCAL" />
<updated>1558275478040</updated>
</task>
<option name="localTasksCounter" value="3" />
<task id="LOCAL-00003" summary="Progress on Asynchronous Data">
<created>1558276170295</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1558276170295</updated>
</task>
<option name="localTasksCounter" value="4" />
<servers />
</component>
<component name="TodoView">
......@@ -523,7 +554,7 @@
<window_info anchor="bottom" id="Logcat" order="1" sideWeight="0.49959838" visible="true" weight="0.34273624" />
<window_info anchor="bottom" id="TODO" order="2" sideWeight="0.49959838" weight="0.32796487" />
<window_info anchor="bottom" id="Debug" order="3" />
<window_info anchor="bottom" id="Terminal" order="4" weight="0.32796487" />
<window_info anchor="bottom" id="Terminal" order="4" weight="0.32722145" />
<window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.50067115" side_tool="true" weight="0.3133236" />
<window_info anchor="bottom" id="Version Control" order="6" sideWeight="0.49959838" weight="0.32796487" />
<window_info anchor="bottom" id="Build" order="7" sideWeight="0.49932885" weight="0.31593794" />
......@@ -569,7 +600,8 @@
<component name="VcsManagerConfiguration">
<MESSAGE value="Async Tasks, search screen and search results" />
<MESSAGE value="Song screen" />
<option name="LAST_COMMIT_MESSAGE" value="Song screen" />
<MESSAGE value="Progress on Asynchronous Data" />
<option name="LAST_COMMIT_MESSAGE" value="Progress on Asynchronous Data" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_home_screen.xml">
......@@ -589,16 +621,6 @@
<entry file="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/spotify-app-remote-release-0.6.1.aar/c6916b27e6bb07c1ecebea46c4dc5fc0/jars/classes.jar!/com/spotify/android/appremote/internal/RemoteServiceIo.class" />
<entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-28/java/lang/Thread.java" />
<entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-28/java/util/concurrent/ThreadPoolExecutor.java" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/settings.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="34" selection-start-line="34" selection-end-line="34" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
......@@ -772,54 +794,36 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_swt_view_screen.xml">
<provider editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="28" column="35" selection-start-line="28" selection-start-column="35" selection-end-line="28" selection-end-column="35" />
</state>
</provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view.xml">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.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="164">
<caret line="70" column="48" lean-forward="true" selection-start-line="70" selection-start-column="48" selection-end-line="70" selection-end-column="48" />
<state relative-caret-position="315">
<caret line="34" selection-start-line="34" selection-end-line="34" />
<folding>
<element signature="e#6295#6296#0" expanded="true" />
<element signature="e#6339#6340#0" expanded="true" />
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java">
<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="150">
<caret line="28" column="60" selection-start-line="28" selection-start-column="60" selection-end-line="28" selection-end-column="60" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#472#473#0" expanded="true" />
<element signature="e#510#511#0" expanded="true" />
<element signature="e#1076#1077#0" expanded="true" />
<element signature="e#1115#1116#0" expanded="true" />
</folding>
<state 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/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/swtViewScreen.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="817">
<caret line="108" column="21" lean-forward="true" selection-start-line="108" selection-start-column="21" selection-end-line="108" selection-end-column="21" />
<state relative-caret-position="375">
<caret line="77" selection-start-line="77" selection-end-line="77" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#701#709#0" expanded="true" />
......@@ -836,5 +840,56 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_with_tag_view.xml">
<provider editor-type-id="text-editor">
<state relative-caret-position="150">
<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_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/ThaiAsyncTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="365">
<caret line="45" selection-start-line="45" selection-end-line="45" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#502#503#0" expanded="true" />
<element signature="e#539#540#0" expanded="true" />
<element signature="e#1367#1368#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="8" selection-start-column="8" selection-end-column="8" />
</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="-1079">
<caret line="68" column="61" selection-start-line="68" selection-start-column="61" selection-end-line="68" selection-end-column="61" />
<folding>
<element signature="e#6295#6296#0" expanded="true" />
<element signature="e#6339#6340#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java
View file @ cdd3785a
package com.example.soulfood_assignment2;
import android.app.Activity;
import android.content.Context;
import android.os.AsyncTask;
import android.util.Log;
......
app/src/main/java/com/example/soulfood_assignment2/searchScreen.java
View file @ cdd3785a
......@@ -19,6 +19,7 @@ import java.util.Arrays;
public class searchScreen extends AppCompatActivity {
public ListView searchResults;
public ListView songResults;
public ArrayAdapter<String> adapter;
public ArrayList<String> chineseResults;
......@@ -33,8 +34,6 @@ public class searchScreen extends AppCompatActivity {
public ArrayList<String> happyResults;
public ArrayList<String> energeticResults;
public static ArrayList<String> testArray;
public Intent vibeView;
......@@ -43,8 +42,8 @@ public class searchScreen extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_search_screen);
searchResults = findViewById(R.id.tagListView);
songResults = findViewById(R.id.charleyNeedsHelp);
ArrayList<String> searchResultsArray = new ArrayList<>();
searchResultsArray.addAll(Arrays.asList(getResources().getStringArray(R.array.searchResultsArray)));
......@@ -67,7 +66,7 @@ public class searchScreen extends AppCompatActivity {
break;
case 1:
ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(searchScreen.this);
thaiAsyncTask.listView = findViewById(R.id.tagListView);
thaiAsyncTask.listView = songResults;
thaiAsyncTask.execute();
tagNamePage("Thai", thaiResults);
break;
......
app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java
View file @ cdd3785a
......@@ -59,11 +59,11 @@ public class swtViewScreen extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_swt_view_screen);
setContentView(R.layout.activity_song_with_tag_view);
String title = getIntent().getStringExtra("tag_name");
final ArrayList<String> testArray = getIntent().getStringArrayListExtra("results_array");
tagNameView = findViewById(R.id.tagTextView);
tagNameView = findViewById(R.id.tagTextView2);
tagNameView.setText(title);
chineseResults.addAll(Arrays.asList(getResources().getStringArray(R.array.chineseSearchResultsArray)));
......@@ -106,7 +106,7 @@ public class swtViewScreen extends AppCompatActivity {
);
tagResults = findViewById(R.id.tagListView);
tagResults = findViewById(R.id.charleyNeedsHelp);
if (tagNameView.getText().toString().equals("Songs with 'Chinese' Tag")) {
......
app/src/main/res/layout/activity_song_screen_view.xml
View file @ cdd3785a
......@@ -70,4 +70,14 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/timeOfDayTagView" />
<Button
android:id="@+id/button2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Play/Pause"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
tools:layout_editor_absoluteY="611dp" />
</android.support.constraint.ConstraintLayout>
app/src/main/res/layout/activity_song_with_tag_view.xml 0 → 100644
View file @ cdd3785a
<?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">
<TextView
android:id="@+id/textView6"
android:layout_width="128dp"
android:layout_height="41dp"
android:layout_marginTop="16dp"
android:text="SoulFood"
android:textColor="#000000"
android:textSize="30sp"
android:typeface="sans"
app:fontFamily="sans-serif"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tagTextView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="27dp"
android:layout_marginBottom="42dp"
android:text='Songs with "" Tag'
android:textColor="#000000"
android:textSize="24sp"
app:layout_constraintBottom_toTopOf="@+id/charleyNeedsHelp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView6" />
<ListView
android:id="@+id/charleyNeedsHelp"
android:layout_width="wrap_content"
android:layout_height="500dp"
android:layout_marginTop="41dp"
android:layout_marginBottom="73dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tagTextView2">
</ListView>
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_swt_view_screen.xml
View file @ cdd3785a
......@@ -7,15 +7,16 @@
tools:context=".swtViewScreen">
<ListView
android:id="@+id/tagListView"
android:layout_width="386dp"
android:layout_height="504dp"
android:layout_marginTop="150dp"
android:padding="20dp"
android:id="@+id/songScreen"
android:layout_width="wrap_content"
android:layout_height="500dp"
android:layout_marginTop="52dp"
android:layout_marginBottom="71dp"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="MissingConstraints"></ListView>
app:layout_constraintTop_toBottomOf="@+id/tagTextView"></ListView>
<TextView
android:id="@+id/textView5"
......
app/src/main/res/layout/build_playlist.xml
View file @ cdd3785a
......@@ -6,39 +6,20 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<Spinner
android:id="@+id/occasion_dropdown"
android:layout_width="357dp"
android:layout_height="36dp"
android:layout_marginStart="45dp"
android:layout_marginLeft="45dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="45dp"
android:layout_marginRight="45dp"
android:layout_marginBottom="8dp"
android:background="?android:attr/colorButtonNormal"
android:spinnerMode="dropdown"
app:layout_constraintBottom_toTopOf="@+id/textView7"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView6" />
<Spinner
android:id="@+id/tod_dropdown"
android:layout_width="357dp"
android:layout_height="36dp"
android:layout_marginStart="45dp"
android:layout_marginLeft="45dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="45dp"
android:layout_marginRight="45dp"
android:layout_marginBottom="8dp"
android:layout_marginBottom="150dp"
android:background="?android:attr/colorButtonNormal"
android:spinnerMode="dropdown"
app:layout_constraintBottom_toTopOf="@+id/textView6"
app:layout_constraintBottom_toTopOf="@+id/button4"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView8" />
app:layout_constraintStart_toStartOf="parent" />
<Spinner
android:id="@+id/cuisine_dropdown"
......@@ -130,50 +111,16 @@
app:layout_constraintTop_toBottomOf="@+id/textView"
app:layout_constraintVertical_bias="1.0" />
<TextView
android:id="@+id/textView6"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:layout_marginStart="45dp"
android:layout_marginLeft="45dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="345dp"
android:layout_marginRight="345dp"
android:layout_marginBottom="8dp"
android:text="Occasion"
android:textColor="#000000"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/occasion_dropdown"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tod_dropdown" />
<TextView
android:id="@+id/textView7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="30dp"
android:text="Common Tags"
android:textColor="#000000"
android:textSize="24sp"
android:textStyle="bold"
android:typeface="sans"
app:fontFamily="sans-serif"
app:layout_constraintBottom_toTopOf="@+id/button4"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/occasion_dropdown" />
<Button
android:id="@+id/button4"
android:layout_width="348dp"
android:layout_height="42dp"
android:layout_marginBottom="20dp"
android:layout_marginBottom="10dp"
android:onClick="buildPlaylistOnClick"
android:text="Build"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.428"
app:layout_constraintStart_toStartOf="parent" />
<TextView
......@@ -196,56 +143,4 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cuisine_dropdown" />
<TextView
android:id="@+id/textView19"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="50dp"
android:layout_marginLeft="50dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:text="Tag"
app:layout_constraintBottom_toTopOf="@+id/button4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView7" />
<TextView
android:id="@+id/textView20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="150dp"
android:layout_marginLeft="150dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:text="Tag"
app:layout_constraintBottom_toTopOf="@+id/button4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView7" />
<TextView
android:id="@+id/textView21"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="250dp"
android:layout_marginLeft="250dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:text="Tag"
app:layout_constraintBottom_toTopOf="@+id/button4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView7" />
<TextView
android:id="@+id/textView22"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="325dp"
android:layout_marginLeft="325dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:text="Tag"
app:layout_constraintBottom_toTopOf="@+id/button4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView7" />
</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