Fix Layout
Wegen dem Layout wurde es auf meinem Handy nicht angezeigt
This commit is contained in:
Georg Reisinger
BIN
.idea/caches/gradle_models.ser
generated
BIN
.idea/caches/gradle_models.ser
generated
Binary file not shown.
@@ -27,16 +27,16 @@ dependencies {
|
||||
testImplementation 'junit:junit:4.12'
|
||||
androidTestImplementation 'com.android.support.test:runner:1.0.2'
|
||||
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
|
||||
implementation 'com.google.firebase:firebase-auth:16.1.0'
|
||||
implementation 'com.google.firebase:firebase-messaging:17.3.4'
|
||||
implementation 'com.google.firebase:firebase-core:16.0.6'
|
||||
implementation 'com.google.firebase:firebase-storage:16.0.5'
|
||||
implementation 'com.google.firebase:firebase-auth:16.2.0'
|
||||
implementation 'com.google.firebase:firebase-messaging:17.4.0'
|
||||
implementation 'com.google.firebase:firebase-core:16.0.8'
|
||||
implementation 'com.google.firebase:firebase-storage:16.1.0'
|
||||
implementation 'com.firebase:firebase-jobdispatcher:0.8.5'
|
||||
implementation 'com.google.android.gms:play-services-auth:16.0.1'
|
||||
implementation 'com.firebaseui:firebase-ui-auth:4.1.0'
|
||||
implementation group: 'postgresql', name: 'postgresql', version: '9.1-901.jdbc4'
|
||||
implementation 'com.squareup.picasso:picasso:2.71828'
|
||||
implementation 'com.android.support:swiperefreshlayout:28.0.0-alpha1'
|
||||
implementation 'com.android.support:swiperefreshlayout:28.0.0'
|
||||
implementation 'com.android.support:cardview-v7:28.0.0'
|
||||
implementation 'com.github.danielnilsson9:color-picker-view:1.4.0@aar'
|
||||
implementation 'com.android.support:recyclerview-v7:28.0.0'
|
||||
|
||||
BIN
app/release/app-release.apk
Normal file
BIN
app/release/app-release.apk
Normal file
Binary file not shown.
19
app/release/output.json
Normal file
19
app/release/output.json
Normal file
@@ -0,0 +1,19 @@
|
||||
[
|
||||
{
|
||||
"outputType": {
|
||||
"type": "APK"
|
||||
},
|
||||
"apkInfo": {
|
||||
"type": "MAIN",
|
||||
"splits": [],
|
||||
"versionCode": 1,
|
||||
"versionName": "1.0",
|
||||
"enabled": true,
|
||||
"outputFile": "app-release.apk",
|
||||
"fullName": "release",
|
||||
"baseName": "release"
|
||||
},
|
||||
"path": "app-release.apk",
|
||||
"properties": {}
|
||||
}
|
||||
]
|
||||
@@ -37,14 +37,14 @@
|
||||
-->
|
||||
<meta-data
|
||||
android:name="com.google.firebase.messaging.default_notification_icon"
|
||||
android:resource="@drawable/ic_launcher_foreground" />
|
||||
android:resource="@mipmap/ic_launcher_round" />
|
||||
<!--
|
||||
Set color used with incoming notification messages. This is used when no color is set for the incoming
|
||||
notification message. See README(https://goo.gl/6BKBk7) for more.
|
||||
-->
|
||||
<meta-data
|
||||
android:name="com.google.firebase.messaging.default_notification_color"
|
||||
android:resource="@color/colorAccent" /> <!-- [START firebase_service] -->
|
||||
android:resource="@color/colorPrimaryDark" /> <!-- [START firebase_service] -->
|
||||
<service
|
||||
android:name="at.smartshopper.smartshopperapp.messaging.MyFirebaseMessagingService"
|
||||
android:stopWithTask="false">
|
||||
|
||||
@@ -164,8 +164,8 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte
|
||||
Intent intent = getIntent();
|
||||
String message = intent.getStringExtra("tab2");
|
||||
String wahr = "true";
|
||||
if(message != null){
|
||||
if(message.equals(wahr)) {
|
||||
if (message != null) {
|
||||
if (message.equals(wahr)) {
|
||||
host.setCurrentTab(1);
|
||||
}
|
||||
}
|
||||
@@ -426,15 +426,15 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte
|
||||
ArrayList<Shoppinglist> sharedListsArrayListTmp = new ArrayList<>();
|
||||
List<Shoppinglist> sharedListsListTmp;
|
||||
|
||||
if(sharedListsList.isEmpty()){
|
||||
sharedListsArrayListTmp.add(new Shoppinglist("empty","Keine Shoppingliste geteilt!","Um einen Invite Link hinzuzufügen, fügen Sie diesen im Menü ein.","empty","#8B0000"));
|
||||
if (sharedListsList.isEmpty()) {
|
||||
sharedListsArrayListTmp.add(new Shoppinglist("empty", "Keine Shoppingliste geteilt!", "Um einen Invite Link hinzuzufügen, fügen Sie diesen im Menü ein.", "empty", "#8B0000"));
|
||||
sharedListsListTmp = sharedListsArrayListTmp;
|
||||
}else{
|
||||
} else {
|
||||
sharedListsListTmp = sharedListsList;
|
||||
findViewById(R.id.pfeilnachunten3).setVisibility(View.GONE);
|
||||
}
|
||||
ShoppinglistSharedAdapter shpAdapter = new ShoppinglistSharedAdapter(Dash.this, sharedListsListTmp, db);
|
||||
if(sharedListsList.isEmpty()){
|
||||
if (sharedListsList.isEmpty()) {
|
||||
shpAdapter.setOnDelClick(new ShoppinglistSharedAdapter.SharedOnItemClicked() {
|
||||
@Override
|
||||
public void sharedOnItemClick(String sl_id) {
|
||||
@@ -459,7 +459,7 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte
|
||||
|
||||
}
|
||||
});
|
||||
}else {
|
||||
} else {
|
||||
shpAdapter.setOnDelClick(Dash.this);
|
||||
shpAdapter.setOnChangeClick(Dash.this);
|
||||
shpAdapter.setOnShareClick(Dash.this);
|
||||
@@ -469,7 +469,7 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte
|
||||
|
||||
}
|
||||
|
||||
private void onEmptyClick(){
|
||||
private void onEmptyClick() {
|
||||
|
||||
}
|
||||
|
||||
@@ -487,22 +487,22 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte
|
||||
List<Shoppinglist> ownListsListTmp;
|
||||
View pfeil = findViewById(R.id.pfeilnachunten3);
|
||||
|
||||
if(ownListsList.isEmpty()){
|
||||
ownListsArrayListTmp.add(new Shoppinglist("empty","Keine Shoppingliste vorhanden!","Bitte eine Shoppingliste hinzufügen!","empty","#8B0000"));
|
||||
if (ownListsList.isEmpty()) {
|
||||
ownListsArrayListTmp.add(new Shoppinglist("empty", "Keine Shoppingliste vorhanden!", "Bitte eine Shoppingliste hinzufügen!", "empty", "#8B0000"));
|
||||
pfeil.setVisibility(View.VISIBLE);
|
||||
ownListsListTmp = ownListsArrayListTmp;
|
||||
}else{
|
||||
} else {
|
||||
ownListsListTmp = ownListsList;
|
||||
pfeil.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
ShoppinglistAdapter shpAdapter = new ShoppinglistAdapter(Dash.this, ownListsListTmp, db);
|
||||
if(!ownListsList.isEmpty()) {
|
||||
if (!ownListsList.isEmpty()) {
|
||||
shpAdapter.setOnDelClick(Dash.this);
|
||||
shpAdapter.setOnChangeClick(Dash.this);
|
||||
shpAdapter.setOnShareClick(Dash.this);
|
||||
shpAdapter.setOnShoppinglistClick(Dash.this);
|
||||
}else{
|
||||
} else {
|
||||
shpAdapter.setOnDelClick(new ShoppinglistAdapter.OnItemClicked() {
|
||||
@Override
|
||||
public void onItemClick(String sl_id) {
|
||||
@@ -566,8 +566,7 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
}
|
||||
else if (i ==1) {
|
||||
} else if (i == 1) {
|
||||
try {
|
||||
showSharedShoppingList(uid);
|
||||
} catch (JSONException e) {
|
||||
|
||||
@@ -50,15 +50,54 @@ import at.smartshopper.smartshopperapp.shoppinglist.Member;
|
||||
|
||||
public class EditUser extends Activity {
|
||||
|
||||
public static final int RequestPermissionCode = 1;
|
||||
private final FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
|
||||
private EditText editname;
|
||||
private ImageView userbild;
|
||||
private Button finish, chooseImg;
|
||||
private Database db;
|
||||
private final FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
|
||||
private Uri uri;
|
||||
private Intent CamIntent, GalIntent, CropIntent;
|
||||
private File file;
|
||||
public static final int RequestPermissionCode = 1;
|
||||
|
||||
public static void doRestart(Context c) {
|
||||
try {
|
||||
//check if the context is given
|
||||
if (c != null) {
|
||||
//fetch the packagemanager so we can get the default launch activity
|
||||
// (you can replace this intent with any other activity if you want
|
||||
PackageManager pm = c.getPackageManager();
|
||||
//check if we got the PackageManager
|
||||
if (pm != null) {
|
||||
//create the intent with the default start activity for your application
|
||||
Intent mStartActivity = pm.getLaunchIntentForPackage(
|
||||
c.getPackageName()
|
||||
);
|
||||
if (mStartActivity != null) {
|
||||
mStartActivity.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||
//create a pending intent so the application is restarted after System.exit(0) was called.
|
||||
// We use an AlarmManager to call this intent in 100ms
|
||||
int mPendingIntentId = 223344;
|
||||
PendingIntent mPendingIntent = PendingIntent
|
||||
.getActivity(c, mPendingIntentId, mStartActivity,
|
||||
PendingIntent.FLAG_CANCEL_CURRENT);
|
||||
AlarmManager mgr = (AlarmManager) c.getSystemService(Context.ALARM_SERVICE);
|
||||
mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, mPendingIntent);
|
||||
//kill the application
|
||||
System.exit(0);
|
||||
} else {
|
||||
Log.e("SmartShopper", "Was not able to restart application, mStartActivity null");
|
||||
}
|
||||
} else {
|
||||
Log.e("SmartShopper", "Was not able to restart application, PM null");
|
||||
}
|
||||
} else {
|
||||
Log.e("SmartShopper", "Was not able to restart application, Context null");
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
Log.e("SmartShopper", "Was not able to restart application");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
@@ -128,45 +167,6 @@ public class EditUser extends Activity {
|
||||
});
|
||||
}
|
||||
|
||||
public static void doRestart(Context c) {
|
||||
try {
|
||||
//check if the context is given
|
||||
if (c != null) {
|
||||
//fetch the packagemanager so we can get the default launch activity
|
||||
// (you can replace this intent with any other activity if you want
|
||||
PackageManager pm = c.getPackageManager();
|
||||
//check if we got the PackageManager
|
||||
if (pm != null) {
|
||||
//create the intent with the default start activity for your application
|
||||
Intent mStartActivity = pm.getLaunchIntentForPackage(
|
||||
c.getPackageName()
|
||||
);
|
||||
if (mStartActivity != null) {
|
||||
mStartActivity.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||
//create a pending intent so the application is restarted after System.exit(0) was called.
|
||||
// We use an AlarmManager to call this intent in 100ms
|
||||
int mPendingIntentId = 223344;
|
||||
PendingIntent mPendingIntent = PendingIntent
|
||||
.getActivity(c, mPendingIntentId, mStartActivity,
|
||||
PendingIntent.FLAG_CANCEL_CURRENT);
|
||||
AlarmManager mgr = (AlarmManager) c.getSystemService(Context.ALARM_SERVICE);
|
||||
mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, mPendingIntent);
|
||||
//kill the application
|
||||
System.exit(0);
|
||||
} else {
|
||||
Log.e("SmartShopper", "Was not able to restart application, mStartActivity null");
|
||||
}
|
||||
} else {
|
||||
Log.e("SmartShopper", "Was not able to restart application, PM null");
|
||||
}
|
||||
} else {
|
||||
Log.e("SmartShopper", "Was not able to restart application, Context null");
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
Log.e("SmartShopper", "Was not able to restart application");
|
||||
}
|
||||
}
|
||||
|
||||
public void ClickImageFromCamera() {
|
||||
|
||||
CamIntent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
|
||||
|
||||
@@ -128,7 +128,7 @@ public class ItemListActivity extends AppCompatActivity implements ItemAdapter.O
|
||||
*/
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
ToolbarHelper th = new ToolbarHelper(getApplicationContext(),getWindow().getDecorView());
|
||||
ToolbarHelper th = new ToolbarHelper(getApplicationContext(), getWindow().getDecorView());
|
||||
switch (item.getItemId()) {
|
||||
case R.id.logoutBtn:
|
||||
th.logout();
|
||||
@@ -181,17 +181,17 @@ public class ItemListActivity extends AppCompatActivity implements ItemAdapter.O
|
||||
ArrayList<Item> itemArrayListTmp = new ArrayList<>();
|
||||
List itemListTmp;
|
||||
View pfeil = findViewById(R.id.pfeilnachunten2);
|
||||
if(itemList.isEmpty()){
|
||||
if (itemList.isEmpty()) {
|
||||
itemArrayListTmp.add(new Item("empty", "empty", "empty", "Bitte ein Item Hinzufügen!", ""));
|
||||
itemListTmp = itemArrayListTmp;
|
||||
pfeil.setVisibility(View.VISIBLE);
|
||||
}else{
|
||||
} else {
|
||||
itemListTmp = itemList;
|
||||
pfeil.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
ItemAdapter itemAdapter = new ItemAdapter(itemListTmp);
|
||||
if(itemList.isEmpty()){
|
||||
if (itemList.isEmpty()) {
|
||||
itemAdapter.setOnItemEditClick(new ItemAdapter.OnItemEditClicked() {
|
||||
@Override
|
||||
public void onItemEditClicked(String item_id, String group_id, String sl_id, View v) {
|
||||
@@ -210,7 +210,7 @@ public class ItemListActivity extends AppCompatActivity implements ItemAdapter.O
|
||||
|
||||
}
|
||||
});
|
||||
}else {
|
||||
} else {
|
||||
itemAdapter.setOnItemEditClick(this);
|
||||
itemAdapter.setItemDelClick(this);
|
||||
itemAdapter.setOnItemCheckClick(this);
|
||||
|
||||
@@ -6,8 +6,8 @@ import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.support.design.widget.FloatingActionButton;
|
||||
import android.support.v4.widget.SwipeRefreshLayout;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import android.support.v7.app.AppCompatActivity;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import android.text.Editable;
|
||||
import android.text.TextWatcher;
|
||||
@@ -53,6 +53,15 @@ public class ShoppinglistDetails extends AppCompatActivity implements DetailsAda
|
||||
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);
|
||||
}
|
||||
|
||||
/**
|
||||
* Menu item Action listener
|
||||
@@ -62,7 +71,7 @@ public class ShoppinglistDetails extends AppCompatActivity implements DetailsAda
|
||||
*/
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
ToolbarHelper th = new ToolbarHelper(getApplicationContext(),getWindow().getDecorView());
|
||||
ToolbarHelper th = new ToolbarHelper(getApplicationContext(), getWindow().getDecorView());
|
||||
switch (item.getItemId()) {
|
||||
case R.id.logoutBtn:
|
||||
th.logout();
|
||||
@@ -105,16 +114,6 @@ public class ShoppinglistDetails extends AppCompatActivity implements DetailsAda
|
||||
startActivity(intent);
|
||||
}
|
||||
|
||||
/**
|
||||
* 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);
|
||||
@@ -367,19 +366,19 @@ public class ShoppinglistDetails extends AppCompatActivity implements DetailsAda
|
||||
ArrayList<Details> detailsArrayListTmp = new ArrayList<>();
|
||||
List<Details> detailsListTmp;
|
||||
View pfeil = findViewById(R.id.pfeilnachunten);
|
||||
if(detailsList.isEmpty()){
|
||||
Group group = new Group("empty","empty","Keine Gruppe vorhanden!","#8B0000","empty");
|
||||
if (detailsList.isEmpty()) {
|
||||
Group group = new Group("empty", "empty", "Keine Gruppe vorhanden!", "#8B0000", "empty");
|
||||
Details details = new Details(group);
|
||||
details.addItem(new Item("empty","empty","empty","Bitte eine Gruppe Hinzufügen!",""));
|
||||
details.addItem(new Item("empty", "empty", "empty", "Bitte eine Gruppe Hinzufügen!", ""));
|
||||
detailsArrayListTmp.add(details);
|
||||
pfeil.setVisibility(View.VISIBLE);
|
||||
detailsListTmp = detailsArrayListTmp;
|
||||
}else{
|
||||
} else {
|
||||
pfeil.setVisibility(View.INVISIBLE);
|
||||
detailsListTmp = detailsList;
|
||||
}
|
||||
DetailsAdapter detailsAdapter = new DetailsAdapter(detailsListTmp, db);
|
||||
if(detailsList.isEmpty()){
|
||||
if (detailsList.isEmpty()) {
|
||||
detailsAdapter.setGroupEditClick(new DetailsAdapter.OnGroupEditClicked() {
|
||||
@Override
|
||||
public void onGroupEditClick(String sl_id, String group_id, View v) {
|
||||
@@ -398,7 +397,7 @@ public class ShoppinglistDetails extends AppCompatActivity implements DetailsAda
|
||||
|
||||
}
|
||||
});
|
||||
}else {
|
||||
} else {
|
||||
|
||||
detailsAdapter.setGroupEditClick(this);
|
||||
detailsAdapter.setGroupDeleteClick(this);
|
||||
|
||||
@@ -51,7 +51,7 @@ public class ToolbarHelper extends Activity {
|
||||
context.startActivity(intent);
|
||||
}
|
||||
|
||||
public void doneEinkauf(String from, String sl_id,String group_id, String groupname) {
|
||||
public void doneEinkauf(String from, String sl_id, String group_id, String groupname) {
|
||||
finish();
|
||||
Intent intent = new Intent(context, DoneItemActivity.class);
|
||||
intent.putExtra("from", from);
|
||||
|
||||
@@ -485,7 +485,7 @@ public class Database {
|
||||
*/
|
||||
public void createUser(String username, String message_id, String name, String picture, String email) throws SQLException {
|
||||
String SQL = "INSERT INTO \"User\" (username, message_id, name, picture, email) VALUES (?, ?, ?, ?, ?)";
|
||||
if(picture.isEmpty()){
|
||||
if (picture.isEmpty()) {
|
||||
picture = "https://st2.depositphotos.com/1537427/5927/v/950/depositphotos_59279377-stock-illustration-user-icon.jpg";
|
||||
}
|
||||
sqlUpdate5Param(SQL, username, message_id, name, picture, email);
|
||||
|
||||
@@ -4,6 +4,7 @@ import android.content.Context;
|
||||
import android.graphics.Color;
|
||||
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;
|
||||
@@ -72,11 +73,14 @@ public class ShoppinglistAdapter extends RecyclerView.Adapter<ShoppinglistAdapte
|
||||
final Shoppinglist shoppinglist = this.shoppinglist.get(position);
|
||||
final ImageButton shareButton = holder.share;
|
||||
TextView beschreibung = holder.textViewBeschreibung;
|
||||
ImageButton bearbeiten = holder.bearbeiten;
|
||||
ImageButton delete = holder.del;
|
||||
beschreibung.setText(shoppinglist.getdescription());
|
||||
|
||||
Picasso.get().load(R.drawable.share).into(shareButton);
|
||||
|
||||
Picasso.get().load(R.drawable.bearbeiten).into(holder.bearbeiten);
|
||||
Picasso.get().load(R.drawable.delete).into(holder.del);
|
||||
Picasso.get().load(R.drawable.bearbeiten).into(bearbeiten);
|
||||
Picasso.get().load(R.drawable.delete).into(delete);
|
||||
|
||||
//binding the data with the viewholder views
|
||||
holder.textViewTitle.setText(shoppinglist.getname());
|
||||
@@ -118,30 +122,26 @@ public class ShoppinglistAdapter extends RecyclerView.Adapter<ShoppinglistAdapte
|
||||
holder.shoppinglistColor.setBackgroundColor(cardcolor);
|
||||
|
||||
|
||||
String uid = FirebaseAuth.getInstance().getUid();
|
||||
String uid = FirebaseAuth.getInstance().getUid();
|
||||
|
||||
|
||||
|
||||
try {
|
||||
Member user = db.getUser(uid);
|
||||
holder.ownerName.setText(user.getName());
|
||||
Picasso.get().load(user.getPic()).resize(250, 250).transform(new RoundCornersTransformation(15, 15, true, true)).into(holder.imageView);
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
} catch (JSONException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
// holder.imageView.setImageDrawable(Drawable.createFromPath("@drawable/common_google_signin_btn_icon_dark"));
|
||||
|
||||
// Check if user's email is verified
|
||||
|
||||
// The user's ID, unique to the Firebase project. Do NOT use this value to
|
||||
// authenticate with your backend server, if you have one. Use
|
||||
// FirebaseUser.getIdToken() instead.
|
||||
try {
|
||||
Member user = db.getUser(uid);
|
||||
holder.ownerName.setText(user.getName());
|
||||
Picasso.get().load(user.getPic()).resize(250, 250).transform(new RoundCornersTransformation(15, 15, true, true)).into(holder.imageView);
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
} catch (JSONException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
// holder.imageView.setImageDrawable(Drawable.createFromPath("@drawable/common_google_signin_btn_icon_dark"));
|
||||
|
||||
// Check if user's email is verified
|
||||
|
||||
|
||||
// The user's ID, unique to the Firebase project. Do NOT use this value to
|
||||
// authenticate with your backend server, if you have one. Use
|
||||
// FirebaseUser.getIdToken() instead.
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
@@ -226,7 +226,8 @@ String uid = FirebaseAuth.getInstance().getUid();
|
||||
TextView textViewTitle, textViewBeschreibung, ownerName;
|
||||
ImageView imageView;
|
||||
CardView ownList;
|
||||
ImageButton bearbeiten, del, share;
|
||||
ImageButton del, share;
|
||||
ImageButton bearbeiten;
|
||||
View shoppinglistColor;
|
||||
|
||||
public ShoppinglistViewHolder(View itemView) {
|
||||
@@ -237,10 +238,11 @@ String uid = FirebaseAuth.getInstance().getUid();
|
||||
imageView = itemView.findViewById(R.id.shoppinglistOwner);
|
||||
ownerName = itemView.findViewById(R.id.ownerName);
|
||||
ownList = itemView.findViewById(R.id.ownLists);
|
||||
bearbeiten = itemView.findViewById(R.id.bearbeiteShoppinglist);
|
||||
del = itemView.findViewById(R.id.deleteShoppinglist);
|
||||
bearbeiten = itemView.findViewById(R.id.shpEdit);
|
||||
Log.d("SmartShopper", bearbeiten.toString());
|
||||
del = itemView.findViewById(R.id.shpDel);
|
||||
shoppinglistColor = itemView.findViewById(R.id.shoppinglistColor);
|
||||
share = itemView.findViewById(R.id.shareButton);
|
||||
share = itemView.findViewById(R.id.shareEditButton);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -77,6 +77,8 @@ public class ShoppinglistSharedAdapter extends RecyclerView.Adapter<Shoppinglist
|
||||
beschreibung.setText(shoppinglist.getdescription());
|
||||
Picasso.get().load(R.drawable.share).into(shareButton);
|
||||
|
||||
Picasso.get().load(R.drawable.bearbeiten).into(holder.bearbeiten);
|
||||
|
||||
//binding the data with the viewholder views
|
||||
holder.textViewTitle.setText(shoppinglist.getname());
|
||||
System.out.println(shoppinglist.getname());
|
||||
@@ -110,7 +112,7 @@ public class ShoppinglistSharedAdapter extends RecyclerView.Adapter<Shoppinglist
|
||||
|
||||
holder.shoppinglistColor.setBackgroundColor(cardcolor);
|
||||
|
||||
if(shoppinglist.getSlId().equals("empty")){
|
||||
if (shoppinglist.getSlId().equals("empty")) {
|
||||
FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
|
||||
if (user != null) {
|
||||
// Name, email address, and profile photo Url
|
||||
@@ -128,7 +130,7 @@ public class ShoppinglistSharedAdapter extends RecyclerView.Adapter<Shoppinglist
|
||||
}
|
||||
}
|
||||
try {
|
||||
if(!shoppinglist.getSlId().equals("empty")){
|
||||
if (!shoppinglist.getSlId().equals("empty")) {
|
||||
Member admin = db.getAdmin(shoppinglist.getSlId());
|
||||
Picasso.get().load(admin.getPic()).resize(250, 250).transform(new RoundCornersTransformation(15, 15, true, true)).into(holder.imageView);
|
||||
holder.ownerName.setText(admin.getName());
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<!-- Colored rectangle-->
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
@@ -7,17 +7,16 @@
|
||||
android:width="100dp"
|
||||
android:height="40dp" />
|
||||
<solid android:color="#5EB888" />
|
||||
<corners android:radius="0dp"/>
|
||||
<corners android:radius="0dp" />
|
||||
</shape>
|
||||
</item>
|
||||
<!-- This rectangle for the top arrow edge -->
|
||||
<!-- Its color should be the same as the layout's background -->
|
||||
<item
|
||||
android:top="-40dp"
|
||||
android:bottom="65dp"
|
||||
android:right="-30dp">
|
||||
<rotate
|
||||
android:fromDegrees="45">
|
||||
android:right="-30dp"
|
||||
android:top="-40dp">
|
||||
<rotate android:fromDegrees="45">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="#ffffff" />
|
||||
</shape>
|
||||
@@ -26,11 +25,10 @@
|
||||
<!-- This rectangle for the lower arrow edge -->
|
||||
<!-- Its color should be the same as the layout's background -->
|
||||
<item
|
||||
android:top="65dp"
|
||||
android:bottom="-40dp"
|
||||
android:right="-30dp">
|
||||
<rotate
|
||||
android:fromDegrees="-45">
|
||||
android:right="-30dp"
|
||||
android:top="65dp">
|
||||
<rotate android:fromDegrees="-45">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="#ffffff" />
|
||||
</shape>
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
android:height="400dp"
|
||||
android:viewportWidth="100"
|
||||
android:viewportHeight="400">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M64.3,289.2c2.8,-22.6 4.8,-45.3 6.2,-68.1c1.4,-22.8 2.4,-45.6 3.4,-68.4c1,-22.9 2.3,-45.8 4,-68.6c1.8,-22.9 3.8,-45.7 5.9,-68.5l4.9,5.9c-11.8,-0.7 -23.7,-0.6 -35.3,-0.2s-24,0.9 -36.1,0.5l5.4,-5.7c1.1,22.6 2.5,45.2 4,67.7l4.5,67.8c1.5,22.6 3,45.1 4.3,67.8c1.3,22.7 2.3,45.3 3.2,67.9c0,1.9 -1.5,3.5 -3.4,3.5c-1.8,0 -3.2,-1.4 -3.4,-3.2c-1.5,-22.6 -3.2,-45.1 -5.1,-67.7l-5.4,-67.7c-1.8,-22.5 -3.5,-45.1 -5.1,-67.8c-1.6,-22.7 -3.1,-45.1 -4.3,-67.9c-0.2,-3 2.1,-5.6 5,-5.7l0.4,0c11.7,0.3 23.7,-0.3 35.5,-0.6s24.2,-0.3 36.3,0.4l0,0c2.9,0 5.2,2.4 5.2,5.4c0,0.1 0,0.2 0,0.3l0,0.2C92.2,39.3 89.9,62 88,84.8c-2,22.8 -3.5,45.5 -4.9,68.3s-2.6,45.7 -4.7,68.5c-2.1,22.9 -4.7,45.7 -8.1,68.3c-0.2,1.7 -1.8,2.9 -3.5,2.7c-1.7,-0.2 -2.8,-1.8 -2.6,-3.5L64.3,289.2z"/>
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M91.2,291.5l-38.9,1.1l-38.7,1.2l3.4,-5.5c7.1,15.2 14.5,30.3 21.9,45.3c7.4,15 14.9,30.1 22,45.2l-13.9,0c2.9,-7.3 5.9,-14.4 9.1,-21.4c3.2,-7 6.4,-13.9 10.1,-20.8l5.6,-10.6l6.2,-11L91.2,291.5zM96.9,287.6c-1.9,6.9 -4.3,14.8 -6.7,22.8l-3.9,12.2l-4.4,12.5c-3,8.4 -6.4,16.9 -10.1,25.2s-7.1,16.8 -10.8,24.8l0,0.3c-1.7,3.9 -6.2,5.6 -9.9,3.8c-0.1,0 -0.1,-0.1 -0.2,-0.1c-1.7,-0.8 -3,-2.2 -3.7,-4c-6.4,-15.6 -12.4,-31.2 -18.5,-46.9c-6.1,-15.7 -12.1,-31.2 -18.6,-46.8l0,0c-0.8,-2 0.1,-4.2 2,-5c0.5,-0.2 1,-0.3 1.6,-0.3l41.7,0.9L96.9,287.6z"/>
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M56.1,274c1,-16.2 1.6,-32.5 2.4,-48.6s1.2,-32.5 1.6,-48.7l0.8,-24.3l1,-24.3c0.8,-16.2 1.9,-32.5 4,-48.6c0.1,-0.6 0.6,-1.1 1.2,-1c0,0 0,0 0.1,0c0.6,0.1 1,0.6 1,1.1c0.5,16.3 0.1,32.5 -0.9,48.8l-1.4,24.3L64.1,177c-1.2,16.2 -2.2,32.4 -3.2,48.6c-0.8,16.2 -1.9,32.4 -2.5,48.6c0,0.6 -0.5,1.1 -1.1,1.1c0,0 0,0 0,0c-0.6,0 -1.1,-0.5 -1.1,-1.1C56.1,274.1 56.1,274.1 56.1,274L56.1,274z"/>
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M64.3,289.2c2.8,-22.6 4.8,-45.3 6.2,-68.1c1.4,-22.8 2.4,-45.6 3.4,-68.4c1,-22.9 2.3,-45.8 4,-68.6c1.8,-22.9 3.8,-45.7 5.9,-68.5l4.9,5.9c-11.8,-0.7 -23.7,-0.6 -35.3,-0.2s-24,0.9 -36.1,0.5l5.4,-5.7c1.1,22.6 2.5,45.2 4,67.7l4.5,67.8c1.5,22.6 3,45.1 4.3,67.8c1.3,22.7 2.3,45.3 3.2,67.9c0,1.9 -1.5,3.5 -3.4,3.5c-1.8,0 -3.2,-1.4 -3.4,-3.2c-1.5,-22.6 -3.2,-45.1 -5.1,-67.7l-5.4,-67.7c-1.8,-22.5 -3.5,-45.1 -5.1,-67.8c-1.6,-22.7 -3.1,-45.1 -4.3,-67.9c-0.2,-3 2.1,-5.6 5,-5.7l0.4,0c11.7,0.3 23.7,-0.3 35.5,-0.6s24.2,-0.3 36.3,0.4l0,0c2.9,0 5.2,2.4 5.2,5.4c0,0.1 0,0.2 0,0.3l0,0.2C92.2,39.3 89.9,62 88,84.8c-2,22.8 -3.5,45.5 -4.9,68.3s-2.6,45.7 -4.7,68.5c-2.1,22.9 -4.7,45.7 -8.1,68.3c-0.2,1.7 -1.8,2.9 -3.5,2.7c-1.7,-0.2 -2.8,-1.8 -2.6,-3.5L64.3,289.2z" />
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M91.2,291.5l-38.9,1.1l-38.7,1.2l3.4,-5.5c7.1,15.2 14.5,30.3 21.9,45.3c7.4,15 14.9,30.1 22,45.2l-13.9,0c2.9,-7.3 5.9,-14.4 9.1,-21.4c3.2,-7 6.4,-13.9 10.1,-20.8l5.6,-10.6l6.2,-11L91.2,291.5zM96.9,287.6c-1.9,6.9 -4.3,14.8 -6.7,22.8l-3.9,12.2l-4.4,12.5c-3,8.4 -6.4,16.9 -10.1,25.2s-7.1,16.8 -10.8,24.8l0,0.3c-1.7,3.9 -6.2,5.6 -9.9,3.8c-0.1,0 -0.1,-0.1 -0.2,-0.1c-1.7,-0.8 -3,-2.2 -3.7,-4c-6.4,-15.6 -12.4,-31.2 -18.5,-46.9c-6.1,-15.7 -12.1,-31.2 -18.6,-46.8l0,0c-0.8,-2 0.1,-4.2 2,-5c0.5,-0.2 1,-0.3 1.6,-0.3l41.7,0.9L96.9,287.6z" />
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M56.1,274c1,-16.2 1.6,-32.5 2.4,-48.6s1.2,-32.5 1.6,-48.7l0.8,-24.3l1,-24.3c0.8,-16.2 1.9,-32.5 4,-48.6c0.1,-0.6 0.6,-1.1 1.2,-1c0,0 0,0 0.1,0c0.6,0.1 1,0.6 1,1.1c0.5,16.3 0.1,32.5 -0.9,48.8l-1.4,24.3L64.1,177c-1.2,16.2 -2.2,32.4 -3.2,48.6c-0.8,16.2 -1.9,32.4 -2.5,48.6c0,0.6 -0.5,1.1 -1.1,1.1c0,0 0,0 0,0c-0.6,0 -1.1,-0.5 -1.1,-1.1C56.1,274.1 56.1,274.1 56.1,274L56.1,274z" />
|
||||
</vector>
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
<?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">
|
||||
|
||||
|
||||
@@ -9,31 +9,50 @@
|
||||
card_view:cardElevation="4dp"
|
||||
card_view:cardUseCompatPadding="true">
|
||||
|
||||
<TableRow
|
||||
<android.support.constraint.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<android.support.constraint.Guideline
|
||||
android:id="@+id/guideline6"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
card_view:layout_constraintGuide_begin="118dp" />
|
||||
|
||||
<android.support.constraint.Guideline
|
||||
android:id="@+id/guideline4"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
card_view:layout_constraintGuide_begin="32dp" />
|
||||
|
||||
<View
|
||||
android:id="@+id/shoppinglistColor"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp "
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:src="@drawable/rechteck"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toStartOf="@+id/guideline4"
|
||||
card_view:layout_constraintStart_toStartOf="parent"
|
||||
card_view:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<android.support.constraint.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<View
|
||||
android:id="@+id/shoppinglistColor"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp "
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:src="@drawable/rechteck"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toStartOf="@+id/guideline4"
|
||||
card_view:layout_constraintStart_toStartOf="parent"
|
||||
card_view:layout_constraintTop_toTopOf="parent" />
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginEnd="8dp"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toStartOf="@+id/guideline6"
|
||||
card_view:layout_constraintStart_toStartOf="@+id/guideline4"
|
||||
card_view:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linearLayout2"
|
||||
android:layout_width="0dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
@@ -41,131 +60,159 @@
|
||||
android:gravity="center"
|
||||
android:orientation="vertical"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toStartOf="@+id/guideline"
|
||||
card_view:layout_constraintStart_toStartOf="@+id/guideline4"
|
||||
card_view:layout_constraintTop_toTopOf="parent"
|
||||
card_view:layout_constraintVertical_bias="0.436">
|
||||
card_view:layout_constraintStart_toStartOf="parent"
|
||||
card_view:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/shoppinglistOwner"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/common_google_signin_btn_icon_dark"
|
||||
card_view:layout_constraintStart_toStartOf="parent"
|
||||
card_view:layout_constraintTop_toTopOf="parent"
|
||||
tools:srcCompat="@drawable/common_google_signin_btn_icon_dark" />
|
||||
card_view:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/ownerName"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="OwnerName"
|
||||
android:textSize="10sp"
|
||||
android:textSize="12sp"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintStart_toStartOf="parent"
|
||||
card_view:layout_constraintTop_toBottomOf="@+id/shoppinglistOwner" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<android.support.constraint.Guideline
|
||||
android:id="@+id/guideline"
|
||||
android:layout_width="wrap_content"
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
|
||||
<TableLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:gravity="fill"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toEndOf="parent"
|
||||
card_view:layout_constraintStart_toStartOf="@+id/guideline6"
|
||||
card_view:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<TableRow
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
card_view:layout_constraintGuide_begin="111dp" />
|
||||
android:gravity="right">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linearLayout"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:gravity="center"
|
||||
android:orientation="vertical"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toStartOf="@+id/guideline2"
|
||||
card_view:layout_constraintStart_toStartOf="@+id/guideline"
|
||||
card_view:layout_constraintTop_toTopOf="parent">
|
||||
<android.support.constraint.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/shoppinglistName"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:text="Name"
|
||||
android:textSize="18sp"
|
||||
android:textStyle="bold"
|
||||
card_view:layout_constraintEnd_toEndOf="parent"
|
||||
card_view:layout_constraintStart_toEndOf="@+id/shoppinglistOwner"
|
||||
card_view:layout_constraintTop_toTopOf="parent" />
|
||||
<android.support.constraint.ConstraintLayout
|
||||
android:id="@+id/constraintLayout2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toEndOf="parent"
|
||||
card_view:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/shoppinglistBeschreibung"
|
||||
<ImageButton
|
||||
android:id="@+id/shareEditButton"
|
||||
android:layout_width="@dimen/buttonSize"
|
||||
android:layout_height="@dimen/buttonSize"
|
||||
android:layout_marginStart="8dp"
|
||||
android:background="@color/fui_transparent"
|
||||
android:contentDescription="Share Button"
|
||||
android:scaleType="fitXY"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintStart_toStartOf="parent"
|
||||
card_view:layout_constraintTop_toTopOf="parent"
|
||||
card_view:srcCompat="@drawable/share" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/shpEdit"
|
||||
android:layout_width="@dimen/buttonSize"
|
||||
android:layout_height="@dimen/buttonSize"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:background="@color/fui_transparent"
|
||||
android:contentDescription="Edit Button"
|
||||
android:scaleType="fitXY"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toStartOf="@+id/shpDel"
|
||||
card_view:layout_constraintStart_toEndOf="@+id/shareEditButton"
|
||||
card_view:layout_constraintTop_toTopOf="parent"
|
||||
card_view:srcCompat="@drawable/bearbeiten"
|
||||
tools:srcCompat="@drawable/bearbeiten" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/shpDel"
|
||||
android:layout_width="@dimen/buttonSize"
|
||||
android:layout_height="@dimen/buttonSize"
|
||||
android:background="@color/fui_transparent"
|
||||
android:contentDescription="Delete Button"
|
||||
android:scaleType="fitXY"
|
||||
android:src="@drawable/delete"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toEndOf="parent"
|
||||
card_view:layout_constraintTop_toTopOf="parent"
|
||||
tools:src="@drawable/delete" />
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
</TableRow>
|
||||
|
||||
<TableRow
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center">
|
||||
|
||||
<android.support.constraint.ConstraintLayout
|
||||
android:id="@+id/constraintLayout3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:text="Beschreibung"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toEndOf="parent"
|
||||
card_view:layout_constraintStart_toEndOf="@+id/shoppinglistOwner"
|
||||
card_view:layout_constraintTop_toBottomOf="@+id/shoppinglistName" />
|
||||
</LinearLayout>
|
||||
card_view:layout_constraintStart_toStartOf="parent"
|
||||
card_view:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<android.support.constraint.Guideline
|
||||
android:id="@+id/guideline2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
card_view:layout_constraintGuide_begin="319dp" />
|
||||
<TextView
|
||||
android:id="@+id/shoppinglistBeschreibung"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:text="Beschreibung"
|
||||
android:textAlignment="center"
|
||||
android:textSize="18sp"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toEndOf="parent"
|
||||
card_view:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linearLayout3"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:gravity="right|top"
|
||||
android:orientation="horizontal"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toEndOf="parent"
|
||||
card_view:layout_constraintStart_toStartOf="@+id/guideline2"
|
||||
card_view:layout_constraintTop_toTopOf="parent">
|
||||
<TextView
|
||||
android:id="@+id/shoppinglistName"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:text="Name"
|
||||
android:textAlignment="center"
|
||||
android:textSize="30sp"
|
||||
android:textStyle="bold"
|
||||
card_view:layout_constraintBottom_toTopOf="@+id/shoppinglistBeschreibung"
|
||||
card_view:layout_constraintEnd_toEndOf="parent"
|
||||
card_view:layout_constraintStart_toStartOf="parent"
|
||||
card_view:layout_constraintTop_toTopOf="parent" />
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/shareButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/fui_transparent"
|
||||
card_view:srcCompat="@drawable/share" />
|
||||
</TableRow>
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/bearbeiteShoppinglist"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/fui_transparent"
|
||||
card_view:srcCompat="@drawable/bearbeiten" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/deleteShoppinglist"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/fui_transparent"
|
||||
card_view:srcCompat="@drawable/delete" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<android.support.constraint.Guideline
|
||||
android:id="@+id/guideline4"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
card_view:layout_constraintGuide_begin="32dp" />
|
||||
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
|
||||
</TableRow>
|
||||
</TableLayout>
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
|
||||
</android.support.v7.widget.CardView>
|
||||
@@ -9,31 +9,50 @@
|
||||
card_view:cardElevation="4dp"
|
||||
card_view:cardUseCompatPadding="true">
|
||||
|
||||
<TableRow
|
||||
<android.support.constraint.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<android.support.constraint.Guideline
|
||||
android:id="@+id/guideline6"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
card_view:layout_constraintGuide_begin="118dp" />
|
||||
|
||||
<android.support.constraint.Guideline
|
||||
android:id="@+id/guideline4"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
card_view:layout_constraintGuide_begin="32dp" />
|
||||
|
||||
<View
|
||||
android:id="@+id/shoppinglistColor"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp "
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:src="@drawable/rechteck"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toStartOf="@+id/guideline4"
|
||||
card_view:layout_constraintStart_toStartOf="parent"
|
||||
card_view:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<android.support.constraint.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<View
|
||||
android:id="@+id/shoppinglistColor"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp "
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:src="@drawable/rechteck"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toStartOf="@+id/guideline4"
|
||||
card_view:layout_constraintStart_toStartOf="parent"
|
||||
card_view:layout_constraintTop_toTopOf="parent" />
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="8dp"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toStartOf="@+id/guideline6"
|
||||
card_view:layout_constraintStart_toStartOf="@+id/guideline4"
|
||||
card_view:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linearLayout2"
|
||||
android:layout_width="0dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
@@ -41,124 +60,146 @@
|
||||
android:gravity="center"
|
||||
android:orientation="vertical"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toStartOf="@+id/guideline"
|
||||
card_view:layout_constraintStart_toStartOf="@+id/guideline4"
|
||||
card_view:layout_constraintTop_toTopOf="parent"
|
||||
card_view:layout_constraintVertical_bias="0.436">
|
||||
card_view:layout_constraintStart_toStartOf="parent"
|
||||
card_view:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/shoppinglistOwner"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/common_google_signin_btn_icon_dark"
|
||||
card_view:layout_constraintStart_toStartOf="parent"
|
||||
card_view:layout_constraintTop_toTopOf="parent"
|
||||
tools:srcCompat="@drawable/common_google_signin_btn_icon_dark" />
|
||||
card_view:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/ownerName"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="OwnerName"
|
||||
android:textSize="10sp"
|
||||
android:textSize="12sp"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintStart_toStartOf="parent"
|
||||
card_view:layout_constraintTop_toBottomOf="@+id/shoppinglistOwner" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<android.support.constraint.Guideline
|
||||
android:id="@+id/guideline"
|
||||
android:layout_width="wrap_content"
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
|
||||
<TableLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:gravity="fill"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toEndOf="parent"
|
||||
card_view:layout_constraintStart_toStartOf="@+id/guideline6"
|
||||
card_view:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<TableRow
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
card_view:layout_constraintGuide_begin="111dp" />
|
||||
android:gravity="right">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linearLayout"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:gravity="center"
|
||||
android:orientation="vertical"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toStartOf="@+id/guideline2"
|
||||
card_view:layout_constraintStart_toStartOf="@+id/guideline"
|
||||
card_view:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/shoppinglistName"
|
||||
<android.support.constraint.ConstraintLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:text="Name"
|
||||
android:textSize="18sp"
|
||||
android:textStyle="bold"
|
||||
card_view:layout_constraintEnd_toEndOf="parent"
|
||||
card_view:layout_constraintStart_toEndOf="@+id/shoppinglistOwner"
|
||||
card_view:layout_constraintTop_toTopOf="parent" />
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/shoppinglistBeschreibung"
|
||||
<android.support.constraint.ConstraintLayout
|
||||
android:id="@+id/constraintLayout2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toEndOf="parent"
|
||||
card_view:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/shareEditButton"
|
||||
android:layout_width="@dimen/buttonSize"
|
||||
android:layout_height="@dimen/buttonSize"
|
||||
android:layout_marginStart="8dp"
|
||||
android:background="@color/fui_transparent"
|
||||
android:contentDescription="Share Button"
|
||||
android:scaleType="fitXY"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintStart_toStartOf="parent"
|
||||
card_view:layout_constraintTop_toTopOf="parent"
|
||||
card_view:srcCompat="@drawable/share" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/bearbeiteShoppinglist"
|
||||
android:layout_width="@dimen/buttonSize"
|
||||
android:layout_height="@dimen/buttonSize"
|
||||
android:layout_marginStart="8dp"
|
||||
android:background="@color/fui_transparent"
|
||||
android:contentDescription="Edit Button"
|
||||
android:scaleType="fitXY"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toEndOf="parent"
|
||||
card_view:layout_constraintStart_toEndOf="@+id/shareEditButton"
|
||||
card_view:layout_constraintTop_toTopOf="parent"
|
||||
card_view:srcCompat="@drawable/bearbeiten"
|
||||
tools:srcCompat="@drawable/bearbeiten" />
|
||||
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
</TableRow>
|
||||
|
||||
<TableRow
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center">
|
||||
|
||||
<android.support.constraint.ConstraintLayout
|
||||
android:id="@+id/constraintLayout3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:text="Beschreibung"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toEndOf="parent"
|
||||
card_view:layout_constraintStart_toEndOf="@+id/shoppinglistOwner"
|
||||
card_view:layout_constraintTop_toBottomOf="@+id/shoppinglistName" />
|
||||
</LinearLayout>
|
||||
card_view:layout_constraintStart_toStartOf="parent"
|
||||
card_view:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<android.support.constraint.Guideline
|
||||
android:id="@+id/guideline2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
card_view:layout_constraintGuide_begin="319dp" />
|
||||
<TextView
|
||||
android:id="@+id/shoppinglistBeschreibung"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:text="Beschreibung"
|
||||
android:textAlignment="center"
|
||||
android:textSize="18sp"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toEndOf="parent"
|
||||
card_view:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linearLayout3"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:gravity="right|top"
|
||||
android:orientation="horizontal"
|
||||
card_view:layout_constraintBottom_toBottomOf="parent"
|
||||
card_view:layout_constraintEnd_toEndOf="parent"
|
||||
card_view:layout_constraintStart_toStartOf="@+id/guideline2"
|
||||
card_view:layout_constraintTop_toTopOf="parent">
|
||||
<TextView
|
||||
android:id="@+id/shoppinglistName"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:text="Name"
|
||||
android:textAlignment="center"
|
||||
android:textSize="30sp"
|
||||
android:textStyle="bold"
|
||||
card_view:layout_constraintBottom_toTopOf="@+id/shoppinglistBeschreibung"
|
||||
card_view:layout_constraintEnd_toEndOf="parent"
|
||||
card_view:layout_constraintStart_toStartOf="parent"
|
||||
card_view:layout_constraintTop_toTopOf="parent" />
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/shareEditButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/fui_transparent"
|
||||
card_view:srcCompat="@drawable/share" />
|
||||
</TableRow>
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/bearbeiteShoppinglist"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/fui_transparent"
|
||||
card_view:srcCompat="@drawable/bearbeiten" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<android.support.constraint.Guideline
|
||||
android:id="@+id/guideline4"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
card_view:layout_constraintGuide_begin="32dp" />
|
||||
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
|
||||
</TableRow>
|
||||
</TableLayout>
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
|
||||
</android.support.v7.widget.CardView>
|
||||
@@ -1,4 +1,5 @@
|
||||
<resources>
|
||||
<dimen name="fab_margin">16dp</dimen>
|
||||
<dimen name="item_spacing">8dp</dimen>
|
||||
<dimen name="buttonSize">40dp</dimen>
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user