Merge remote-tracking branch 'origin/paul-profile' into niels-profile

This commit is contained in:
Niels Zwemmer
2017-06-27 13:20:29 +02:00

View File

@@ -4,15 +4,30 @@
android:orientation="vertical">
<ImageView
android:id="@+id/timeline_image_profile"
android:id="@+id/timeline_image"
android:layout_width="wrap_content"
android:layout_gravity="center"
android:layout_height="250dp" />
<TextView
android:id="@+id/comment_timeline_profile"
android:id="@+id/comment_timeline"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Hallo Ik ben een comment!" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="@string/niet_slecht" />
<TextView
android:id="@+id/niet_slecht_count_profile"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="10" />
</LinearLayout>
</LinearLayout>