Skip to content

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

My final commit.

parent 6726c3b4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 216 deletions
.idea/workspace.xml
View file @ fa7ba703
This diff is collapsed.
app/src/main/java/com/example/soulfood_assignment2/ImageDownload.java deleted 100644 → 0
View file @ 6726c3b4
package com.example.soulfood_assignment2;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.AsyncTask;
import android.widget.ImageView;
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
public class ImageDownload extends AsyncTask<Void, Integer, Bitmap> {
private ImageView imageView;
@Override
protected void onPostExecute(Bitmap bitmap) {
imageView.setImageBitmap(bitmap);
}
protected Bitmap doInBackground(Void... voids) {
String input = "https://www.google.com/url?sa=i&source=images&cd=&ved=2ahUKEwjTiLq3kILiAhUy-YUKHWIGAfsQjRx6BAgBEAU&url=%2Furl%3Fsa%3Di%26source%3Dimages%26cd%3D%26ved%3D%26url%3Dhttps%253A%252F%252Fwww.livescience.com%252F65030-usda-kitten-cannibalism-research.html%26psig%3DAOvVaw332JT_6QbGREdBtXpwrLdP%26ust%3D1557067990379601&psig=AOvVaw332JT_6QbGREdBtXpwrLdP&ust=1557067990379601";
try {
URL someURL = new URL(input);
URLConnection conn = someURL.openConnection();
InputStream is = conn.getInputStream();
BufferedInputStream stream = new BufferedInputStream(is);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
int intInput = stream.read();
int ticker = 0;
while(intInput != 1) {
ticker++;
if(ticker%100 == 0) {
publishProgress(baos.size());
}
baos.write(intInput);
intInput = stream.read();
}
byte[] imageBytes = baos.toByteArray();
Bitmap bmp = BitmapFactory.decodeByteArray(imageBytes,0, imageBytes.length);
return bmp;
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
}
app/src/main/java/com/example/soulfood_assignment2/MainActivity.java
View file @ fa7ba703
package com.example.soulfood_assignment2;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.View;
import android.widget.ProgressBar;
......@@ -11,9 +11,6 @@ import android.widget.Toast;
import com.spotify.android.appremote.api.ConnectionParams;
import com.spotify.android.appremote.api.Connector;
import com.spotify.android.appremote.api.SpotifyAppRemote;
import com.spotify.android.appremote.api.error.CouldNotFindSpotifyApp;
import com.spotify.android.appremote.api.error.NotLoggedInException;
import com.spotify.android.appremote.api.error.UserNotAuthorizedException;
import com.spotify.sdk.android.authentication.AuthenticationClient;
import com.spotify.sdk.android.authentication.AuthenticationRequest;
import com.spotify.sdk.android.authentication.AuthenticationResponse;
......
app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists.java
View file @ fa7ba703
......@@ -2,9 +2,8 @@ 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.support.v7.app.AppCompatActivity;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.Toast;
......
app/src/main/java/com/example/soulfood_assignment2/SongScreenView.java
View file @ fa7ba703
package com.example.soulfood_assignment2;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.widget.TextView;
......
app/src/main/java/com/example/soulfood_assignment2/playlistView.java
View file @ fa7ba703
......@@ -96,7 +96,7 @@ public class playlistView extends AppCompatActivity {
playlistView = thaiAsyncTask.listView;
Button save = (Button)findViewById(R.id.saveButton);
save.setOnClickListener(save()); //when the button is pressed save should be implemeted
//save.setOnClickListener(save()); //when the button is pressed save should be implemeted
// but unfortunately i cant find the array list to put in
}
......@@ -108,11 +108,11 @@ public class playlistView extends AppCompatActivity {
*/
private void save(ArrayList<String> songs) {
databaseInterface dbi = new databaseInterface(); // so we can use database methods
String id = dbi.savePlaylist(songs); // save in the database, hopefully
// String id = dbi.savePlaylist(songs); // save in the database, hopefully
// that method returns the saved id so we can put it in the shared preference
SavedPlaylists savedPlaylists = new SavedPlaylists(); //so we can save in the shared preference
savedPlaylists.savePlaylist(id); // saves as a shared preference
// savedPlaylists.savePlaylist(id); // saves as a shared preference
}
}
app/src/main/java/com/example/soulfood_assignment2/searchScreen.java
View file @ fa7ba703
package com.example.soulfood_assignment2;
import android.app.Activity;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
import android.support.v7.app.AppCompatActivity;
import android.view.Menu;
import android.view.View;
import android.widget.AdapterView;
......@@ -13,7 +11,6 @@ import android.widget.ListView;
import android.widget.SearchView;
import android.widget.Toast;
import java.util.AbstractList;
import java.util.ArrayList;
import java.util.Arrays;
......
app/src/main/java/com/example/soulfood_assignment2/settings.java
View file @ fa7ba703
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;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.SeekBar;
import android.widget.Spinner;
import android.widget.Toast;
import static android.R.layout.simple_spinner_dropdown_item;
public class settings extends AppCompatActivity {
public SeekBar volSeekBar;
......
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