diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java index ff4b341..8146347 100644 --- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java +++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java @@ -1,6 +1,7 @@ package nl.myhyvesbookplus.tagram; import android.content.Context; +import android.support.annotation.NonNull; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -14,8 +15,15 @@ import android.widget.TextView; import com.bumptech.glide.Glide; import com.firebase.ui.storage.images.FirebaseImageLoader; +<<<<<<< HEAD +import com.google.android.gms.tasks.OnCompleteListener; +import com.google.android.gms.tasks.Task; +import com.google.firebase.database.DatabaseReference; +import com.google.firebase.database.FirebaseDatabase; +======= import com.google.firebase.auth.FirebaseAuth; import com.google.firebase.auth.FirebaseUser; +>>>>>>> origin/master import com.google.firebase.storage.FirebaseStorage; import com.google.firebase.storage.StorageReference; @@ -32,11 +40,13 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl private LayoutInflater mInflater; private Context mContext; private ArrayList mData; + private DatabaseReference mRef; TimeLineAdapter(Context context, ArrayList data) { mContext = context; mInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); mData = data; + mRef = FirebaseDatabase.getInstance().getReference(); } @Override @@ -55,27 +65,37 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl } @Override - public View getView(int position, View convertView, ViewGroup parent) { + public View getView(final int position, View convertView, ViewGroup parent) { View rowView = mInflater.inflate(R.layout.list_item_timeline, parent, false); // TextView userName = (TextView) rowView.findViewById(R.id.username_timeline); TextView comment = (TextView) rowView.findViewById(R.id.comment_timeline); - TextView nietSlechts = (TextView) rowView.findViewById(R.id.niet_slecht_count); + final TextView nietSlechts = (TextView) rowView.findViewById(R.id.niet_slecht_count); + TextView dateTime = (TextView) rowView.findViewById(R.id.timeline_date); ImageView photo = (ImageView) rowView.findViewById(R.id.timeline_image); - Button nietSlechtButton = (Button) rowView.findViewById(R.id.niet_slecht_button); + final ImageButton nietSlechtButton = (ImageButton) rowView.findViewById(R.id.niet_slecht_button); + + final UriPost post = (UriPost) getItem(position); + + nietSlechts.setText(Integer.toString(post.getNietSlechts())); + comment.setText(post.getComment()); nietSlechtButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - + Log.d(TAG, "onClick: " + position); + mRef.child("posts").child(post.getDatabaseEntryName()) + .child("nietSlechts").setValue(post.getNietSlechts() + 1) + .addOnCompleteListener(new OnCompleteListener() { + @Override + public void onComplete(@NonNull Task task) { + nietSlechts.setText(Integer.toString(post.getNietSlechts() + 1)); + } + }); } }); - UriPost post = (UriPost) getItem(position); - -// userName.setText(); - nietSlechts.setText(Integer.toString(post.getNietSlechts())); - comment.setText(post.getComment()); + dateTime.setText(post.getDate().toString()); StorageReference ref = FirebaseStorage.getInstance().getReferenceFromUrl(post.getUri()); Glide.with(mContext) @@ -87,7 +107,6 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl return rowView; } - /** * Callback method to be invoked when an item in this AdapterView has * been clicked. diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java index 64bf26c..da610b7 100644 --- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java +++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/DownloadClass.java @@ -42,8 +42,9 @@ public class DownloadClass { public void onDataChange(DataSnapshot dataSnapshot) { for (DataSnapshot data : dataSnapshot.getChildren()) { - - mList.add(data.getValue(UriPost.class)); + UriPost tempPost = data.getValue(UriPost.class); + tempPost.setDatabaseEntryName(data.getKey()); + mList.add(tempPost); } Collections.reverse(mList); mListener.PostDownloaded(); diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/model/UriPost.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/model/UriPost.java index 25358be..dc7ae7c 100644 --- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/model/UriPost.java +++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/model/UriPost.java @@ -9,6 +9,7 @@ import java.util.Date; */ public class UriPost extends Post { private String uri; + private String databaseEntryName; public UriPost() { // Default constructor required for calls to DataSnapshot.getValue(UriPost.class) @@ -33,4 +34,12 @@ public class UriPost extends Post { public void setUri(String uri) { this.uri = uri; } + + public String getDatabaseEntryName() { + return databaseEntryName; + } + + public void setDatabaseEntryName(String databaseEntryName) { + this.databaseEntryName = databaseEntryName; + } } \ No newline at end of file diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline.xml index d5e5f63..b77ece9 100644 --- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline.xml +++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline.xml @@ -1,8 +1,7 @@ + android:layout_height="250dp" + android:layout_gravity="center" /> - - -