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

Paul profile #6

Merged
11306084 merged 29 commits from paul-profile into master 2017-06-22 11:39:39 +02:00
Conversation 3 Commits 29 Files Changed 18 +24 -9
4 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3aac4fc96d - Show all commits

5
app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_camera.xml
View File

@@ -14,11 +14,6 @@
android:layout_height="wrap_content"
android:text="@string/hello_camera" />
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="logOutOnClick"
android:text="LogOut" />
</LinearLayout>
<!-- TODO: Update blank fragment layout -->

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

@@ -4,10 +4,26 @@
android:layout_height="match_parent"
tools:context="nl.myhyvesbookplus.tagram.ProfileFragment">
<!-- TODO: Update blank fragment layout -->
<TextView
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/hello_blank_fragment" />
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button
android:id="@+id/logout_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".50"
android:onClick="logOutOnClick"
android:text="@string/logout_button" />
<Button
android:id="@+id/profile_pic_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".50"
android:text="@string/profile_picture_button" />
</LinearLayout>
</FrameLayout>

2
app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
View File

@@ -13,4 +13,6 @@
<string name="username">Gebruikersnaam</string>
<string name="confirm_password_hint">bevestig wachtwoord</string>
<string name="logo_text">MyHyvesBookPlusTagram logo</string>
<string name="logout_button">Uitloggen</string>
<string name="profile_picture_button">Profiel Foto</string>
</resources>

2
app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
View File

@@ -18,4 +18,6 @@
<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="hello_camera">Hello Camera</string>
<string name="logo_text">MyHyvesBookPlusTagram logo</string>
<string name="logout_button">LogOut</string>
<string name="profile_picture_button">Profile Picture</string>
</resources>