Commit e18aa589 authored by charley.punshon's avatar charley.punshon

Song screen view with methods on both pause and play buttons.

parent 49b29ff2
This diff is collapsed.
...@@ -4,15 +4,19 @@ import android.support.v7.app.AppCompatActivity; ...@@ -4,15 +4,19 @@ import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
public class SongInformationPage extends AppCompatActivity { public class SongInformationPage extends AppCompatActivity {
String title;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_song_information_page); setContentView(R.layout.activity_song_information_page);
String title = getIntent().getStringExtra("song_name"); title = getIntent().getStringExtra("song_name");
String tag1 = getIntent().getStringExtra("tag1_name"); String tag1 = getIntent().getStringExtra("tag1_name");
String tag2 = getIntent().getStringExtra("tag2_name"); String tag2 = getIntent().getStringExtra("tag2_name");
String tag3 = getIntent().getStringExtra("tag3_name"); String tag3 = getIntent().getStringExtra("tag3_name");
...@@ -27,8 +31,16 @@ public class SongInformationPage extends AppCompatActivity { ...@@ -27,8 +31,16 @@ public class SongInformationPage extends AppCompatActivity {
} }
public void songPlayOnClick(View view) { public void songPlayOnClick(View view) {
String id = getIntent().getStringExtra("id");
SpotifyClass spotifyClass = MainActivity.spotifyClass;
spotifyClass.pauseSong();
spotifyClass.playSong(id);
Toast.makeText(SongInformationPage.this,"You are now playing: " + title, Toast.LENGTH_LONG).show();
}
public void songPauseOnClick(View view) {
SpotifyClass spotifyClass = MainActivity.spotifyClass; SpotifyClass spotifyClass = MainActivity.spotifyClass;
spotifyClass.pauseSong(); spotifyClass.pauseSong();
spotifyClass.playSong(""); Toast.makeText(SongInformationPage.this,"You've now paused the song", Toast.LENGTH_LONG).show();
} }
} }
...@@ -9,6 +9,7 @@ import android.widget.ArrayAdapter; ...@@ -9,6 +9,7 @@ import android.widget.ArrayAdapter;
import android.widget.ListView; import android.widget.ListView;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
public class ThaiAsyncTask extends AsyncTask<Void, Void, ArrayAdapter<String>> { public class ThaiAsyncTask extends AsyncTask<Void, Void, ArrayAdapter<String>> {
public ArrayList<String> thaiResults = new ArrayList<>(); public ArrayList<String> thaiResults = new ArrayList<>();
...@@ -19,6 +20,7 @@ public class ThaiAsyncTask extends AsyncTask<Void, Void, ArrayAdapter<String>> ...@@ -19,6 +20,7 @@ public class ThaiAsyncTask extends AsyncTask<Void, Void, ArrayAdapter<String>>
public ArrayList<String> attributesSong5 = new ArrayList<>(); public ArrayList<String> attributesSong5 = new ArrayList<>();
public ArrayList<String> attributesSong6 = new ArrayList<>(); public ArrayList<String> attributesSong6 = new ArrayList<>();
public ArrayList<String> attributesSong7 = 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[7];
public String test; public String test;
public ListView listView; public ListView listView;
...@@ -39,6 +41,7 @@ public class ThaiAsyncTask extends AsyncTask<Void, Void, ArrayAdapter<String>> ...@@ -39,6 +41,7 @@ public class ThaiAsyncTask extends AsyncTask<Void, Void, ArrayAdapter<String>>
for(int i = 0; i < thaiResults.size(); i++) { for(int i = 0; i < thaiResults.size(); i++) {
songNames[i] = dbi.getSongTitle(thaiResults.get(i)); songNames[i] = dbi.getSongTitle(thaiResults.get(i));
} }
songNamesList = new ArrayList<>(Arrays.asList(songNames));
attributesSong1 = dbi.getAttributesBySongID(thaiResults.get(0)); attributesSong1 = dbi.getAttributesBySongID(thaiResults.get(0));
attributesSong2 = dbi.getAttributesBySongID(thaiResults.get(1)); attributesSong2 = dbi.getAttributesBySongID(thaiResults.get(1));
attributesSong3 = dbi.getAttributesBySongID(thaiResults.get(2)); attributesSong3 = dbi.getAttributesBySongID(thaiResults.get(2));
...@@ -47,8 +50,9 @@ public class ThaiAsyncTask extends AsyncTask<Void, Void, ArrayAdapter<String>> ...@@ -47,8 +50,9 @@ public class ThaiAsyncTask extends AsyncTask<Void, Void, ArrayAdapter<String>>
attributesSong6 = dbi.getAttributesBySongID(thaiResults.get(5)); attributesSong6 = dbi.getAttributesBySongID(thaiResults.get(5));
attributesSong7 = dbi.getAttributesBySongID(thaiResults.get(6)); attributesSong7 = dbi.getAttributesBySongID(thaiResults.get(6));
ArrayAdapter thaiAdapter = new ArrayAdapter<String>( ArrayAdapter thaiAdapter = new ArrayAdapter<String>(
context, android.R.layout.simple_list_item_1, thaiResults context, android.R.layout.simple_list_item_1, songNamesList
); );
return thaiAdapter; return thaiAdapter;
} catch (Exception e) { } catch (Exception e) {
......
...@@ -153,7 +153,6 @@ public class swtViewScreen extends AppCompatActivity { ...@@ -153,7 +153,6 @@ public class swtViewScreen extends AppCompatActivity {
public void onItemClick(AdapterView<?> parent, View view, int position, long id) { public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
switch (position) { switch (position) {
case 0: case 0:
Log.d("endmysuffering", thaiAsyncTask.songNames[0]);
songPage(thaiAsyncTask.songNames[0], thaiAsyncTask.attributesSong1.get(0), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2)); songPage(thaiAsyncTask.songNames[0], thaiAsyncTask.attributesSong1.get(0), thaiAsyncTask.attributesSong1.get(1), thaiAsyncTask.attributesSong1.get(2));
break; break;
case 1: case 1:
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="96dp" android:layout_marginBottom="96dp"
android:onClick="songPlayOnClick" android:onClick="songPlayOnClick"
android:text="Button" android:text="Play"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pauseView" app:layout_constraintEnd_toStartOf="@+id/pauseView"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
...@@ -74,7 +74,8 @@ ...@@ -74,7 +74,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="96dp" android:layout_marginBottom="96dp"
android:text="Button" android:onClick="songPauseOnClick"
android:text="Pause"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/playView" /> app:layout_constraintStart_toEndOf="@+id/playView" />
......
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