Skip to content

S
soulfood
Commit 1bd3a808 authored by jade.woodward's avatar jade.woodward
Browse files
Options

Merge branch 'master' of https://git.yorkdc.net:8888/charley.punshon/soulfood

parents e52ed63a 93c291f6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 370 additions and 742 deletions
.idea/workspace.xml
View file @ 1bd3a808
This diff is collapsed.
app/src/main/AndroidManifest.xml
View file @ 1bd3a808
......@@ -11,7 +11,8 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".SongInformationPage"></activity>
<activity android:name=".SavedPlaylistView"></activity>
<activity android:name=".SongInformationPage" />
<activity android:name=".SongScreenView" />
<activity android:name=".playlistView" />
<activity android:name=".SavedPlaylists" />
......
app/src/main/java/com/example/soulfood_assignment2/AmericanAsyncTask.java deleted 100644 → 0
View file @ e52ed63a
package com.example.soulfood_assignment2;
import android.os.AsyncTask;
import android.util.Log;
import java.util.ArrayList;
public class AmericanAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
public ArrayList<String> americanResults;
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
americanResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.american, databaseInterface.Vibe.any, databaseInterface.Time.any);
for(int i = 0; i < americanResults.size(); i++) {
Log.d("AmericanResults!!", americanResults.get(i));
}
return americanResults;
}
}
app/src/main/java/com/example/soulfood_assignment2/ChillAsyncTask.java deleted 100644 → 0
View file @ e52ed63a
package com.example.soulfood_assignment2;
import android.os.AsyncTask;
import android.util.Log;
import android.support.v7.app.AppCompatActivity;
import java.util.ArrayList;
public class ChillAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
public ArrayList<String> chillResults;
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
chillResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.any, databaseInterface.Vibe.chill, databaseInterface.Time.any);
for(int i = 0; i < chillResults.size(); i++) {
Log.d("ChillResults!!", chillResults.get(i));
}
return chillResults;
}
}
app/src/main/java/com/example/soulfood_assignment2/ChineseAsyncTask.java deleted 100644 → 0
View file @ e52ed63a
package com.example.soulfood_assignment2;
import android.os.AsyncTask;
import android.util.Log;
import java.util.ArrayList;
public class ChineseAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
public ArrayList<String> chineseResults;
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
chineseResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.chinese, databaseInterface.Vibe.any, databaseInterface.Time.any);
for (int i = 0; i < chineseResults.size(); i++) {
Log.d("HappyResults!!", chineseResults.get(i));
}
return chineseResults;
}
}
app/src/main/java/com/example/soulfood_assignment2/EnergeticAsyncTask.java deleted 100644 → 0
View file @ e52ed63a
package com.example.soulfood_assignment2;
import android.os.AsyncTask;
import android.util.Log;
import java.util.ArrayList;
public class EnergeticAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
public ArrayList<String> energeticResults;
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
energeticResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.any, databaseInterface.Vibe.energetic, databaseInterface.Time.any);
for(int i = 0; i < energeticResults.size(); i++) {
Log.d("EnergeticResults!!", energeticResults.get(i));
}
return energeticResults;
}
}
app/src/main/java/com/example/soulfood_assignment2/FrenchAsyncTask.java deleted 100644 → 0
View file @ e52ed63a
package com.example.soulfood_assignment2;
import android.os.AsyncTask;
import android.util.Log;
import java.util.ArrayList;
public class FrenchAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
public ArrayList<String> frenchResults;
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
frenchResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.french, databaseInterface.Vibe.any, databaseInterface.Time.any);
for(int i = 0; i < frenchResults.size(); i++) {
Log.d("FrenchResults!!", frenchResults.get(i));
}
return frenchResults;
}
}
app/src/main/java/com/example/soulfood_assignment2/HappyAsyncTask.java deleted 100644 → 0
View file @ e52ed63a
package com.example.soulfood_assignment2;
import android.os.AsyncTask;
import android.util.Log;
import java.util.ArrayList;
public class HappyAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
public ArrayList<String> happyResults;
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
happyResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.any, databaseInterface.Vibe.happy, databaseInterface.Time.any);
for(int i = 0; i < happyResults.size(); i++) {
Log.d("HappyResults!!", happyResults.get(i));
}
return happyResults;
}
}
app/src/main/java/com/example/soulfood_assignment2/IndianAsyncTask.java deleted 100644 → 0
View file @ e52ed63a
package com.example.soulfood_assignment2;
import android.os.AsyncTask;
import android.util.Log;
import java.util.ArrayList;
public class IndianAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
public ArrayList<String> indianResults;
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
indianResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.indian, databaseInterface.Vibe.any, databaseInterface.Time.any);
for(int i = 0; i < indianResults.size(); i++) {
Log.d("IndianResults!!", indianResults.get(i));
}
return indianResults;
}
}
app/src/main/java/com/example/soulfood_assignment2/ItalianAsyncTask.java deleted 100644 → 0
View file @ e52ed63a
package com.example.soulfood_assignment2;
import android.os.AsyncTask;
import android.util.Log;
import java.util.ArrayList;
public class ItalianAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
public ArrayList<String> italianResults;
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
italianResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.italian, databaseInterface.Vibe.any, databaseInterface.Time.any);
for(int i = 0; i < italianResults.size(); i++) {
Log.d("ItalianResults!!", italianResults.get(i));
}
return italianResults;
}
}
app/src/main/java/com/example/soulfood_assignment2/JapaneseAsyncTask.java deleted 100644 → 0
View file @ e52ed63a
package com.example.soulfood_assignment2;
import android.os.AsyncTask;
import android.util.Log;
import java.util.ArrayList;
public class JapaneseAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
public ArrayList<String> japaneseResults;
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
japaneseResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.japanese, databaseInterface.Vibe.any, databaseInterface.Time.any);
for(int i = 0; i < japaneseResults.size(); i++) {
Log.d("JapaneseResults!!", japaneseResults.get(i));
}
return japaneseResults;
}
}
app/src/main/java/com/example/soulfood_assignment2/Listener.java
View file @ 1bd3a808
......@@ -12,7 +12,7 @@ public class Listener implements View.OnClickListener {
Log.d("Testing", "Button pressed");
Intent i = new Intent(v.getContext(), SavedPlaylists.class);
Intent i = new Intent(v.getContext(), SavedPlaylistView.class);
v.getContext().startActivity(i);
}
}
app/src/main/java/com/example/soulfood_assignment2/MexicanAsyncTask.java deleted 100644 → 0
View file @ e52ed63a
package com.example.soulfood_assignment2;
import android.os.AsyncTask;
import android.util.Log;
import java.util.ArrayList;
public class MexicanAsyncTask extends AsyncTask<Void, Void, ArrayList<String>> {
public ArrayList<String> mexicanResults;
@Override
protected ArrayList<String> doInBackground(Void... params) {
databaseInterface dbi = new databaseInterface();
mexicanResults = dbi.getPlaylistByAttributes(databaseInterface.Cuisine.mexican, databaseInterface.Vibe.any, databaseInterface.Time.any);
for(int i = 0; i < mexicanResults.size(); i++) {
Log.d("MexicanResults!!", mexicanResults.get(i));
}
return mexicanResults;
}
}
app/src/main/java/com/example/soulfood_assignment2/SavedPlaylistView.java 0 → 100644
View file @ 1bd3a808
package com.example.soulfood_assignment2;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
public class SavedPlaylistView extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_saved_playlists);
}
}
app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java
View file @ 1bd3a808
......@@ -21,7 +21,7 @@ public class ThaiAsyncTask extends AsyncTask<Void, Void, ArrayAdapter<String>>
public ArrayList<String> attributesSong6 = new ArrayList<>();
public ArrayList<String> attributesSong7 = new ArrayList<>();
public ArrayList<String> songNamesList = new ArrayList<>();
public String[] songNames = new String[20];
public String[] songNames = new String[8];
public ListView listView;
public Context context;
public databaseInterface.Cuisine cuisine;
......
app/src/main/java/com/example/soulfood_assignment2/build_playlist.java
View file @ 1bd3a808
......@@ -114,7 +114,6 @@ public class build_playlist extends AppCompatActivity {
public void buildPlaylistOnClick(View view) {
Intent intent = new Intent(this, playlistView.class);
intent.putExtra("vibe", vibe);
Log.d("VibeBitch!", vibe);
intent.putExtra("cuisine", cuisine);
intent.putExtra("timeofday", timeOfDay);
startActivity(intent);
......
app/src/main/java/com/example/soulfood_assignment2/homeScreen.java
View file @ 1bd3a808
......@@ -72,4 +72,9 @@ public class homeScreen extends AppCompatActivity {
Intent intent = new Intent(this, settings.class);
startActivity(intent);
}
public void savedViewOnClick(View view) {
Intent intent = new Intent(this, SavedPlaylists.class);
startActivity(intent);
}
}
app/src/main/java/com/example/soulfood_assignment2/searchScreen.java
View file @ 1bd3a808
......@@ -23,20 +23,6 @@ public class searchScreen extends AppCompatActivity {
public ListView songResults;
public ArrayAdapter<String> adapter;
public ArrayList<String> chineseResults;
public ArrayList<String> thaiResults;
public ArrayList<String> indianResults;
public ArrayList<String> japaneseResults;
public ArrayList<String> italianResults;
public ArrayList<String> mexicanResults;
public ArrayList<String> frenchResults;
public ArrayList<String> americanResults;
public ArrayList<String> chillResults;
public ArrayList<String> happyResults;
public ArrayList<String> energeticResults;
public Intent vibeView;
@Override
......@@ -60,68 +46,38 @@ public class searchScreen extends AppCompatActivity {
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
switch (position) {
case 0:
ChineseAsyncTask chineseAsyncTask = new ChineseAsyncTask();
chineseAsyncTask.execute();
chineseResults = chineseAsyncTask.chineseResults;
tagNamePage("Chinese", chineseResults);
tagNamePage("Chinese");
break;
case 1:
tagNamePage("Thai", thaiResults);
tagNamePage("Thai");
break;
case 2:
IndianAsyncTask indianAsyncTask = new IndianAsyncTask();
indianAsyncTask.execute();
indianResults = indianAsyncTask.indianResults;
tagNamePage("Indian", indianResults);
tagNamePage("Indian");
break;
case 3:
JapaneseAsyncTask japaneseAsyncTask = new JapaneseAsyncTask();
japaneseAsyncTask.execute();
japaneseResults = japaneseAsyncTask.japaneseResults;
tagNamePage("Japanese", japaneseResults);
tagNamePage("Japanese");
break;
case 4:
ItalianAsyncTask italianAsyncTask = new ItalianAsyncTask();
italianAsyncTask.execute();
italianResults = italianAsyncTask.italianResults;
tagNamePage("Italian", italianResults);
tagNamePage("Italian");
break;
case 5:
MexicanAsyncTask mexicanAsyncTask = new MexicanAsyncTask();
mexicanAsyncTask.execute();
mexicanResults = mexicanAsyncTask.mexicanResults;
tagNamePage("Mexican", mexicanResults);
tagNamePage("Mexican");
break;
case 6:
FrenchAsyncTask frenchAsyncTask = new FrenchAsyncTask();
frenchAsyncTask.execute();
frenchResults = frenchAsyncTask.frenchResults;
tagNamePage("French", frenchResults);
tagNamePage("French");
break;
case 7:
AmericanAsyncTask americanAsyncTask = new AmericanAsyncTask();
americanAsyncTask.execute();
americanResults = americanAsyncTask.americanResults;
tagNamePage("American", americanResults);
tagNamePage("American");
break;
case 8:
ChillAsyncTask chillAsyncTask = new ChillAsyncTask();
chillAsyncTask.execute();
chillResults = chillAsyncTask.chillResults;
tagNamePage("Chill", chillResults);
break;
// tagNamePage("Chill");
// break;
case 9:
HappyAsyncTask happyAsyncTask = new HappyAsyncTask();
happyAsyncTask.execute();
happyResults = happyAsyncTask.happyResults;
tagNamePage("Happy", happyResults);
break;
//tagNamePage("Happy");
//break;
case 10:
EnergeticAsyncTask energeticAsyncTask = new EnergeticAsyncTask();
energeticAsyncTask.execute();
energeticResults = energeticAsyncTask.energeticResults;
tagNamePage("energetic", energeticResults);
break;
//tagNamePage("energetic");
//break;
}
}
......@@ -131,12 +87,11 @@ public class searchScreen extends AppCompatActivity {
}
public void tagNamePage(String tagNameMethod, ArrayList<String> results) {
public void tagNamePage(String tagNameMethod) {
String tagView = "Songs with '" + tagNameMethod +"' Tag";
vibeView = new Intent(searchScreen.this, swtViewScreen.class);
vibeView.putExtra("tag_name", tagView);
vibeView.putExtra("tag_name_selected", tagNameMethod);
vibeView.putExtra("array_list",results);
startActivity(vibeView);
}
......
app/src/main/java/com/example/soulfood_assignment2/settings.java
View file @ 1bd3a808
......@@ -2,6 +2,7 @@ package com.example.soulfood_assignment2;
import android.R.layout;
import android.content.Context;
import android.content.Intent;
import android.media.AudioManager;
import android.media.MediaPlayer;
import android.provider.MediaStore;
......@@ -71,4 +72,9 @@ public class settings extends AppCompatActivity {
e.printStackTrace();
}
}
public void homeScreenViewOnClick(View view) {
Intent intent = new Intent(this, homeScreen.class);
startActivity(intent);
}
}
app/src/main/res/layout/activity_main.xml
View file @ 1bd3a808
......@@ -50,7 +50,7 @@
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="100dp"
android:onClick="savedPlaylistViewOnClick"
android:onClick="savedViewOnClick"
android:text="SAVED PLAYLISTS"
android:textColor="#000000"
android:textSize="24sp"
......
app/src/main/res/layout/activity_saved_playlist_view.xml 0 → 100644
View file @ 1bd3a808
<?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"
tools:context="com.example.soulfood_assignment2.SavedPlaylistView">
<ListView
android:id="@+id/savedPlaylists"
android:layout_width="wrap_content"
android:layout_height="500dp"
android:layout_marginTop="76dp"
android:layout_marginBottom="77dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView9"></ListView>
<TextView
android:id="@+id/textView7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="28dp"
android:text="SoulFood"
android:textColor="#000000"
android:textSize="36sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
app/src/main/res/layout/activity_settings.xml
View file @ 1bd3a808
......@@ -10,11 +10,7 @@
android:id="@+id/factorySettings"
android:layout_width="309dp"
android:layout_height="41dp"
android:layout_marginStart="62dp"
android:layout_marginLeft="62dp"
android:layout_marginEnd="44dp"
android:layout_marginRight="44dp"
android:layout_marginBottom="50dp"
android:layout_marginBottom="296dp"
android:text="Test"
android:textColor="#000000"
app:layout_constraintBottom_toBottomOf="parent"
......@@ -42,11 +38,9 @@
android:layout_height="25dp"
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="80dp"
android:layout_marginTop="140dp"
android:layout_marginEnd="22dp"
android:layout_marginRight="22dp"
android:layout_marginBottom="478dp"
app:layout_constraintBottom_toTopOf="@+id/factorySettings"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/textView12"
app:layout_constraintTop_toBottomOf="@+id/textView11" />
......@@ -57,15 +51,24 @@
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginLeft="32dp"
android:layout_marginTop="80dp"
android:layout_marginTop="144dp"
android:layout_marginEnd="60dp"
android:layout_marginRight="60dp"
android:layout_marginBottom="484dp"
android:text="Volume"
android:textColor="#000000"
app:layout_constraintBottom_toTopOf="@+id/factorySettings"
app:layout_constraintEnd_toStartOf="@+id/seekBar"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView11" />
<Button
android:id="@+id/homeScreenView"
android:layout_width="310dp"
android:layout_height="48dp"
android:layout_marginBottom="200dp"
android:onClick="homeScreenViewOnClick"
android:text="Back to home"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</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