Skip to content

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

Merge branch 'master' of... 

Merge branch 'master' of /Users/charleypunshon/AndriodStudioProjects/soulfood_working with conflicts.
parent 97b9b53f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 183 additions and 216 deletions
.idea/codeStyles/Project.xml 0 → 100644
View file @ 188982d7
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<Objective-C-extensions>
<file>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
</file>
<class>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
</class>
<extensions>
<pair source="cpp" header="h" fileNamingConvention="NONE" />
<pair source="c" header="h" fileNamingConvention="NONE" />
</extensions>
</Objective-C-extensions>
</code_scheme>
</component>
\ No newline at end of file
.idea/workspace.xml
View file @ 188982d7
This diff is collapsed.
app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists.java deleted 100644 → 0
View file @ 97b9b53f
package com.example.soulfood_assignment2;
import android.content.Context;
import android.content.SharedPreferences;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import java.util.ArrayList;
public class SavedPlaylist extends AppCompatActivity {
public static SharedPreferences playlists;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_saved_playlists);
playlists = getPreferences(Context.MODE_PRIVATE);
SharedPreferences.Editor editor = playlists.edit();
editor.putString("playlist 1", "1");
editor.commit();
ArrayList<String> saved = new ArrayList<>();
saved.add("Playlist " + playlists.getString("playlist 1", "0"));
saved.add("Playlist " + playlists.getString("playlist 2", "0"));
saved.add("Playlist " + playlists.getString("playlist 3", "0"));
for (String s: saved) {
if(s.equals("Playlist 0")) {
saved.remove(s);
}
}
ListView listView = findViewById(R.id.listViewPlaylists);
ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, saved);
listView.setAdapter(adapter);
}
}
app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists2.java 0 → 100644
View file @ 188982d7
package com.example.soulfood_assignment2;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
public class SavedPlaylists2 extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_saved_playlists2);
}
}
app/src/main/java/com/example/soulfood_assignment2/ThaiAsyncTask.java
View file @ 188982d7
......@@ -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[7];
public String[] songNames = new String[20];
public ListView listView;
public Context context;
public databaseInterface.Cuisine cuisine;
......
app/src/main/java/com/example/soulfood_assignment2/playlistView.java
View file @ 188982d7
......@@ -19,6 +19,7 @@ import static com.example.soulfood_assignment2.databaseInterface.Vibe.chill;
import static com.example.soulfood_assignment2.databaseInterface.Vibe.energetic;
public class playlistView extends AppCompatActivity {
databaseInterface.Cuisine cuisineTag;
databaseInterface.Vibe vibeTag;
databaseInterface.Time timeTag;
......
app/src/main/java/com/example/soulfood_assignment2/swtViewScreen.java
View file @ 188982d7
......@@ -156,22 +156,22 @@ public class swtViewScreen extends AppCompatActivity {
songPage(thaiAsyncTask.songNames[0], thaiAsyncTask.attributesSong1.get(0), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 1:
//songPage(thaiResults.get(1));
songPage(thaiAsyncTask.songNames[1], thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 2:
//songPage(thaiResults.get(2));
songPage(thaiAsyncTask.songNames[2], thaiAsyncTask.attributesSong1.get(2), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 3:
//songPage(chineseResults.get(3));
songPage(thaiAsyncTask.songNames[3], thaiAsyncTask.attributesSong1.get(4), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 4:
//songPage(chineseResults.get(4));
songPage(thaiAsyncTask.songNames[4], thaiAsyncTask.attributesSong1.get(5), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 5:
//songPage(chineseResults.get(5));
songPage(thaiAsyncTask.songNames[5], thaiAsyncTask.attributesSong1.get(5), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
case 6:
//songPage(chineseResults.get(6));
songPage(thaiAsyncTask.songNames[6], thaiAsyncTask.attributesSong1.get(6), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break;
}
}
......
app/src/main/res/layout/activity_saved_playlists.xml deleted 100644 → 0
View file @ 97b9b53f
<?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.SavedPlaylists">
<TextView
android:id="@+id/textView10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:text="Saved Playlists"
app:layout_constraintBottom_toTopOf="@+id/_dynamic"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.49" />
<ListView
android:layout_width="395dp"
android:layout_height="640dp"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="36dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView10" />
</android.support.constraint.ConstraintLayout>
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