Niels profile #26

Merged
11025980 merged 4 commits from niels-profile into master 2017-06-28 13:16:15 +02:00
4 changed files with 38 additions and 8 deletions
Showing only changes of commit 43a1fcd52c - Show all commits

View File

@@ -7,12 +7,15 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.BaseAdapter;
import android.widget.Button;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.firebase.ui.storage.images.FirebaseImageLoader;
import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseUser;
import com.google.firebase.storage.FirebaseStorage;
import com.google.firebase.storage.StorageReference;
@@ -55,10 +58,11 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl
public View getView(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);
ImageView photo = (ImageView) rowView.findViewById(R.id.timeline_image);
ImageButton nietSlechtButton = (ImageButton) rowView.findViewById(R.id.niet_slecht_button);
Button nietSlechtButton = (Button) rowView.findViewById(R.id.niet_slecht_button);
nietSlechtButton.setOnClickListener(new View.OnClickListener() {
@Override
@@ -69,6 +73,7 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl
UriPost post = (UriPost) getItem(position);
// userName.setText();
nietSlechts.setText(Integer.toString(post.getNietSlechts()));
comment.setText(post.getComment());

View File

@@ -5,6 +5,18 @@
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical">
<Space
android:layout_width="match_parent"
android:layout_height="15dp" />
<!--
<TextView
android:id="@+id/username_timeline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
-->
<ImageView
android:id="@+id/timeline_image"
android:layout_width="wrap_content"
@@ -13,28 +25,41 @@
<TextView
android:id="@+id/comment_timeline"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="Hallo Ik ben een comment!" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp">
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal">
<ImageButton
<Button
android:id="@+id/niet_slecht_button"
android:layout_width="200dp"
android:layout_height="match_parent" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/niet_slecht"/>
<!--
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="@string/niet_slecht" />
-->
<TextView
android:id="@+id/niet_slecht_count"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:textSize="20dp"
android:padding="10dp"
android:text="10" />
</LinearLayout>
<Space
android:layout_width="match_parent"
android:layout_height="10dp" />
</LinearLayout>

View File

@@ -30,8 +30,8 @@
<string name="image_save_error">Foto opslaan mislukt. Zorg a.u.b. dat er genoeg ruimte op uw telefoon beschikbaar is.</string>
<string name="update_profile_pic_error">Het updaten van de profielfoto is mislukt. Controleer uw internetverbinding.</string>
<string name="upload_profile_pic">Profielfoto aan het uploaden…</string>
<string name="niet_slecht">"\"Niet slecht.\"s "</string>
<string name="mail_success">An e-mail was sent, please follow its instructions.</string>
<string name="niet_slecht">Niet Slecht.</string>
<string name="comment">Bijschrift:</string>
<string name="cancel">Annuleer</string>
</resources>

View File

@@ -22,7 +22,7 @@
<string name="profile_picture_description">profile picture</string>
<string name="change_psw_button">Change Password</string>
<string name="please_wait">Please Wait</string>
<string name="niet_slecht">"\"Niet slecht.\"s "</string>
<string name="niet_slecht">Niet Slecht.</string>
<string name="upload">Upload</string>
<string name="save">Save</string>
<string name="mail_successful">An e-mail was sent. Please follow its instructions.</string>