Marijn appje #28

Merged
11166932 merged 27 commits from marijn-appje into master 2017-06-29 13:34:35 +02:00
4 changed files with 10 additions and 3 deletions
Showing only changes of commit 08849521e1 - Show all commits

View File

@@ -153,6 +153,8 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
(view.findViewById(R.id.upload_button)).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
view.findViewById(R.id.comment_box).setClickable(true);
view.findViewById(R.id.comment_box).setVisibility(View.VISIBLE);
view.findViewById(R.id.comment_box).bringToFront();
}
});

View File

@@ -74,13 +74,17 @@
android:id="@+id/comment_box"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:clickable="false"
android:layout_margin="10dp"
android:padding="5dp"
android:background="@android:color/background_light"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Comment:"/>
android:text="@string/comment"/>
<EditText
android:id="@+id/comment_text"
@@ -89,13 +93,12 @@
android:lines="4"
android:layout_margin="4dp"
android:padding="5dp"
android:visibility="visible"
android:background="@android:color/darker_gray"/>
<Button
android:id="@+id/comment_submit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Submit"/>
android:text="@string/upload"/>
</LinearLayout>

View File

@@ -31,4 +31,5 @@
<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="comment">Bijschrift:</string>
</resources>

View File

@@ -30,4 +30,5 @@
<string name="image_save_error">Saving image to storage failed. Please make sure there is space available on the device.</string>
<string name="update_profile_pic_error">Updating the profile picture failed. Please check network connection.</string>
<string name="upload_profile_pic">Uploading profile picture...</string>
<string name="comment">Comment:</string>
</resources>