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

Anzeige Keine Vorhanden

Browse Source 
Zeigt an wo man drücken muss wenn keine:
Shoppingliste
Shared Shoppinglist
Gruppe
Item

vorhanden ist.
This commit is contained in:
Georg Reisinger 2019-03-16 21:38:12 +01:00
parent bf50432f6e
commit 05555197ae
12 changed files with 310 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.idea/assetWizardSettings.xml generated
View File

@ -147,6 +147,32 @@
</PersistentState>
</value>
</entry>
<entry key="vectorWizard">
<value>
<PersistentState>
<option name="children">
<map>
<entry key="vectorAssetStep">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="assetSourceType" value="FILE" />
<entry key="height" value="400" />
<entry key="outputName" value="ic_unbenannt_1" />
<entry key="overrideSize" value="true" />
<entry key="sourceFile" value="C:\Users\georg\Desktop\PfeilExport\SVG\Unbenannt-1.svg" />
<entry key="width" value="100" />
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
</component>

BIN
.idea/caches/gradle_models.ser generated
View File

Binary file not shown.

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

@ -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<Shoppinglist> 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<Shoppinglist> sharedListsList = db.getSharedShoppinglists(uid);
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"));
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<Shoppinglist> 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<Shoppinglist> ownListsArrayListTmp = new ArrayList<>();
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"));
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);
}

41
app/src/main/java/at/smartshopper/smartshopper/activitys/ItemListActivity.java
View File

@ -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<Item> itemList = db.getItemsOfGroup(group_id, sl_id);
ItemAdapter itemAdapter = new ItemAdapter(itemList);
itemAdapter.setOnItemEditClick(this);
itemAdapter.setItemDelClick(this);
itemAdapter.setOnItemCheckClick(this);
ArrayList<Item> 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);
}

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

@ -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<Details> detailsList = db.getListDetails(sl_id);
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");
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);
}

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

@ -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<Shoppinglist
holder.shoppinglistColor.setBackgroundColor(cardcolor);
if(shoppinglist.getSlId().equals("empty")){
FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
if (user != null) {
// Name, email address, and profile photo Url
String name = user.getDisplayName();
Uri photoUrl = user.getPhotoUrl();
holder.ownerName.setText(name);
Picasso.get().load(photoUrl).resize(250, 250).transform(new RoundCornersTransformation(30, 30, true, true)).into(holder.imageView);
// 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 admin = db.getAdmin(shoppinglist.getSlId());
Picasso.get().load(admin.getPic()).resize(250, 250).transform(new RoundCornersTransformation(30, 30, true, true)).into(holder.imageView);

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

@ -154,6 +154,7 @@ public class DetailsAdapter extends RecyclerView.Adapter<DetailsAdapter.MyViewHo
return details.size();
}
/**
* Interface damit onoclick in der Shoppinglistdetails activity ausgeführt werden kann
*/

39
app/src/main/res/drawable/arrow_shape.xml Normal file
View File

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<!-- Colored rectangle-->
<item>
<shape android:shape="rectangle">
<size
android:width="100dp"
android:height="40dp" />
<solid android:color="#5EB888" />
<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">
<shape android:shape="rectangle">
<solid android:color="#ffffff" />
</shape>
</rotate>
</item>
<!-- 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">
<shape android:shape="rectangle">
<solid android:color="#ffffff" />
</shape>
</rotate>
</item>
</layer-list>

15
app/src/main/res/drawable/pfeil.xml Normal file
View File

@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="100dp"
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"/>
</vector>

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

@ -1,9 +1,20 @@
<?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">
<View
android:id="@+id/pfeilnachunten3"
android:layout_width="84dp"
android:layout_height="331dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:background="@drawable/pfeil"
app:layout_constraintBottom_toTopOf="@+id/addShoppinglistFab"
app:layout_constraintEnd_toEndOf="parent" />
<TabHost
android:id="@+id/tabHost1"
android:layout_width="match_parent"

19
app/src/main/res/layout/activity_item_list.xml
View File

@ -96,7 +96,9 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/guideline5"
app:layout_constraintTop_toBottomOf="@+id/groupViewName" />
app:layout_constraintTop_toBottomOf="@+id/groupViewName">
</android.support.v7.widget.RecyclerView>
</android.support.constraint.ConstraintLayout>
@ -104,6 +106,20 @@
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<View
android:id="@+id/pfeilnachunten2"
android:layout_width="84dp"
android:layout_height="331dp"
android:layout_marginBottom="60dp"
android:background="@drawable/pfeil"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</android.support.constraint.ConstraintLayout>
</android.support.v7.widget.CardView>
</android.support.v4.widget.SwipeRefreshLayout>
@ -118,4 +134,5 @@
app:backgroundTint="@color/fui_linkColor"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</android.support.constraint.ConstraintLayout>

11
app/src/main/res/layout/activity_shoppinglist_details.xml
View File

@ -6,6 +6,16 @@
android:layout_height="match_parent"
tools:context=".activitys.ShoppinglistDetails">
<View
android:id="@+id/pfeilnachunten"
android:layout_width="66dp"
android:layout_height="299dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:background="@drawable/pfeil"
app:layout_constraintBottom_toTopOf="@+id/addGroupFab"
app:layout_constraintEnd_toEndOf="parent" />
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/detailsRefreshSwipe"
android:layout_width="0dp"
@ -41,4 +51,5 @@
app:backgroundTint="@color/fui_linkColor"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</android.support.constraint.ConstraintLayout>