dergeorg/SmartShopperAndroid
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Code und Imports Optimierung

Browse Source
This commit is contained in:
Georg Reisinger
2019-02-20 23:04:09 +01:00
parent f719fe1326
commit 42ffa7cadb
32 changed files with 308 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/androidTest/java/at/smartshopper/smartshopper/ExampleInstrumentedTest.java
View File

@@ -7,7 +7,7 @@ import android.support.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
/**
* Instrumented test, which will execute on an Android device.

4
app/src/main/java/at/smartshopper/smartshopper/activitys/Colorpicker.java
View File

@@ -1,12 +1,10 @@
package at.smartshopper.smartshopper.activitys;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.Color;
import android.net.Uri;
import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.widget.Button;
import android.widget.LinearLayout;

57
app/src/main/java/at/smartshopper/smartshopper/activitys/Dash.java
View File

@@ -11,8 +11,6 @@ import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.design.widget.TabLayout;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
@@ -29,9 +27,6 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageButton;
import at.smartshopper.smartshopper.R;
import android.widget.PopupWindow;
import android.widget.TabHost;
import android.widget.TextView;
@@ -43,22 +38,14 @@ import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseUser;
import com.google.firebase.iid.FirebaseInstanceId;
import com.google.firebase.iid.InstanceIdResult;
import com.google.gson.JsonSerializer;
import com.squareup.picasso.Picasso;
import org.json.JSONException;
import org.w3c.dom.Text;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.sql.SQLException;
import java.util.Base64;
import java.util.List;
import at.smartshopper.smartshopper.customViews.SpaceItemDecoration;
import at.smartshopper.smartshopper.R;
import at.smartshopper.smartshopper.db.Database;
import at.smartshopper.smartshopper.shoppinglist.Shoppinglist;
import at.smartshopper.smartshopper.shoppinglist.ShoppinglistAdapter;
@@ -73,6 +60,18 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte
private PopupWindow popupWindowAdd, popupShare, popupAddShare, popupEditShare;
private String color;
private Button colorBtn;
//Für Double Back press to exit
private boolean doubleBackToExitPressedOnce = false;
/**
* Convertiert eine int farbe in eine hexa dezimale Farbe
*
* @param color Farbe zum umwandeln in int
* @return farbe als hex im string
*/
private static String colorToHexString(int color) {
return String.format("#%06X", 0xFFFFFFFF & color);
}
/**
* Setzt das atribut color wenn die activity colorpicker beendet wird
@@ -91,15 +90,14 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte
}
}
/**
* Holt den msg token
*
* <p>
* SETZT IHN NOCH NED
*
*
* <p>
* <p>
* WEITER PROGRAMMIERN
*
* <p>
* MIR FEHLT NOCH DIE DB VON LUKAS
*/
private void setMsgId() {
@@ -126,17 +124,6 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte
});
}
/**
* Convertiert eine int farbe in eine hexa dezimale Farbe
*
* @param color Farbe zum umwandeln in int
* @return farbe als hex im string
*/
private static String colorToHexString(int color) {
return String.format("#%06X", 0xFFFFFFFF & color);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -401,7 +388,6 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte
ownswiperefresh.setRefreshing(false);
}
/**
* Macht eine Datenbankverbindung und holt alle Shoppinglists die mit dem User geteilt werden, diese werden auf dem recycled view angezeigt
*
@@ -472,7 +458,6 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte
startActivity(intent);
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
@@ -480,7 +465,6 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte
return true;
}
/**
* Menu item Action listener
*
@@ -561,7 +545,6 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte
String invite = linkEingabe.getText().toString();
try {
db.addInviteLink(invite, FirebaseAuth.getInstance().getCurrentUser().getUid());
} catch (SQLException e) {
@@ -602,10 +585,6 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte
popupAddShare.update();
}
//Für Double Back press to exit
private boolean doubleBackToExitPressedOnce = false;
/**
* 2 Mal Zurück Drücken um die App zu schließen
*/
@@ -688,6 +667,7 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte
/**
* Holt den Invitelink einer Shoppingliste
*
* @param sl_id Die Shoppingliste von der der invitelink gewünscht ist
* @return
*/
@@ -781,6 +761,7 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte
/**
* Kopiert einen Text in die Zwischenablage
*
* @param text Der Text, welcher zu kopieren ist
*/
private void copyText(String text) {

5
app/src/main/java/at/smartshopper/smartshopper/activitys/DoneItemActivity.java
View File

@@ -1,8 +1,8 @@
package at.smartshopper.smartshopper.activitys;
import android.os.Bundle;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
@@ -14,8 +14,6 @@ import java.util.List;
import at.smartshopper.smartshopper.R;
import at.smartshopper.smartshopper.customViews.SpaceItemDecoration;
import at.smartshopper.smartshopper.db.Database;
import at.smartshopper.smartshopper.shoppinglist.Shoppinglist;
import at.smartshopper.smartshopper.shoppinglist.ShoppinglistSharedAdapter;
import at.smartshopper.smartshopper.shoppinglist.details.item.Item;
import at.smartshopper.smartshopper.shoppinglist.details.item.ItemShoppinglistDetailsAdapter;
@@ -58,6 +56,7 @@ public class DoneItemActivity extends AppCompatActivity {
/**
* Zeigt alle erledigten Items an
*
* @throws SQLException
* @throws JSONException
*/

18
app/src/main/java/at/smartshopper/smartshopper/activitys/LoginActivity.java
View File

@@ -1,11 +1,11 @@
package at.smartshopper.smartshopper.activitys;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.Button;
@@ -27,9 +27,6 @@ import com.google.firebase.auth.FirebaseUser;
import com.google.firebase.auth.GoogleAuthProvider;
import com.google.firebase.iid.FirebaseInstanceId;
import com.google.firebase.iid.InstanceIdResult;
import com.google.firebase.messaging.FirebaseMessaging;
import org.json.JSONException;
import java.sql.SQLException;
@@ -40,11 +37,12 @@ public class LoginActivity extends AppCompatActivity {
private static final String TAG = "SMASH";
private static final int RC_SIGN_IN = 1;
private FirebaseAuth mAuth;
private Database db;
SignInButton button;
GoogleSignInClient mGoogleSignInClient;
private FirebaseAuth mAuth;
private Database db;
//Für Double Back press to exit
private boolean doubleBackToExitPressedOnce = false;
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -142,7 +140,6 @@ public class LoginActivity extends AppCompatActivity {
});
}
/**
* Erstellt einen Account mit Email und Passwort
*
@@ -170,7 +167,6 @@ public class LoginActivity extends AppCompatActivity {
});
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -244,7 +240,6 @@ public class LoginActivity extends AppCompatActivity {
});
}
/**
* Prüft ob der User bereits eingelogt ist. Wenn ja, wird er auf die Dash Activity weitergeleitet
*/
@@ -259,9 +254,6 @@ public class LoginActivity extends AppCompatActivity {
}
//Für Double Back press to exit
private boolean doubleBackToExitPressedOnce = false;
/**
* 2 Mal Zurück Drücken um die App zu schließen
*/

27
app/src/main/java/at/smartshopper/smartshopper/activitys/ShoppinglistDetails.java
View File

@@ -1,10 +1,10 @@
package at.smartshopper.smartshopper.activitys;
import android.app.Activity;
import android.content.Intent;
import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
import android.app.Activity;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
@@ -22,14 +22,10 @@ import android.widget.PopupWindow;
import android.widget.TextView;
import com.google.firebase.auth.FirebaseAuth;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.squareup.picasso.Picasso;
import org.json.JSONException;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.sql.SQLException;
import java.util.List;
@@ -50,6 +46,16 @@ public class ShoppinglistDetails extends Activity implements DetailsAdapter.OnGr
private Button colorBtn;
private SwipeRefreshLayout detailsSwiperefresh;
/**
* Convertiert eine int farbe in eine hexa dezimale Farbe
*
* @param color Farbe zum umwandeln in int
* @return farbe als hex im string
*/
private static String colorToHexString(int color) {
return String.format("#%06X", 0xFFFFFFFF & color);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -110,7 +116,6 @@ public class ShoppinglistDetails extends Activity implements DetailsAdapter.OnGr
}
/**
* Zeigt ein Popup zum bearbeiten und erstellen von groups
* Wenn from db true ist wird die groupid benötigt
@@ -264,16 +269,6 @@ public class ShoppinglistDetails extends Activity implements DetailsAdapter.OnGr
}
}
/**
* Convertiert eine int farbe in eine hexa dezimale Farbe
*
* @param color Farbe zum umwandeln in int
* @return farbe als hex im string
*/
private static String colorToHexString(int color) {
return String.format("#%06X", 0xFFFFFFFF & color);
}
/**
* Zeigt das Card View der Shoppinglist Details an
*

68
app/src/main/java/at/smartshopper/smartshopper/customViews/RoundCornersTransformation.java
View File

@@ -50,43 +50,10 @@ public class RoundCornersTransformation implements com.squareup.picasso.Transfor
KEY = "rounded_" + radius + margin + topCorners + bottomCorners;
}
@Override
public Bitmap transform(final Bitmap source) {
final Paint paint = new Paint();
paint.setAntiAlias(true);
paint.setShader(new BitmapShader(source, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP));
Bitmap output = Bitmap.createBitmap(source.getWidth(), source.getHeight(), Config.ARGB_8888);
Canvas canvas = new Canvas(output);
if(topCorners && bottomCorners) {
// Uses native method to draw symmetric rounded corners
canvas.drawRoundRect(new RectF(margin, margin, source.getWidth() - margin,
source.getHeight() - margin), radius, radius, paint);
} else {
// Uses custom path to generate rounded corner individually
canvas.drawPath(RoundedRect(margin, margin, source.getWidth() - margin,
source.getHeight() - margin, radius, radius, topCorners, topCorners,
bottomCorners, bottomCorners), paint);
}
if (source != output) {
source.recycle();
}
return output;
}
@Override
public String key() {
return "rounded_" + radius + margin;
// return KEY;
}
/**
* Prepares a path for rounded corner selectively.
* Source taken from http://stackoverflow.com/a/35668889/6635889
*
* @param leftX The X coordinate of the left side of the rectangle
* @param topY The Y coordinate of the top of the rectangle
* @param rightX The X coordinate of the right side of the rectangle
@@ -149,4 +116,37 @@ public class RoundCornersTransformation implements com.squareup.picasso.Transfor
return path;
}
@Override
public Bitmap transform(final Bitmap source) {
final Paint paint = new Paint();
paint.setAntiAlias(true);
paint.setShader(new BitmapShader(source, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP));
Bitmap output = Bitmap.createBitmap(source.getWidth(), source.getHeight(), Config.ARGB_8888);
Canvas canvas = new Canvas(output);
if (topCorners && bottomCorners) {
// Uses native method to draw symmetric rounded corners
canvas.drawRoundRect(new RectF(margin, margin, source.getWidth() - margin,
source.getHeight() - margin), radius, radius, paint);
} else {
// Uses custom path to generate rounded corner individually
canvas.drawPath(RoundedRect(margin, margin, source.getWidth() - margin,
source.getHeight() - margin, radius, radius, topCorners, topCorners,
bottomCorners, bottomCorners), paint);
}
if (source != output) {
source.recycle();
}
return output;
}
@Override
public String key() {
return "rounded_" + radius + margin;
// return KEY;
}
}

10
app/src/main/java/at/smartshopper/smartshopper/db/Database.java
View File

@@ -1,24 +1,18 @@
package at.smartshopper.smartshopper.db;
import android.os.StrictMode;
import android.util.Log;
import com.google.firebase.auth.FirebaseAuth;
import com.google.gson.JsonSerializer;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.Serializable;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import at.smartshopper.smartshopper.shoppinglist.Member;
@@ -29,7 +23,6 @@ import at.smartshopper.smartshopper.shoppinglist.details.item.Item;
public class Database {
private transient Connection conect;
final private String HOST = "188.166.124.80";
final private String DB_NAME = "smartshopperdb";
final private String USERNAME = "smartshopper-user";
@@ -39,6 +32,7 @@ public class Database {
final private int groupIdLength = 10;
final private int itemIdLength = 10;
final private int inviteLength = 50;
private transient Connection conect;
/**
@@ -133,6 +127,7 @@ public class Database {
/**
* Stopt eine Einladung, indem der Member die liste nichtmehr sehen kann
*
* @param invitelink Der invitelink
* @throws SQLException
* @throws JSONException
@@ -158,6 +153,7 @@ public class Database {
return invite;
}
/**
* Gibt den Invite link einer Shoppingliste zurück, wenn keiner vorhanden ist --> null
*

6
app/src/main/java/at/smartshopper/smartshopper/messaging/MyFirebaseMessagingService.java
View File

@@ -8,12 +8,12 @@ import android.media.RingtoneManager;
import android.net.Uri;
import android.support.v4.app.NotificationCompat;
import android.util.Log;
import com.google.firebase.messaging.FirebaseMessagingService;
import com.google.firebase.messaging.RemoteMessage;
import at.smartshopper.smartshopper.activitys.Dash;
import at.smartshopper.smartshopper.R;
import at.smartshopper.smartshopper.activitys.Dash;
public class MyFirebaseMessagingService extends FirebaseMessagingService {
@@ -48,7 +48,7 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
/**
* Persist token to third-party servers.
*
* <p>
* Modify this method to associate the user's FCM InstanceID token with any server-side account
* maintained by your application.
*

14
app/src/main/java/at/smartshopper/smartshopper/shoppinglist/Shoppinglist.java
View File

@@ -3,11 +3,11 @@ package at.smartshopper.smartshopper.shoppinglist;
public class Shoppinglist {
private String sl_id, name, description, invitelink, color;
/**
* Erstellt ein Object von Shoppinglist.
*
* @param sl_id Shoppinglist ID
* @param name Shoppinglist Name
* @param description Shoppinglist Beschreibung
@@ -30,11 +30,17 @@ public class Shoppinglist {
return this.name;
}
public String getdescription(){return this.description;}
public String getdescription() {
return this.description;
}
public String getInvitelink(){return this.invitelink;}
public String getInvitelink() {
return this.invitelink;
}
public String getcolor(){ return this.color;}
public String getcolor() {
return this.color;
}
@Override
public String toString() {

78
app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistAdapter.java
View File

@@ -1,11 +1,8 @@
package at.smartshopper.smartshopper.shoppinglist;
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.media.Image;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.widget.CardView;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
@@ -20,11 +17,9 @@ import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseUser;
import com.squareup.picasso.Picasso;
import java.sql.SQLException;
import java.util.List;
import at.smartshopper.smartshopper.R;
import at.smartshopper.smartshopper.activitys.ShoppinglistDetails;
import at.smartshopper.smartshopper.customViews.RoundCornersTransformation;
import at.smartshopper.smartshopper.db.Database;
@@ -140,6 +135,7 @@ public class ShoppinglistAdapter extends RecyclerView.Adapter<ShoppinglistAdapte
/**
* Holt die anzahl der items in dem Adapter
*
* @return Anzahl der Items in dem Adapter
*/
@Override
@@ -147,6 +143,42 @@ public class ShoppinglistAdapter extends RecyclerView.Adapter<ShoppinglistAdapte
return shoppinglist.size();
}
/**
* Setzt das OnChangeItemClick event
*
* @param onChangeClick Der Click event Listener
*/
public void setOnChangeClick(OnChangeItemClick onChangeClick) {
this.onChangeClick = onChangeClick;
}
/**
* Setzt das OnItemClicked event
*
* @param onClick Der Click Listener
*/
public void setOnDelClick(OnItemClicked onClick) {
this.onClick = onClick;
}
/**
* Setzt das OnChangeItemClick event
*
* @param onShareClick Der Click event Listener
*/
public void setOnShareClick(OnShareClick onShareClick) {
this.onShareClick = onShareClick;
}
/**
* Setzt das OnChangeItemClick event
*
* @param onShoppinglistClick Der Click event Listener
*/
public void setOnShoppinglistClick(OnShoppinglistClick onShoppinglistClick) {
this.onShoppinglistClick = onShoppinglistClick;
}
/**
* Interface damit onoclick in der dash activity ausgeführt werden kann
*/
@@ -161,23 +193,6 @@ public class ShoppinglistAdapter extends RecyclerView.Adapter<ShoppinglistAdapte
void onChangeItemClick(String sl_id, View v);
}
/**
* Setzt das OnChangeItemClick event
* @param onChangeClick Der Click event Listener
*/
public void setOnChangeClick(OnChangeItemClick onChangeClick){
this.onChangeClick = onChangeClick;
}
/**
* Setzt das OnItemClicked event
* @param onClick Der Click Listener
*/
public void setOnDelClick(OnItemClicked onClick)
{
this.onClick=onClick;
}
/**
* Interface damit onoclick in der dash activity ausgeführt werden kann
*/
@@ -185,14 +200,6 @@ public class ShoppinglistAdapter extends RecyclerView.Adapter<ShoppinglistAdapte
void onShareClick(String sl_id, View v);
}
/**
* Setzt das OnChangeItemClick event
* @param onShareClick Der Click event Listener
*/
public void setOnShareClick(OnShareClick onShareClick){
this.onShareClick = onShareClick;
}
/**
* Interface damit onoclick in der dash activity ausgeführt werden kann
*/
@@ -200,17 +207,6 @@ public class ShoppinglistAdapter extends RecyclerView.Adapter<ShoppinglistAdapte
void onShoppinglistClick(String sl_id, View v);
}
/**
* Setzt das OnChangeItemClick event
* @param onShoppinglistClick Der Click event Listener
*/
public void setOnShoppinglistClick(OnShoppinglistClick onShoppinglistClick){
this.onShoppinglistClick = onShoppinglistClick;
}
/**
* Haltet alle elemente. Durch ein Objekt von dem kann jedes Element welches hier drinnen angeführt ist verwendet werden
*/

79
app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistSharedAdapter.java
View File

@@ -2,7 +2,6 @@ package at.smartshopper.smartshopper.shoppinglist;
import android.content.Context;
import android.graphics.Color;
import android.net.Uri;
import android.support.v7.widget.CardView;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
@@ -13,8 +12,6 @@ import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseUser;
import com.squareup.picasso.Picasso;
import org.json.JSONException;
@@ -121,14 +118,12 @@ public class ShoppinglistSharedAdapter extends RecyclerView.Adapter<Shoppinglist
}
}
/**
* Holt die anzahl der items in dem Adapter
*
* @return Anzahl der Items in dem Adapter
*/
@Override
@@ -136,6 +131,42 @@ public class ShoppinglistSharedAdapter extends RecyclerView.Adapter<Shoppinglist
return shoppinglist.size();
}
/**
* Setzt das OnChangeItemClick event
*
* @param onChangeClick Der Click event Listener
*/
public void setOnChangeClick(SharedOnChangeItemClick onChangeClick) {
this.sharedOnChangeClick = onChangeClick;
}
/**
* Setzt das OnItemClicked event
*
* @param onClick Der Click Listener
*/
public void setOnDelClick(SharedOnItemClicked onClick) {
this.sharedOnClick = onClick;
}
/**
* Setzt das OnChangeItemClick event
*
* @param onShareClick Der Click event Listener
*/
public void setOnShareClick(SharedOnShareClick onShareClick) {
this.sharedOnShareClick = onShareClick;
}
/**
* Setzt das OnChangeItemClick event
*
* @param onShoppinglistClick Der Click event Listener
*/
public void setOnShoppinglistClick(SharedOnShoppinglistClick onShoppinglistClick) {
this.sharedOnShoppinglistClick = onShoppinglistClick;
}
/**
* Interface damit onoclick in der dash activity ausgeführt werden kann
*/
@@ -150,23 +181,6 @@ public class ShoppinglistSharedAdapter extends RecyclerView.Adapter<Shoppinglist
void sharedOnChangeItemClick(String sl_id, View v);
}
/**
* Setzt das OnChangeItemClick event
* @param onChangeClick Der Click event Listener
*/
public void setOnChangeClick(SharedOnChangeItemClick onChangeClick){
this.sharedOnChangeClick = onChangeClick;
}
/**
* Setzt das OnItemClicked event
* @param onClick Der Click Listener
*/
public void setOnDelClick(SharedOnItemClicked onClick)
{
this.sharedOnClick=onClick;
}
/**
* Interface damit onoclick in der dash activity ausgeführt werden kann
*/
@@ -174,14 +188,6 @@ public class ShoppinglistSharedAdapter extends RecyclerView.Adapter<Shoppinglist
void sharedOnShareClick(String sl_id, View v);
}
/**
* Setzt das OnChangeItemClick event
* @param onShareClick Der Click event Listener
*/
public void setOnShareClick(SharedOnShareClick onShareClick){
this.sharedOnShareClick = onShareClick;
}
/**
* Interface damit onoclick in der dash activity ausgeführt werden kann
*/
@@ -189,17 +195,6 @@ public class ShoppinglistSharedAdapter extends RecyclerView.Adapter<Shoppinglist
void sharedOnShoppinglistClick(String sl_id, View v);
}
/**
* Setzt das OnChangeItemClick event
* @param onShoppinglistClick Der Click event Listener
*/
public void setOnShoppinglistClick(SharedOnShoppinglistClick onShoppinglistClick){
this.sharedOnShoppinglistClick = onShoppinglistClick;
}
/**
* Haltet alle elemente. Durch ein Objekt von dem kann jedes Element welches hier drinnen angeführt ist verwendet werden
*/

65
app/src/main/java/at/smartshopper/smartshopper/shoppinglist/details/DetailsAdapter.java
View File

@@ -12,8 +12,11 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
import android.widget.TextView;
import com.squareup.picasso.Picasso;
import java.util.List;
import at.smartshopper.smartshopper.R;
import at.smartshopper.smartshopper.activitys.ItemListActivity;
import at.smartshopper.smartshopper.customViews.SpaceItemDecoration;
@@ -75,9 +78,6 @@ public class DetailsAdapter extends RecyclerView.Adapter<DetailsAdapter.MyViewHo
itemsrecycle.setAdapter(itemAdapter);
int cardcolor;
try {
cardcolor = Color.parseColor(details.get(i).getGroup().getColor());
@@ -122,21 +122,45 @@ public class DetailsAdapter extends RecyclerView.Adapter<DetailsAdapter.MyViewHo
v.getContext().startActivity(intent);
}
/**
* Interface damit onoclick in der Shoppinglistdetails activity ausgeführt werden kann
*/
public interface OnCardClicked {
void onCardClick(String group_id, String sl_id, String groupName, View v);
}
/**
* Setzt das OnChangeItemClick event
*
* @param onCardClicked Der Click event Listener
*/
public void setCardClick(OnCardClicked onCardClicked) {
this.onCardClicked = onCardClicked;
}
/**
* Setzt das OnChangeItemClick event
*
* @param onGroupDeleteClicked Der Click event Listener
*/
public void setGroupDeleteClick(OnGroupDeleteClicked onGroupDeleteClicked) {
this.onGroupDeleteClicked = onGroupDeleteClicked;
}
/**
* Setzt das OnChangeItemClick event
*
* @param onGroupEditClicked Der Click event Listener
*/
public void setGroupEditClick(OnGroupEditClicked onGroupEditClicked) {
this.onGroupEditClicked = onGroupEditClicked;
}
@Override
public int getItemCount() {
return details.size();
}
/**
* Interface damit onoclick in der Shoppinglistdetails activity ausgeführt werden kann
*/
public interface OnCardClicked {
void onCardClick(String group_id, String sl_id, String groupName, View v);
}
/**
* Interface damit onoclick in der Shoppinglistdetails activity ausgeführt werden kann
*/
@@ -144,14 +168,6 @@ public class DetailsAdapter extends RecyclerView.Adapter<DetailsAdapter.MyViewHo
void onGroupDeleteClick(String sl_id, String group_id, View v);
}
/**
* Setzt das OnChangeItemClick event
* @param onGroupDeleteClicked Der Click event Listener
*/
public void setGroupDeleteClick(OnGroupDeleteClicked onGroupDeleteClicked){
this.onGroupDeleteClicked = onGroupDeleteClicked;
}
/**
* Interface damit onoclick in der Shoppinglistdetails activity ausgeführt werden kann
*/
@@ -159,19 +175,6 @@ public class DetailsAdapter extends RecyclerView.Adapter<DetailsAdapter.MyViewHo
void onGroupEditClick(String sl_id, String group_id, View v);
}
/**
* Setzt das OnChangeItemClick event
* @param onGroupEditClicked Der Click event Listener
*/
public void setGroupEditClick(OnGroupEditClicked onGroupEditClicked){
this.onGroupEditClicked = onGroupEditClicked;
}
@Override
public int getItemCount() {
return details.size();
}
/**
* Haltet alle elemente. Durch ein Objekt von dem kann jedes Element welches hier drinnen angeführt ist verwendet werden
*/

32
app/src/main/java/at/smartshopper/smartshopper/shoppinglist/details/item/ItemAdapter.java
View File

@@ -1,10 +1,8 @@
package at.smartshopper.smartshopper.shoppinglist.details.item;
import android.graphics.Color;
import android.support.annotation.NonNull;
import android.support.v7.widget.CardView;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -16,15 +14,9 @@ import android.widget.TextView;
import com.google.firebase.auth.FirebaseAuth;
import com.squareup.picasso.Picasso;
import org.json.JSONException;
import java.sql.SQLException;
import java.util.List;
import at.smartshopper.smartshopper.R;
import at.smartshopper.smartshopper.db.Database;
import at.smartshopper.smartshopper.shoppinglist.ShoppinglistAdapter;
public class ItemAdapter extends RecyclerView.Adapter<ItemAdapter.MyViewHolder> {
@@ -97,26 +89,14 @@ public class ItemAdapter extends RecyclerView.Adapter<ItemAdapter.MyViewHolder>
}
public interface OnItemDelClicked {
void onItemDelClicked(String item_id, String group_id, String sl_id);
}
public void setItemDelClick(OnItemDelClicked onItemDelClicked) {
this.onItemDelClicked = onItemDelClicked;
}
public interface OnItemEditClicked {
void onItemEditClicked(String item_id, String group_id, String sl_id, View v);
}
public void setOnItemEditClick(OnItemEditClicked onItemEditClick) {
this.onItemEditClick = onItemEditClick;
}
public interface OnItemCheckClicked {
void onItemCheckClicked(String uid, String name, String itemId, String groupId, String sl_id, int count);
}
public void setOnItemCheckClick(OnItemCheckClicked onItemCheckClick) {
this.onItemCheckClick = onItemCheckClick;
}
@@ -126,6 +106,18 @@ public class ItemAdapter extends RecyclerView.Adapter<ItemAdapter.MyViewHolder>
return data.size();
}
public interface OnItemDelClicked {
void onItemDelClicked(String item_id, String group_id, String sl_id);
}
public interface OnItemEditClicked {
void onItemEditClicked(String item_id, String group_id, String sl_id, View v);
}
public interface OnItemCheckClicked {
void onItemCheckClicked(String uid, String name, String itemId, String groupId, String sl_id, int count);
}
/**
* Haltet alle elemente. Durch ein Objekt von dem kann jedes Element welches hier drinnen angeführt ist verwendet werden
*/

16
app/src/main/java/at/smartshopper/smartshopper/shoppinglist/details/item/ItemShoppinglistDetailsAdapter.java
View File

@@ -6,20 +6,13 @@ import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.ImageView;
import android.widget.TextView;
import com.google.firebase.auth.FirebaseAuth;
import com.squareup.picasso.Picasso;
import org.json.JSONException;
import java.sql.SQLException;
import java.util.List;
import at.smartshopper.smartshopper.R;
import at.smartshopper.smartshopper.db.Database;
@@ -78,11 +71,6 @@ public class ItemShoppinglistDetailsAdapter extends RecyclerView.Adapter<ItemSho
itemAnzahl.setText(data.get(i).getCount());
}
public interface OnItemEditClicked {
void onItemEditClicked(String item_id, String group_id, String sl_id, String groupName, View v);
}
public void setOnItemEditClick(OnItemEditClicked onItemEditClick) {
this.onItemEditClick = onItemEditClick;
}
@@ -92,6 +80,10 @@ public class ItemShoppinglistDetailsAdapter extends RecyclerView.Adapter<ItemSho
return data.size();
}
public interface OnItemEditClicked {
void onItemEditClicked(String item_id, String group_id, String sl_id, String groupName, View v);
}
/**
* Haltet alle elemente. Durch ein Objekt von dem kann jedes Element welches hier drinnen angeführt ist verwendet werden
*/

2
app/src/main/res/drawable/logo.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<selector>
</selector>

2
app/src/main/res/layout/activity_colorpicker.xml
View File

@@ -20,9 +20,9 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_below="@id/colorpickerview__color_picker_view"
android:layout_alignLeft="@id/colorpickerview__color_picker_view"
android:layout_alignRight="@id/colorpickerview__color_picker_view"
android:layout_below="@id/colorpickerview__color_picker_view"
android:layout_marginTop="16dp"
android:orientation="horizontal">

4
app/src/main/res/layout/activity_dash.xml
View File

@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<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">

1
app/src/main/res/layout/activity_login.xml
View File

@@ -60,6 +60,7 @@
app:layout_constraintStart_toStartOf="parent"
tools:layout_editor_absoluteY="232dp" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"

1
app/src/main/res/layout/cardviewgroup.xml
View File

@@ -3,7 +3,6 @@
<android.support.v7.widget.CardView 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:id="@+id/cardViewGroup"
android:layout_width="match_parent"
android:layout_height="wrap_content"

1
app/src/main/res/layout/cardviewitem.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView 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:id="@+id/itemCardView"
android:layout_width="match_parent"
android:layout_height="wrap_content"

3
app/src/main/res/layout/edit_share_member.xml
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_height="match_parent">
android:layout_width="match_parent"
android:layout_height="match_parent">
<TableLayout
android:layout_width="match_parent"

7
app/src/main/res/menu/dash_menu.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/addInvite"
android:title="Insert Invite" />
@@ -9,6 +8,6 @@
android:title="Erledigte Einkäufe" />
<item
android:id="@+id/logoutBtn"
android:title="Logout"
android:enabled="true" />
android:enabled="true"
android:title="Logout" />
</menu>

1
app/src/main/res/values/styles.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="AppTheme" parent="Theme.MaterialComponents.Light">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>

2
app/src/test/java/at/smartshopper/smartshopper/ExampleUnitTest.java
View File

@@ -2,7 +2,7 @@ package at.smartshopper.smartshopper;
import org.junit.Test;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
/**
* Example local unit test, which will execute on the development machine (host).