From f0719c51f961156fa45ec10b61f86f26262473c6 Mon Sep 17 00:00:00 2001 From: Felix Atsma Date: Wed, 28 Jun 2017 12:01:05 +0200 Subject: [PATCH] Add cancel button, fix button switching, change icons to vector --- .../tagram/CameraFragment.java | 58 ++++++++---- .../res/drawable/ic_arrow_back_black_24dp.png | Bin 199 -> 0 bytes .../res/drawable/ic_arrow_back_black_24dp.xml | 11 +++ .../drawable/ic_arrow_forward_black_24dp.png | Bin 222 -> 0 bytes .../drawable/ic_arrow_forward_black_24dp.xml | 11 +++ .../res/drawable/ic_camera_black_24dp.xml | 11 +++ .../drawable/ic_switch_camera_black_24dp.xml | 11 +++ .../src/main/res/layout/fragment_camera.xml | 84 +++++++++--------- .../app/src/main/res/values-nl/strings.xml | 1 + .../app/src/main/res/values/strings.xml | 1 + 10 files changed, 130 insertions(+), 58 deletions(-) delete mode 100644 app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_back_black_24dp.png create mode 100644 app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml delete mode 100644 app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_forward_black_24dp.png create mode 100644 app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_forward_black_24dp.xml create mode 100644 app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_camera_black_24dp.xml create mode 100644 app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_switch_camera_black_24dp.xml diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java index 900666d..ca0bb4a 100644 --- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java +++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java @@ -6,6 +6,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.hardware.Camera; import android.hardware.Camera.PictureCallback; +import android.media.Image; import android.net.Uri; import android.os.Bundle; import android.app.Fragment; @@ -17,6 +18,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; +import android.widget.ImageButton; import android.widget.RelativeLayout; import nl.myhyvesbookplus.tagram.controller.PostUploader; @@ -89,12 +91,8 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL final View view = inflater.inflate(R.layout.fragment_camera, container, false); mCamera = getCameraInstance(facing); - Camera.Parameters params = mCamera.getParameters(); - params.setRotation(0); - mCamera.setParameters(params); mPreview = new CameraPreview(getActivity().getBaseContext(), mCamera); - final RelativeLayout pictureButtons = (RelativeLayout) view.findViewById(R.id.picture_taken_buttons); final RelativeLayout filterButtons = (RelativeLayout) view.findViewById(R.id.filter_buttons); final RelativeLayout mCameraLayout = (RelativeLayout) view.findViewById(R.id.camera_preview); @@ -103,7 +101,6 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL // Draw buttons over preview view.findViewById(R.id.picture_button).bringToFront(); view.findViewById(R.id.switch_camera_button).bringToFront(); - pictureButtons.bringToFront(); filterButtons.bringToFront(); (view.findViewById(R.id.switch_camera_button)).setOnClickListener(new View.OnClickListener() { @@ -150,6 +147,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL 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.findViewById(R.id.filter_buttons).setVisibility(View.GONE); ((FloatingActionButton)view.findViewById(R.id.upload_button)).hide(); } }); @@ -173,9 +171,6 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL mCameraLayout.removeView(mPreview); mCamera = getCameraInstance(facing); - Camera.Parameters params = mCamera.getParameters(); - params.setRotation(90); - mCamera.setParameters(params); mPreview = new CameraPreview(getActivity().getBaseContext(), mCamera); mCameraLayout.addView(mPreview); @@ -184,7 +179,30 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL view.findViewById(R.id.switch_camera_button).bringToFront(); mCameraLayout.removeView(view.findViewById(R.id.pic_preview)); + } + }); + (view.findViewById(R.id.comment_cancel)).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + ((EditText) view.findViewById(R.id.comment_text)).setText(""); + + mPhoto.recycle(); + + filterButtons.setVisibility(View.GONE); + switchButtons(view); + + mCameraLayout.removeView(mPreview); + + mCamera = getCameraInstance(facing); + + mPreview = new CameraPreview(getActivity().getBaseContext(), mCamera); + mCameraLayout.addView(mPreview); + + view.findViewById(R.id.picture_button).bringToFront(); + view.findViewById(R.id.switch_camera_button).bringToFront(); + + mCameraLayout.removeView(view.findViewById(R.id.pic_preview)); } }); @@ -200,7 +218,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL mCameraLayout.addView(mPicPreview); - view.findViewById(R.id.picture_taken_buttons).bringToFront(); + view.findViewById(R.id.upload_button).bringToFront(); filterButtons.setVisibility(View.VISIBLE); filterButtons.bringToFront(); } @@ -218,7 +236,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL mCameraLayout.addView(mPicPreview); - view.findViewById(R.id.picture_taken_buttons).bringToFront(); + view.findViewById(R.id.upload_button).bringToFront(); filterButtons.setVisibility(View.VISIBLE); filterButtons.bringToFront(); } @@ -294,20 +312,26 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL } public void switchButtons(View view) { - RelativeLayout pictureButtons = (RelativeLayout) view.findViewById(R.id.picture_taken_buttons); FloatingActionButton upload = (FloatingActionButton) view.findViewById(R.id.upload_button); + ImageButton picButton = (ImageButton) view.findViewById(R.id.picture_button); + ImageButton switchButton = (ImageButton) view.findViewById(R.id.switch_camera_button); - if (((Integer)upload.getVisibility()).equals(View.VISIBLE)) { + if (((Integer)picButton.getVisibility()).equals(View.GONE)) { + Log.d(TAG, "switchButtons: GONE"); upload.hide(); - view.findViewById(R.id.picture_button).setVisibility(View.VISIBLE); - view.findViewById(R.id.switch_camera_button).setVisibility(View.VISIBLE); + picButton.setVisibility(View.VISIBLE); + switchButton.setVisibility(View.VISIBLE); + + picButton.bringToFront(); + switchButton.bringToFront(); } else { - pictureButtons.bringToFront(); + Log.d(TAG, "switchButtons: VISIBLE"); + upload.bringToFront(); upload.show(); - view.findViewById(R.id.picture_button).setVisibility(View.GONE); - view.findViewById(R.id.switch_camera_button).setVisibility(View.GONE); + picButton.setVisibility(View.GONE); + switchButton.setVisibility(View.GONE); } } diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_back_black_24dp.png b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_back_black_24dp.png deleted file mode 100644 index 7726760865bee01ff1f2b06fb58cbab901d0b6e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcg`aE46Ln;{G-f|aZHWWCPz|7%k zY`FdD)1ukGm;I}p-`23jG*#*zNJB%RT2%d9$(z46axRVM-1uv%z>4_Go4>CAw!nYB zUG1+gFE1~LGVJ;P`upzs=XE{)J<|`Cnz{Jv2Y5hc)%DX+0(`1=f~S_ j`;+@u4rsxF`x_XKKUCeUxL{cZkjvod>gTe~DWM4fCOJ*w diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml new file mode 100644 index 0000000..ccd28b4 --- /dev/null +++ b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_forward_black_24dp.png b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_arrow_forward_black_24dp.png deleted file mode 100644 index 8b5a68183db0af5ae96767121f57a6a5f4290587..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgmU_B4hEy=Vz2(SvFhHdB;daKH zNwqO=cz5sOQOQqHa4mlH`yJc4`6h3dFf%Yb@P1Wzuy3*ZbG12c_Un_L1L@~Kj znKyHTq&TOLipK;6$0imSqouWK>FO^H{i-EZPRrFeK5$IE{(?Wpc>mF7v-AI5{qucB z{=T2j?*A(SlJC!$->>-`zQKR4edwz{D}$c + + diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_camera_black_24dp.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_camera_black_24dp.xml new file mode 100644 index 0000000..8dd7426 --- /dev/null +++ b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_camera_black_24dp.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_switch_camera_black_24dp.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_switch_camera_black_24dp.xml new file mode 100644 index 0000000..3b6736d --- /dev/null +++ b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_switch_camera_black_24dp.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_camera.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_camera.xml index 04637b3..9815205 100644 --- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_camera.xml +++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_camera.xml @@ -18,20 +18,23 @@ android:layout_centerHorizontal="true" android:background="@android:color/transparent" android:layout_margin="10dp" - android:padding="10dp" + android:padding="15dp" android:scaleType="center" - android:scaleX="2" - android:scaleY="2" - app:srcCompat="@android:drawable/ic_menu_camera" /> + android:scaleX="2.5" + android:scaleY="2.5" + android:src="@drawable/ic_camera_black_24dp"/> + android:src="@drawable/ic_switch_camera_black_24dp"/> @@ -64,8 +69,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@android:color/transparent" - android:scaleX="0.5" - android:scaleY="0.5" + android:scaleX="2" + android:scaleY="2" + android:padding="10dp" + android:layout_margin="10dp" android:layout_alignParentRight="true" android:src="@drawable/ic_arrow_forward_black_24dp"/> @@ -94,45 +101,40 @@ android:layout_margin="4dp" android:padding="5dp" android:background="@android:color/darker_gray"/> -