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
Expand all Show whitespace changes
Inline Side-by-side
Showing with 247 additions and 233 deletions
.idea/workspace.xml
View file @ cdd3785a
This diff is collapsed.
app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java
View file @ cdd3785a
package com.example.soulfood_assignment2; package com.example.soulfood_assignment2;
import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.util.Log; 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; ...@@ -19,6 +19,7 @@ import java.util.Arrays;
public class searchScreen extends AppCompatActivity { public class searchScreen extends AppCompatActivity {
public ListView searchResults; public ListView searchResults;
public ListView songResults;
public ArrayAdapter<String> adapter; public ArrayAdapter<String> adapter;
public ArrayList<String> chineseResults; public ArrayList<String> chineseResults;
...@@ -33,8 +34,6 @@ public class searchScreen extends AppCompatActivity { ...@@ -33,8 +34,6 @@ public class searchScreen extends AppCompatActivity {
public ArrayList<String> happyResults; public ArrayList<String> happyResults;
public ArrayList<String> energeticResults; public ArrayList<String> energeticResults;
public static ArrayList<String> testArray;
public Intent vibeView; public Intent vibeView;
...@@ -43,8 +42,8 @@ public class searchScreen extends AppCompatActivity { ...@@ -43,8 +42,8 @@ public class searchScreen extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_search_screen); setContentView(R.layout.activity_search_screen);
searchResults = findViewById(R.id.tagListView); searchResults = findViewById(R.id.tagListView);
songResults = findViewById(R.id.charleyNeedsHelp);
ArrayList<String> searchResultsArray = new ArrayList<>(); ArrayList<String> searchResultsArray = new ArrayList<>();
searchResultsArray.addAll(Arrays.asList(getResources().getStringArray(R.array.searchResultsArray))); searchResultsArray.addAll(Arrays.asList(getResources().getStringArray(R.array.searchResultsArray)));
...@@ -67,7 +66,7 @@ public class searchScreen extends AppCompatActivity { ...@@ -67,7 +66,7 @@ public class searchScreen extends AppCompatActivity {
break; break;
case 1: case 1:
ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(searchScreen.this); ThaiAsyncTask thaiAsyncTask = new ThaiAsyncTask(searchScreen.this);
thaiAsyncTask.listView = findViewById(R.id.tagListView); thaiAsyncTask.listView = songResults;
thaiAsyncTask.execute(); thaiAsyncTask.execute();
tagNamePage("Thai", thaiResults); tagNamePage("Thai", thaiResults);
break; break;
......
app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java
View file @ cdd3785a
...@@ -59,11 +59,11 @@ public class swtViewScreen extends AppCompatActivity { ...@@ -59,11 +59,11 @@ public class swtViewScreen extends AppCompatActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(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"); String title = getIntent().getStringExtra("tag_name");
final ArrayList<String> testArray = getIntent().getStringArrayListExtra("results_array"); final ArrayList<String> testArray = getIntent().getStringArrayListExtra("results_array");
tagNameView = findViewById(R.id.tagTextView); tagNameView = findViewById(R.id.tagTextView2);
tagNameView.setText(title); tagNameView.setText(title);
chineseResults.addAll(Arrays.asList(getResources().getStringArray(R.array.chineseSearchResultsArray))); chineseResults.addAll(Arrays.asList(getResources().getStringArray(R.array.chineseSearchResultsArray)));
...@@ -106,7 +106,7 @@ public class swtViewScreen extends AppCompatActivity { ...@@ -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")) { 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 @@ ...@@ -70,4 +70,14 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/timeOfDayTagView" /> 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> </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 @@ ...@@ -7,15 +7,16 @@
tools:context=".swtViewScreen"> tools:context=".swtViewScreen">
<ListView <ListView
android:id="@+id/tagListView" android:id="@+id/songScreen"
android:layout_width="386dp" android:layout_width="wrap_content"
android:layout_height="504dp" android:layout_height="500dp"
android:layout_marginTop="150dp" android:layout_marginTop="52dp"
android:padding="20dp" android:layout_marginBottom="71dp"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
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/tagTextView"></ListView>
tools:ignore="MissingConstraints"></ListView>
<TextView <TextView
android:id="@+id/textView5" android:id="@+id/textView5"
......
app/src/main/res/layout/build_playlist.xml
View file @ cdd3785a
...@@ -6,39 +6,20 @@ ...@@ -6,39 +6,20 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="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 <Spinner
android:id="@+id/tod_dropdown" android:id="@+id/tod_dropdown"
android:layout_width="357dp" android:layout_width="357dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginStart="45dp" android:layout_marginStart="45dp"
android:layout_marginLeft="45dp" android:layout_marginLeft="45dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="45dp" android:layout_marginEnd="45dp"
android:layout_marginRight="45dp" android:layout_marginRight="45dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="150dp"
android:background="?android:attr/colorButtonNormal" android:background="?android:attr/colorButtonNormal"
android:spinnerMode="dropdown" android:spinnerMode="dropdown"
app:layout_constraintBottom_toTopOf="@+id/textView6" app:layout_constraintBottom_toTopOf="@+id/button4"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintTop_toBottomOf="@+id/textView8" />
<Spinner <Spinner
android:id="@+id/cuisine_dropdown" android:id="@+id/cuisine_dropdown"
...@@ -130,50 +111,16 @@ ...@@ -130,50 +111,16 @@
app:layout_constraintTop_toBottomOf="@+id/textView" app:layout_constraintTop_toBottomOf="@+id/textView"
app:layout_constraintVertical_bias="1.0" /> 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 <Button
android:id="@+id/button4" android:id="@+id/button4"
android:layout_width="348dp" android:layout_width="348dp"
android:layout_height="42dp" android:layout_height="42dp"
android:layout_marginBottom="20dp" android:layout_marginBottom="10dp"
android:onClick="buildPlaylistOnClick" android:onClick="buildPlaylistOnClick"
android:text="Build" android:text="Build"
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.428"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<TextView <TextView
...@@ -196,56 +143,4 @@ ...@@ -196,56 +143,4 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cuisine_dropdown" /> 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> </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