MyHyvesBookPlus/TheReturnOfTheMyHyvesBookPlus
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Marijn appje #28

Merged
11166932 merged 27 commits from marijn-appje into master 2017-06-29 13:34:35 +02:00
Conversation 3 Commits 27 Files Changed 26 +32 -10
4 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 93434a981f - Show all commits

2
app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
View File

@@ -23,7 +23,7 @@ public class TimelineFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_timeline, container, false);
listView = (ListView) view.findViewById(R.id.listview);
listView = (ListView) view.findViewById(R.id.list);
downloadClass = new DownloadClass(getActivity());
downloadClass.getPostsFromServer();

2
app/MyHyvesBookPlusStagram/app/src/main/res/layout/activity_main.xml
View File

@@ -13,7 +13,7 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:padding="16dp">
android:padding="0dp">
</FrameLayout>
<android.support.design.widget.BottomNavigationView

14
app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_timeline.xml
View File

@@ -5,11 +5,19 @@
android:orientation="vertical"
tools:context="nl.myhyvesbookplus.tagram.TimelineFragment">
<ListView
android:id="@+id/listview"
<android.support.v4.widget.SwipeRefreshLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/swiperefresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
</ListView>
<ListView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent">
</ListView>
</android.support.v4.widget.SwipeRefreshLayout>
</LinearLayout>

24
app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml
View File

@@ -3,6 +3,10 @@
android:layout_height="match_parent"
android:orientation="vertical">
<Space
android:layout_width="match_parent"
android:layout_height="15dp" />
<ImageView
android:id="@+id/timeline_image_profile"
android:layout_width="wrap_content"
@@ -13,21 +17,31 @@
android:id="@+id/comment_timeline_profile"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android: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">
<TextView
<Button
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="@string/niet_slecht" />
android:layout_height="wrap_content"
android:clickable="false"
android:text="@string/niet_slecht"/>
<TextView
android:id="@+id/niet_slecht_count_profile"
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="15dp" />
</LinearLayout>