Skip to content

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

Progress on Asynchronous Data

parent 4e9a8c20
Show whitespace changes
Inline Side-by-side
Showing with 61 additions and 57 deletions
.idea/workspace.xml
View file @ 3275a2a9
......@@ -6,7 +6,6 @@
</shared>
</component>
<component name="AndroidLogFilters">
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="HelpME!!!" />
<option name="TOOL_WINDOW_LOG_LEVEL" value="verbose" />
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
</component>
......@@ -15,7 +14,6 @@
</component>
<component name="ChangeListManager">
<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/ChineseAsyncTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10.1/javaCompile/classAnalysis.bin" afterDir="false" />
......@@ -24,13 +22,8 @@
<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/AsyncTask.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChillAsyncTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChillAsyncTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/build_playlist.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/app/out/" />
......@@ -77,25 +70,25 @@
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="java" value="1406" />
<entry key="txt" value="58" />
<entry key="java" value="1513" />
<entry key="txt" value="69" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="JAVA" value="1406" />
<entry key="PLAIN_TEXT" value="58" />
<entry key="JAVA" value="1513" />
<entry key="PLAIN_TEXT" value="69" />
</counts>
</usages-collector>
</session>
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="111">
<caret line="92" column="20" lean-forward="true" selection-start-line="92" selection-start-column="16" selection-end-line="92" selection-end-column="20" />
<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" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#701#709#0" expanded="true" />
......@@ -143,8 +136,8 @@
<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="235">
<caret line="74" column="69" lean-forward="true" selection-start-line="74" selection-start-column="69" selection-end-line="74" selection-end-column="69" />
<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" />
<folding>
<element signature="e#6295#6296#0" expanded="true" />
<element signature="e#6339#6340#0" expanded="true" />
......@@ -153,11 +146,11 @@
</provider>
</entry>
</file>
<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/ThaiAsyncTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="33" column="9" lean-forward="true" selection-start-line="33" selection-start-column="9" selection-end-line="33" selection-end-column="9" />
<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" />
......@@ -250,8 +243,8 @@
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ChillAsyncTask.java" />
<option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java" />
</list>
</option>
</component>
......@@ -494,7 +487,14 @@
<option name="project" value="LOCAL" />
<updated>1558267120793</updated>
</task>
<option name="localTasksCounter" value="2" />
<task id="LOCAL-00002" summary="Song screen">
<created>1558275478039</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1558275478040</updated>
</task>
<option name="localTasksCounter" value="3" />
<servers />
</component>
<component name="TodoView">
......@@ -519,8 +519,8 @@
<window_info id="Designer" order="6" />
<window_info id="Resources Explorer" order="7" />
<window_info id="Capture Tool" order="8" />
<window_info anchor="bottom" id="Run" order="0" sideWeight="0.49959838" visible="true" weight="0.32863188" />
<window_info anchor="bottom" id="Logcat" order="1" sideWeight="0.49959838" weight="0.34273624" />
<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="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" />
......@@ -568,7 +568,8 @@
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="Async Tasks, search screen and search results" />
<option name="LAST_COMMIT_MESSAGE" value="Async Tasks, search screen and search results" />
<MESSAGE value="Song screen" />
<option name="LAST_COMMIT_MESSAGE" value="Song screen" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_home_screen.xml">
......@@ -779,30 +780,21 @@
</provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java">
<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="111">
<caret line="92" column="20" lean-forward="true" selection-start-line="92" selection-start-column="16" selection-end-line="92" selection-end-column="20" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#701#709#0" expanded="true" />
<element signature="e#769#777#0" expanded="true" />
<element signature="e#839#847#0" expanded="true" />
<element signature="e#911#919#0" expanded="true" />
<element signature="e#982#990#0" expanded="true" />
<element signature="e#1053#1061#0" expanded="true" />
<element signature="e#1123#1131#0" expanded="true" />
<element signature="e#1195#1203#0" expanded="true" />
<element signature="e#1264#1272#0" expanded="true" />
<element signature="e#1333#1341#0" expanded="true" />
</folding>
<state relative-caret-position="60">
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/searchScreen.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="235">
<caret line="74" column="69" lean-forward="true" selection-start-line="74" selection-start-column="69" selection-end-line="74" selection-end-column="69" />
<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" />
<folding>
<element signature="e#6295#6296#0" expanded="true" />
<element signature="e#6339#6340#0" expanded="true" />
......@@ -810,21 +802,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_song_screen_view.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="33" column="9" lean-forward="true" selection-start-line="33" selection-start-column="9" selection-end-line="33" selection-end-column="9" />
<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" />
......@@ -835,5 +816,25 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#701#709#0" expanded="true" />
<element signature="e#769#777#0" expanded="true" />
<element signature="e#839#847#0" expanded="true" />
<element signature="e#911#919#0" expanded="true" />
<element signature="e#982#990#0" expanded="true" />
<element signature="e#1053#1061#0" expanded="true" />
<element signature="e#1123#1131#0" expanded="true" />
<element signature="e#1195#1203#0" expanded="true" />
<element signature="e#1264#1272#0" expanded="true" />
<element signature="e#1333#1341#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java
View file @ 3275a2a9
......@@ -25,6 +25,9 @@ public class ThaiAsyncTask extends AsyncTask<Void, Void, ArrayAdapter<String>>
databaseInterface dbi = new databaseInterface();
thaiResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.thai, databaseInterface.Vibe.any, databaseInterface.Time.any);
for(int i = 0; i < thaiResults.size(); i++) {
Log.d("ThaiResults!!!", thaiResults.get(i));
}
ArrayAdapter thaiAdapter = new ArrayAdapter<String>(
context, android.R.layout.simple_list_item_1, thaiResults
);
......
app/src/main/java/com/example/soulfood_assignment2/searchScreen.java
View file @ 3275a2a9
......@@ -66,7 +66,7 @@ public class searchScreen extends AppCompatActivity {
tagNamePage("Chinese", chineseResults);
break;
case 1:
ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(this);
ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(searchScreen.this);
thaiAsyncTask.listView = findViewById(R.id.tagListView);
thaiAsyncTask.execute();
tagNamePage("Thai", thaiResults);
......
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