_-d
ztG!J_F==f{(pW@?Nzn5KZ0ptWtZF)FEOHyZfU)}*z)%X`C+&W|_Wx$k`6Iq$pY
zzIXnI@PUc&^9un=Y!)&*2^P;rsFxtyX2B5|nVzYDtR=9T2dg~IhMys1P1<3HhW*Iw
z6r_6gB%jqnfy&*SlA;Y>{@};QJ>8m2d@v=`b7`pzXlx|D(KDI)h8C?GzPJcCe?5<@u*o9BI*w~Fu|$B2;;zh-P|MfsxG77oaO`*@ONI@~
zdPTNL;o0#>c4WMB!QOptO{i=4&K+)-yRFCV>gm$#*QTY8_KoAN6|qoBiNod+>{@An
zDh0E~DinNSl{^ot`Ke|DR4X}y=4fzmd;rRoHP)c2@i1TJjk7weL6tY16N%n5CN1QR
zlu}|uMjoEA1mYdJ1}>z=w{neO^SfV}C;u<@=O|4;HG9F5lNAoA;qBhi+o+aGi1`Igy=@OZI7h*E4VF+v#=u-Wii)`WRjj%RIov^M?n(PMX*iJHZ`*)^6P
zHi?_M>}cqrdggJe@Hi|`7Q@24nzfhW=?dX5!{4kF-p<-9aJ@Z&x29r|UxvS}6TZ&c
zo4KEiH&`XSWH_^0_{i|P)xtxDV`_wd6ess|v~F+f?%6A8T6#s7eHR7}_)S9f-m??j
zST?f54OYCQ)*y_a_;{_6j~`oqTr1DRYW~eSG5#z^Dvjm`n&EfqbD)@O7UGl!ox&}`
z?^h>?jceF0&R>Jo)7|(~0Qz#MyV=)CYqJ$UY7(6=yul$lX>BgVUpe$#O~tH})@B!1
zV{2i~DBcC*?R1)X7YxrhRh|{MY?65wY<+B#N#R;O1uflyXul_Ff#=h$*Aa3ZJn=N{
zf3^=^6ED%qBaRNQqeGkW8Ej)KdQ?ijjzgj3Zi1u}NqW>up4Uma@SK|PmrlxpK{eW^
zmk8{kk>MG%?O4AodHZF^yBs(aaNMkYkxZ6LQRLP=c!|A5MS(@hD2RM?A9T>}w-i8(
zlkiFOxtT-lYy>rYCL`P$D($78ip3I2Y|VI&EO-FZx-&bronU*eqZjE4y@c^MtA?h#
zStnEAMOWTlA4Tp=!3e5wd~k~lJ%n*|pg1vx^gaSJyv!<3LZvt0C+NK{
zN)~mQ%ha|c(q=%7&`HV6JMXeYbWt0)Ys~St>f1j?WP>fL_?aZczb`%);DToaWfAUJk3s1a;6chrGOD8lUBg@;l9Q~pNi-^eSG-Oo2<>ZevWcd%ve4+&a
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