ClaytonWWilson/Listify
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/Listify.git synced 2025-12-15 18:28:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ready for presentation

Browse Source
This commit is contained in:
NMerz 2020-12-04 12:25:14 -05:00
parent 21277e1f76
commit 645cdc90f9
13 changed files with 62 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lambdas/Lists/Chain/test/TestChainGetter.java
View File

@ -1,4 +1,4 @@
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
import java.sql.SQLException; import java.sql.SQLException;

2
Lambdas/Lists/Item/test/TestItemGetter.java
View File

@ -1,4 +1,4 @@
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
import java.math.BigDecimal; import java.math.BigDecimal;

2
Lambdas/Lists/ItemSearch/test/TestItemSearcher.java
View File

@ -1,4 +1,4 @@
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
import java.sql.SQLException; import java.sql.SQLException;

2
Lambdas/Lists/ListDuplicate/test/TestListDuplicate.java
View File

@ -1,4 +1,4 @@
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
import java.sql.SQLException; import java.sql.SQLException;

2
Lambdas/Lists/ListReposition/test/TestListReposition.java
View File

@ -1,4 +1,4 @@
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
import java.sql.SQLException; import java.sql.SQLException;

2
Lambdas/Lists/Picture/test/TestPictureGetter.java
View File

@ -1,4 +1,4 @@
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
import java.sql.SQLException; import java.sql.SQLException;

2
Lambdas/Lists/Picture/test/TestPicturePutter.java
View File

@ -1,4 +1,4 @@
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
import java.sql.SQLException; import java.sql.SQLException;

2
Lambdas/Lists/SearchHistory/test/TestSearchHistoryGetter.java
View File

@ -1,4 +1,4 @@
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
import java.sql.SQLException; import java.sql.SQLException;

2
Lambdas/Lists/SearchHistory/test/TestSearchHistoryUpdater.java
View File

@ -1,4 +1,4 @@
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
import java.sql.SQLException; import java.sql.SQLException;

2
Lambdas/Lists/User/src/UserDeleter.java
View File

@ -40,7 +40,7 @@ public class UserDeleter implements CallHandler {
private final String DELETE_LISTS = "DELETE FROM List WHERE (owner = ?);"; private final String DELETE_LISTS = "DELETE FROM List WHERE (owner = ?);";
private final String DELETE_LIST_SHARES = "DELETE FROM ListSharee WHERE (listID = ?);"; private final String DELETE_LIST_SHARES = "DELETE FROM ListSharee WHERE (listID = ?);";
private final String DELETE_LIST_ACCESS = "DELETE FROM ListSharee WHERE (userID = ?);"; private final String DELETE_LIST_ACCESS = "DELETE FROM ListSharee WHERE (userID = ?);";
private final String DELETE_PROFILE_PICTURE = "DELETE FROM Pictures WHERE (userID = ?);"; private final String DELETE_PROFILE_PICTURE = "DELETE FROM Pictures WHERE (cognitoID = ?);";
public UserDeleter(Connection connection, String cognitoID) { public UserDeleter(Connection connection, String cognitoID) {
this.connection = connection; this.connection = connection;

4
Listify/app/src/main/java/com/example/listify/ConfirmShareView.java
View File

@ -43,6 +43,10 @@ public class ConfirmShareView extends AppCompatActivity {
try { try {
requestor.getObject(shareeEmail, User.class, userReceiver); requestor.getObject(shareeEmail, User.class, userReceiver);
String shareeID = userReceiver.await().getCognitoID(); String shareeID = userReceiver.await().getCognitoID();
if (shareeID == null) {
setResult(RESULT_CANCELED,null);
finish();
}
requestor.getObject(shareeID, Picture.class, profilePictureReceiver); requestor.getObject(shareeID, Picture.class, profilePictureReceiver);
profilePictureView.setImageURI(Uri.fromFile(saveImage(profilePictureReceiver.await().getBase64EncodedImage(), "shareeProfilePicture"))); profilePictureView.setImageURI(Uri.fromFile(saveImage(profilePictureReceiver.await().getBase64EncodedImage(), "shareeProfilePicture")));
} catch (Exception e) { } catch (Exception e) {

55
Listify/app/src/main/java/com/example/listify/MainActivity.java
View File

@ -1,13 +1,9 @@
package com.example.listify; package com.example.listify;
import android.Manifest;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.database.Cursor; import android.database.Cursor;
import android.location.Location;
import android.location.LocationManager;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
@ -24,7 +20,6 @@ import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import androidx.core.app.ActivityCompat;
import androidx.core.content.FileProvider; import androidx.core.content.FileProvider;
import androidx.drawerlayout.widget.DrawerLayout; import androidx.drawerlayout.widget.DrawerLayout;
import androidx.navigation.NavController; import androidx.navigation.NavController;
@ -84,31 +79,31 @@ public class MainActivity extends AppCompatActivity implements CreateListDialogF
startActivity(intent); startActivity(intent);
} }
LocationManager lm = (LocationManager) getSystemService(Context.LOCATION_SERVICE); // LocationManager lm = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
if(checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) { // if(checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
Log.d("CHECKING", "WORKS"); // Log.d("CHECKING", "WORKS");
} else { // } else {
ActivityCompat.requestPermissions( // ActivityCompat.requestPermissions(
this, // this,
new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, // new String[]{Manifest.permission.ACCESS_FINE_LOCATION},
0 // 0
); // );
} // }
Location location; // Location location;
//
while(true) { // while(true) {
try { // try {
location = lm.getLastKnownLocation(LocationManager.GPS_PROVIDER); // location = lm.getLastKnownLocation(LocationManager.GPS_PROVIDER);
break; // break;
} catch(java.lang.SecurityException e) { // } catch(java.lang.SecurityException e) {
//User clicked delete // //User clicked delete
} // }
} // }
//
if(location != null) { // if(location != null) {
double longitude = location.getLongitude(); // double longitude = location.getLongitude();
double latitude = location.getLatitude(); // double latitude = location.getLatitude();
} // }
//------------------------------Auth Testing---------------------------------------------// //------------------------------Auth Testing---------------------------------------------//

34
Listify/app/src/main/java/com/example/listify/adapter/ShoppingListsSwipeableAdapter.java
View File

@ -13,7 +13,7 @@ import com.chauthai.swipereveallayout.SwipeRevealLayout;
import com.chauthai.swipereveallayout.ViewBinderHelper; import com.chauthai.swipereveallayout.ViewBinderHelper;
import com.example.listify.*; import com.example.listify.*;
import com.example.listify.data.List; import com.example.listify.data.List;
import com.example.listify.data.ListShare; import com.example.listify.data.User;
import org.json.JSONException; import org.json.JSONException;
import java.io.IOException; import java.io.IOException;
@ -25,6 +25,7 @@ import static com.example.listify.MainActivity.am;
public class ShoppingListsSwipeableAdapter extends BaseAdapter { public class ShoppingListsSwipeableAdapter extends BaseAdapter {
private Activity activity; private Activity activity;
private ArrayList<List> lists; private ArrayList<List> lists;
private ArrayList<String> emails;
private LayoutInflater inflater; private LayoutInflater inflater;
private ViewHolder holder; private ViewHolder holder;
private Requestor requestor; private Requestor requestor;
@ -34,6 +35,23 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter {
binderHelper = new ViewBinderHelper(); binderHelper = new ViewBinderHelper();
this.activity = activity; this.activity = activity;
this.lists = lists; this.lists = lists;
this.emails = new ArrayList<>();
Properties configs = new Properties();
try {
configs = AuthManager.loadProperties(activity, "android.resource://" + activity.getPackageName() + "/raw/auths.json");
} catch (IOException | JSONException e) {
e.printStackTrace();
}
requestor = new Requestor(am, configs.getProperty("apiKey"));
SynchronousReceiver<User> emailReceiver = new SynchronousReceiver();
for (List list : lists) {
requestor.getObject(list.getOwner(), User.class, emailReceiver);
try {
emails.add(emailReceiver.await().getEmail());
} catch (Exception e) {
e.printStackTrace();
}
}
} }
@Override @Override
@ -53,13 +71,6 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter {
@Override @Override
public View getView(int position, View convertView, ViewGroup parent) { public View getView(int position, View convertView, ViewGroup parent) {
Properties configs = new Properties();
try {
configs = AuthManager.loadProperties(activity, "android.resource://" + activity.getPackageName() + "/raw/auths.json");
} catch (IOException | JSONException e) {
e.printStackTrace();
}
requestor = new Requestor(am, configs.getProperty("apiKey"));
if (inflater == null) { if (inflater == null) {
inflater = (LayoutInflater)activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); inflater = (LayoutInflater)activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
@ -88,12 +99,12 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter {
holder.listName.setText(curList.getName()); holder.listName.setText(curList.getName());
if(curList.isShared()) { if(curList.isShared()) {
holder.listName.setText(curList.getName() + " (shared by User " + curList.getOwner() + ")"); holder.listName.setText(curList.getName() + " (shared by " + emails.get(position) + ")");
String listText = holder.listName.getText().toString(); String listText = holder.listName.getText().toString();
if(listText.length() > 25) { if(listText.length() > 27) {
holder.listName.setText(listText.substring(0, 25) + "..."); holder.listName.setText(listText.substring(0, 27) + "...");
} }
} }
@ -117,6 +128,7 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter {
Toast.makeText(activity, String.format("%s deleted", curList.getName()), Toast.LENGTH_SHORT).show(); Toast.makeText(activity, String.format("%s deleted", curList.getName()), Toast.LENGTH_SHORT).show();
lists.remove(position); lists.remove(position);
emails.remove(position);
// Update listView // Update listView
notifyDataSetChanged(); notifyDataSetChanged();