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

Merge conflict fixed

Browse Source
This commit is contained in:
Niels Zwemmer
2017-06-29 15:45:22 +02:00
parent ab54ffb9ec 5a6abe85f1
commit 98f986fc0a
4 changed files with 45 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
View File

@@ -1,13 +1,10 @@
package nl.myhyvesbookplus.tagram; package nl.myhyvesbookplus.tagram;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.hardware.Camera; import android.hardware.Camera;
import android.hardware.Camera.PictureCallback; import android.hardware.Camera.PictureCallback;
import android.media.Image;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.app.Fragment; import android.app.Fragment;
import android.support.design.widget.FloatingActionButton; import android.support.design.widget.FloatingActionButton;
@@ -19,6 +16,7 @@ import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import nl.myhyvesbookplus.tagram.controller.PostUploader; import nl.myhyvesbookplus.tagram.controller.PostUploader;
@@ -31,9 +29,8 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
private Bitmap mPhoto; private Bitmap mPhoto;
private int facing = Camera.CameraInfo.CAMERA_FACING_BACK; private int facing = Camera.CameraInfo.CAMERA_FACING_BACK;
public CameraFragment() { /* Required empty public constructor */
// Required empty public constructor public CameraFragment() { }
}
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -41,24 +38,28 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
// Inflate the layout for this fragment // Inflate the layout for this fragment
final View view = inflater.inflate(R.layout.fragment_camera, container, false); final View view = inflater.inflate(R.layout.fragment_camera, container, false);
final RelativeLayout filterButtons = (RelativeLayout) view.findViewById(R.id.filter_buttons);
final RelativeLayout mCameraLayout = (RelativeLayout) view.findViewById(R.id.camera_preview);
final LinearLayout commentBox = (LinearLayout) view.findViewById(R.id.comment_box);
final ImageButton pictureButton = (ImageButton) view.findViewById(R.id.picture_button);
final ImageButton switchButton = (ImageButton) view.findViewById(R.id.switch_camera_button);
// Hide the action bar // Hide the action bar
((AppCompatActivity)getActivity()).getSupportActionBar().hide(); ((AppCompatActivity)getActivity()).getSupportActionBar().hide();
mCamera = getCameraInstance(facing); mCamera = getCameraInstance(facing);
mPreview = new CameraPreview(getActivity().getBaseContext(), mCamera); mPreview = new CameraPreview(getActivity().getBaseContext(), mCamera);
final RelativeLayout filterButtons = (RelativeLayout) view.findViewById(R.id.filter_buttons);
final RelativeLayout mCameraLayout = (RelativeLayout) view.findViewById(R.id.camera_preview);
mCameraLayout.addView(mPreview); mCameraLayout.addView(mPreview);
// Draw initial buttons over preview // Draw initial buttons over preview
view.findViewById(R.id.picture_button).bringToFront(); pictureButton.bringToFront();
view.findViewById(R.id.switch_camera_button).bringToFront(); switchButton.bringToFront();
filterButtons.bringToFront(); filterButtons.bringToFront();
/* Upon pressing the switch camera facing button: */ /* Upon pressing the switch camera facing button: */
(view.findViewById(R.id.switch_camera_button)).setOnClickListener(new View.OnClickListener() { switchButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
switchFacing(); switchFacing();
@@ -69,13 +70,13 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
mPreview = new CameraPreview(getActivity().getBaseContext(), mCamera); mPreview = new CameraPreview(getActivity().getBaseContext(), mCamera);
mCameraLayout.addView(mPreview); mCameraLayout.addView(mPreview);
view.findViewById(R.id.picture_button).bringToFront(); pictureButton.bringToFront();
view.findViewById(R.id.switch_camera_button).bringToFront(); switchButton.bringToFront();
} }
}); });
/* Upon pressing the take photo button: */ /* Upon pressing the take photo button: */
(view.findViewById(R.id.picture_button)).setOnClickListener(new View.OnClickListener() { pictureButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
mCamera.takePicture(null, null, new PictureCallback() { mCamera.takePicture(null, null, new PictureCallback() {
@@ -101,12 +102,11 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
(view.findViewById(R.id.upload_button)).setOnClickListener(new View.OnClickListener() { (view.findViewById(R.id.upload_button)).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
view.findViewById(R.id.comment_box).setClickable(true); commentBox.setClickable(true);
view.findViewById(R.id.comment_box).setVisibility(View.VISIBLE); commentBox.setVisibility(View.VISIBLE);
view.findViewById(R.id.comment_box).bringToFront(); commentBox.bringToFront();
view.findViewById(R.id.filter_buttons).setVisibility(View.GONE); filterButtons.setVisibility(View.GONE);
((FloatingActionButton)view.findViewById(R.id.upload_button)).hide(); ((FloatingActionButton)view.findViewById(R.id.upload_button)).hide();
hideKeyboard();
} }
}); });
@@ -134,8 +134,8 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
mPreview = new CameraPreview(getActivity().getBaseContext(), mCamera); mPreview = new CameraPreview(getActivity().getBaseContext(), mCamera);
mCameraLayout.addView(mPreview); mCameraLayout.addView(mPreview);
view.findViewById(R.id.picture_button).bringToFront(); pictureButton.bringToFront();
view.findViewById(R.id.switch_camera_button).bringToFront(); switchButton.bringToFront();
mCameraLayout.removeView(view.findViewById(R.id.pic_preview)); mCameraLayout.removeView(view.findViewById(R.id.pic_preview));
hideKeyboard(); hideKeyboard();
@@ -160,8 +160,8 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
mPreview = new CameraPreview(getActivity().getBaseContext(), mCamera); mPreview = new CameraPreview(getActivity().getBaseContext(), mCamera);
mCameraLayout.addView(mPreview); mCameraLayout.addView(mPreview);
view.findViewById(R.id.picture_button).bringToFront(); pictureButton.bringToFront();
view.findViewById(R.id.switch_camera_button).bringToFront(); switchButton.bringToFront();
mCameraLayout.removeView(view.findViewById(R.id.pic_preview)); mCameraLayout.removeView(view.findViewById(R.id.pic_preview));
hideKeyboard(); hideKeyboard();
@@ -286,18 +286,6 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
} }
} }
//TODO: Kan dit weg? super aanroepen enzo.
@Override
public void onPause() {
super.onPause();
}
@Override
public void onResume() {
super.onResume();
}
@Override @Override
public void PostUploadComplete(Boolean success) { public void PostUploadComplete(Boolean success) {

BIN
app/MyHyvesBookPlusStagram/app/src/main/res/drawable/niet_slecht.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 44 KiB

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

@@ -36,14 +36,6 @@
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:src="@drawable/ic_switch_camera_black_24dp"/> android:src="@drawable/ic_switch_camera_black_24dp"/>
<ProgressBar
android:id="@+id/load_bar"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminate="true"
android:layout_centerInParent="true"/>
<RelativeLayout <RelativeLayout
android:id="@+id/filter_buttons" android:id="@+id/filter_buttons"
android:layout_width="match_parent" android:layout_width="match_parent"

36
app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline.xml
View File

@@ -20,35 +20,43 @@
android:layout_height="250dp" android:layout_height="250dp"
android:layout_gravity="center" /> android:layout_gravity="center" />
<TextView
android:id="@+id/timeline_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:paddingBottom="5dp"
android:textColor="#AAAAAA"
android:text="date/time" />
<TextView <TextView
android:id="@+id/comment_timeline" android:id="@+id/comment_timeline"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="@string/comment_placeholder" /> android:text="Hallo Ik ben een comment!" />
<TextView <LinearLayout
android:id="@+id/timeline_date" android:padding="5dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="date/time" /> android:gravity="center_horizontal"
<LinearLayout android:orientation="horizontal">
android:layout_width="match_parent"
android:layout_height="40dp">
<ImageButton <ImageButton
android:id="@+id/niet_slecht_button" android:id="@+id/niet_slecht_button"
android:layout_width="200dp" android:layout_width="150dp"
android:layout_height="match_parent" /> android:layout_height="40dp"
<TextView android:scaleType="centerInside"
android:layout_width="wrap_content" android:background="@android:color/transparent"
android:layout_height="match_parent" android:src="@drawable/niet_slecht"/>
android:gravity="center"
android:text="@string/niet_slecht" />
<TextView <TextView
android:id="@+id/niet_slecht_count" android:id="@+id/niet_slecht_count"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:textSize="20sp"
android:text="10" /> android:text="10" />
</LinearLayout> </LinearLayout>