diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml index 800ca3d..e5b82dd 100644 --- a/.idea/assetWizardSettings.xml +++ b/.idea/assetWizardSettings.xml @@ -147,6 +147,32 @@ + + + + + + + diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index 903a7ee..eb35c4a 100644 Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ diff --git a/app/src/main/java/at/smartshopper/smartshopper/activitys/Dash.java b/app/src/main/java/at/smartshopper/smartshopper/activitys/Dash.java index 2ec7b7b..0162e48 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/activitys/Dash.java +++ b/app/src/main/java/at/smartshopper/smartshopper/activitys/Dash.java @@ -43,6 +43,7 @@ import com.squareup.picasso.Picasso; import org.json.JSONException; import java.sql.SQLException; +import java.util.ArrayList; import java.util.List; import at.smartshopper.smartshopper.R; @@ -409,16 +410,57 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte RecyclerView sharedRecycler = (RecyclerView) findViewById(R.id.sharedrecycler); sharedRecycler.setHasFixedSize(true); sharedRecycler.setLayoutManager(new LinearLayoutManager(this)); - List ownListsList = db.getSharedShoppinglists(uid); - ShoppinglistSharedAdapter shpAdapter = new ShoppinglistSharedAdapter(Dash.this, ownListsList, db); - shpAdapter.setOnDelClick(Dash.this); - shpAdapter.setOnChangeClick(Dash.this); - shpAdapter.setOnShareClick(Dash.this); - shpAdapter.setOnShoppinglistClick(Dash.this); + List sharedListsList = db.getSharedShoppinglists(uid); + ArrayList sharedListsArrayListTmp = new ArrayList<>(); + List 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")); + sharedListsListTmp = sharedListsArrayListTmp; + }else{ + sharedListsListTmp = sharedListsList; + findViewById(R.id.pfeilnachunten3).setVisibility(View.GONE); + } + ShoppinglistSharedAdapter shpAdapter = new ShoppinglistSharedAdapter(Dash.this, sharedListsListTmp, db); + if(sharedListsList.isEmpty()){ + shpAdapter.setOnDelClick(new ShoppinglistSharedAdapter.SharedOnItemClicked() { + @Override + public void sharedOnItemClick(String sl_id) { + + } + }); + shpAdapter.setOnChangeClick(new ShoppinglistSharedAdapter.SharedOnChangeItemClick() { + @Override + public void sharedOnChangeItemClick(String sl_id, View v) { + + } + }); + shpAdapter.setOnShareClick(new ShoppinglistSharedAdapter.SharedOnShareClick() { + @Override + public void sharedOnShareClick(String sl_id, View v) { + + } + }); + shpAdapter.setOnShoppinglistClick(new ShoppinglistSharedAdapter.SharedOnShoppinglistClick() { + @Override + public void sharedOnShoppinglistClick(String sl_id, View v) { + + } + }); + }else { + shpAdapter.setOnDelClick(Dash.this); + shpAdapter.setOnChangeClick(Dash.this); + shpAdapter.setOnShareClick(Dash.this); + shpAdapter.setOnShoppinglistClick(Dash.this); + } sharedRecycler.setAdapter(shpAdapter); } + private void onEmptyClick(){ + + } + /** * Macht eine Datenbankverbindung und holt alle Shoppinglists die dem User gehören, diese werden auf dem recycled view angezeigt * @@ -429,12 +471,51 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte ownRecycleView.setHasFixedSize(true); ownRecycleView.setLayoutManager(new LinearLayoutManager(this)); List ownListsList = db.getMyShoppinglists(uid); - ShoppinglistAdapter shpAdapter = new ShoppinglistAdapter(Dash.this, ownListsList, db); - shpAdapter.setOnDelClick(Dash.this); - shpAdapter.setOnChangeClick(Dash.this); - shpAdapter.setOnShareClick(Dash.this); - shpAdapter.setOnShoppinglistClick(Dash.this); + ArrayList ownListsArrayListTmp = new ArrayList<>(); + List 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")); + pfeil.setVisibility(View.VISIBLE); + ownListsListTmp = ownListsArrayListTmp; + }else{ + ownListsListTmp = ownListsList; + pfeil.setVisibility(View.GONE); + } + + ShoppinglistAdapter shpAdapter = new ShoppinglistAdapter(Dash.this, ownListsListTmp, db); + if(!ownListsList.isEmpty()) { + shpAdapter.setOnDelClick(Dash.this); + shpAdapter.setOnChangeClick(Dash.this); + shpAdapter.setOnShareClick(Dash.this); + shpAdapter.setOnShoppinglistClick(Dash.this); + }else{ + shpAdapter.setOnDelClick(new ShoppinglistAdapter.OnItemClicked() { + @Override + public void onItemClick(String sl_id) { + + } + }); + shpAdapter.setOnChangeClick(new ShoppinglistAdapter.OnChangeItemClick() { + @Override + public void onChangeItemClick(String sl_id, View v) { + + } + }); + shpAdapter.setOnShareClick(new ShoppinglistAdapter.OnShareClick() { + @Override + public void onShareClick(String sl_id, View v) { + + } + }); + shpAdapter.setOnShoppinglistClick(new ShoppinglistAdapter.OnShoppinglistClick() { + @Override + public void onShoppinglistClick(String sl_id, View v) { + + } + }); + } ownRecycleView.setAdapter(shpAdapter); } diff --git a/app/src/main/java/at/smartshopper/smartshopper/activitys/ItemListActivity.java b/app/src/main/java/at/smartshopper/smartshopper/activitys/ItemListActivity.java index bf94fc2..5784d53 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/activitys/ItemListActivity.java +++ b/app/src/main/java/at/smartshopper/smartshopper/activitys/ItemListActivity.java @@ -27,6 +27,7 @@ import com.squareup.picasso.Picasso; import org.json.JSONException; import java.sql.SQLException; +import java.util.ArrayList; import java.util.List; import at.smartshopper.smartshopper.R; @@ -129,11 +130,43 @@ public class ItemListActivity extends Activity implements ItemAdapter.OnItemEdit itemsListRecycler.setLayoutManager(new LinearLayoutManager(this)); List itemList = db.getItemsOfGroup(group_id, sl_id); - ItemAdapter itemAdapter = new ItemAdapter(itemList); - itemAdapter.setOnItemEditClick(this); - itemAdapter.setItemDelClick(this); - itemAdapter.setOnItemCheckClick(this); + ArrayList itemArrayListTmp = new ArrayList<>(); + List itemListTmp; + View pfeil = findViewById(R.id.pfeilnachunten2); + if(itemList.isEmpty()){ + itemArrayListTmp.add(new Item("empty", "empty", "empty", "Bitte ein Item Hinzufügen!", "")); + itemListTmp = itemArrayListTmp; + pfeil.setVisibility(View.VISIBLE); + }else{ + itemListTmp = itemList; + pfeil.setVisibility(View.GONE); + } + ItemAdapter itemAdapter = new ItemAdapter(itemListTmp); + if(itemList.isEmpty()){ + itemAdapter.setOnItemEditClick(new ItemAdapter.OnItemEditClicked() { + @Override + public void onItemEditClicked(String item_id, String group_id, String sl_id, View v) { + + } + }); + itemAdapter.setItemDelClick(new ItemAdapter.OnItemDelClicked() { + @Override + public void onItemDelClicked(String item_id, String group_id, String sl_id) { + + } + }); + itemAdapter.setOnItemCheckClick(new ItemAdapter.OnItemCheckClicked() { + @Override + public void onItemCheckClicked(String uid, String name, String itemId, String groupId, String sl_id, int count) { + + } + }); + }else { + itemAdapter.setOnItemEditClick(this); + itemAdapter.setItemDelClick(this); + itemAdapter.setOnItemCheckClick(this); + } itemsListRecycler.setAdapter(itemAdapter); } diff --git a/app/src/main/java/at/smartshopper/smartshopper/activitys/ShoppinglistDetails.java b/app/src/main/java/at/smartshopper/smartshopper/activitys/ShoppinglistDetails.java index 12784b7..434a17e 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/activitys/ShoppinglistDetails.java +++ b/app/src/main/java/at/smartshopper/smartshopper/activitys/ShoppinglistDetails.java @@ -27,6 +27,7 @@ import com.squareup.picasso.Picasso; import org.json.JSONException; import java.sql.SQLException; +import java.util.ArrayList; import java.util.List; import at.smartshopper.smartshopper.R; @@ -37,6 +38,7 @@ import at.smartshopper.smartshopper.shoppinglist.Shoppinglist; import at.smartshopper.smartshopper.shoppinglist.details.Details; import at.smartshopper.smartshopper.shoppinglist.details.DetailsAdapter; import at.smartshopper.smartshopper.shoppinglist.details.group.Group; +import at.smartshopper.smartshopper.shoppinglist.details.item.Item; public class ShoppinglistDetails extends Activity implements DetailsAdapter.OnGroupEditClicked, DetailsAdapter.OnGroupDeleteClicked, DetailsAdapter.OnCardClicked { @@ -305,12 +307,46 @@ public class ShoppinglistDetails extends Activity implements DetailsAdapter.OnGr detailsRecycleView.setLayoutManager(new LinearLayoutManager(this)); List
detailsList = db.getListDetails(sl_id); + ArrayList
detailsArrayListTmp = new ArrayList<>(); + List
detailsListTmp; + View pfeil = findViewById(R.id.pfeilnachunten); + 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!","")); + detailsArrayListTmp.add(details); + pfeil.setVisibility(View.VISIBLE); + detailsListTmp = detailsArrayListTmp; + }else{ + pfeil.setVisibility(View.INVISIBLE); + detailsListTmp = detailsList; + } + DetailsAdapter detailsAdapter = new DetailsAdapter(detailsListTmp, db); + if(detailsList.isEmpty()){ + detailsAdapter.setGroupEditClick(new DetailsAdapter.OnGroupEditClicked() { + @Override + public void onGroupEditClick(String sl_id, String group_id, View v) { - DetailsAdapter detailsAdapter = new DetailsAdapter(detailsList, db); - detailsAdapter.setGroupEditClick(this); - detailsAdapter.setGroupDeleteClick(this); - detailsAdapter.setCardClick(this); + } + }); + detailsAdapter.setGroupDeleteClick(new DetailsAdapter.OnGroupDeleteClicked() { + @Override + public void onGroupDeleteClick(String sl_id, String group_id, View v) { + } + }); + detailsAdapter.setCardClick(new DetailsAdapter.OnCardClicked() { + @Override + public void onCardClick(String group_id, String sl_id, String groupName, View v) { + + } + }); + }else { + + detailsAdapter.setGroupEditClick(this); + detailsAdapter.setGroupDeleteClick(this); + detailsAdapter.setCardClick(this); + } detailsRecycleView.setAdapter(detailsAdapter); } diff --git a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistSharedAdapter.java b/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistSharedAdapter.java index d918aa6..81f9d75 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistSharedAdapter.java +++ b/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistSharedAdapter.java @@ -2,6 +2,7 @@ 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; @@ -12,6 +13,8 @@ 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; @@ -107,6 +110,23 @@ public class ShoppinglistSharedAdapter extends RecyclerView.Adapter + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/pfeil.xml b/app/src/main/res/drawable/pfeil.xml new file mode 100644 index 0000000..e8421d1 --- /dev/null +++ b/app/src/main/res/drawable/pfeil.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/layout/activity_dash.xml b/app/src/main/res/layout/activity_dash.xml index 46bf877..3bbbfeb 100644 --- a/app/src/main/res/layout/activity_dash.xml +++ b/app/src/main/res/layout/activity_dash.xml @@ -1,9 +1,20 @@ + + + app:layout_constraintTop_toBottomOf="@+id/groupViewName"> + + @@ -104,6 +106,20 @@ + + + + + @@ -118,4 +134,5 @@ app:backgroundTint="@color/fui_linkColor" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_shoppinglist_details.xml b/app/src/main/res/layout/activity_shoppinglist_details.xml index 7ed1286..08132e6 100644 --- a/app/src/main/res/layout/activity_shoppinglist_details.xml +++ b/app/src/main/res/layout/activity_shoppinglist_details.xml @@ -6,6 +6,16 @@ android:layout_height="match_parent" tools:context=".activitys.ShoppinglistDetails"> + + + \ No newline at end of file