From 93434a981fbeeacdc3c2ebf00097d2b85af1c593 Mon Sep 17 00:00:00 2001 From: Felix Atsma Date: Wed, 28 Jun 2017 15:28:40 +0200 Subject: [PATCH 1/2] Layout profile changes + half of a reloader --- .../tagram/TimelineFragment.java | 2 +- .../app/src/main/res/layout/activity_main.xml | 2 +- .../src/main/res/layout/fragment_timeline.xml | 14 ++++++++--- .../res/layout/list_item_timeline_profile.xml | 24 +++++++++++++++---- 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java index b2ca6d4..3139be0 100644 --- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java +++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java @@ -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(); diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/activity_main.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/activity_main.xml index e2fe541..61c2050 100644 --- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/activity_main.xml +++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/activity_main.xml @@ -13,7 +13,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:padding="16dp"> + android:padding="0dp"> - - + + + + + \ No newline at end of file diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml index f8020e8..965ec97 100644 --- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml +++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml @@ -3,6 +3,10 @@ android:layout_height="match_parent" android:orientation="vertical"> + + + android:layout_height="wrap_content" + android:gravity="center_horizontal" + android:orientation="horizontal"> - - + android:layout_height="wrap_content" + android:clickable="false" + android:text="@string/niet_slecht"/> + + From 0560e6a0fb97af7d7d797b3eca1e98e6051d9b8c Mon Sep 17 00:00:00 2001 From: Felix Atsma Date: Wed, 28 Jun 2017 16:03:16 +0200 Subject: [PATCH 2/2] Fix front facing camera --- .../tagram/CameraFragment.java | 6 ++-- .../tagram/PicturePreview.java | 31 +++++++++++++------ 2 files changed, 24 insertions(+), 13 deletions(-) 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 ca0bb4a..3bdc1b5 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 @@ -127,7 +127,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL public void onPictureTaken(byte[] data, Camera camera) { mPhoto = BitmapFactory.decodeByteArray(data, 0, data.length, null); - PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto); + PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto, facing); mPicPreview.setId(R.id.pic_preview); mCameraLayout.addView(mPicPreview); @@ -213,7 +213,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL PicturePreview.filterPrev(); - PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto); + PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto, facing); mPicPreview.setId(R.id.pic_preview); mCameraLayout.addView(mPicPreview); @@ -231,7 +231,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL PicturePreview.filterNext(); - PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto); + PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto, facing); mPicPreview.setId(R.id.pic_preview); mCameraLayout.addView(mPicPreview); diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java index 47a2a46..33749e6 100644 --- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java +++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java @@ -9,6 +9,7 @@ import android.graphics.ColorMatrix; import android.graphics.ColorMatrixColorFilter; import android.graphics.Matrix; import android.graphics.Paint; +import android.hardware.Camera; import android.util.Log; import android.view.SurfaceHolder; import android.view.SurfaceView; @@ -26,14 +27,24 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac private static int currentFilter = FILTER_NONE; + int facing; + int rotate; Bitmap picture; Bitmap filterPicture; - public PicturePreview(Context context, Bitmap bmp) { + public PicturePreview(Context context, Bitmap bmp, int facing) { super(context); setWillNotDraw(false); - picture = Bitmap.createScaledBitmap(bmp, bmp.getWidth() / 2, bmp.getHeight() / 2, false); + this.facing = facing; + + if (((Integer)facing).equals(Camera.CameraInfo.CAMERA_FACING_FRONT)) { + picture = Bitmap.createBitmap(bmp); + rotate = 270; + } else { + picture = Bitmap.createScaledBitmap(bmp, bmp.getWidth() / 2, bmp.getHeight() / 2, false); + rotate = 90; + } Log.d(TAG, "PicturePreview: " + bmp.getWidth() + " " + bmp.getHeight()); } @@ -47,8 +58,8 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac switch (currentFilter) { case FILTER_NONE: - canvas.drawBitmap(rotate(picture, 90), 0, 0, null); - filterPicture = rotate(picture, 90); + canvas.drawBitmap(rotate(picture, rotate), 0, 0, null); + filterPicture = rotate(picture, rotate); break; case FILTER_SEPIA: filterPicture = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888); @@ -62,8 +73,8 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac filter = new ColorMatrixColorFilter(cm); paint.setColorFilter(filter); - saveCanvas.drawBitmap(rotate(picture, 90), 0, 0, paint); - canvas.drawBitmap(rotate(picture, 90), 0, 0, paint); + saveCanvas.drawBitmap(rotate(picture, rotate), 0, 0, paint); + canvas.drawBitmap(rotate(picture, rotate), 0, 0, paint); break; case FILTER_BW: filterPicture = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888); @@ -73,8 +84,8 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac filter = new ColorMatrixColorFilter(cm); paint.setColorFilter(filter); saveCanvas.setBitmap(filterPicture); - saveCanvas.drawBitmap(rotate(picture, 90), 0, 0, paint); - canvas.drawBitmap(rotate(picture, 90), 0, 0, paint); + saveCanvas.drawBitmap(rotate(picture, rotate), 0, 0, paint); + canvas.drawBitmap(rotate(picture, rotate), 0, 0, paint); break; case FILTER_NEG: filterPicture = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888); @@ -88,8 +99,8 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac filter = new ColorMatrixColorFilter(cm); paint.setColorFilter(filter); saveCanvas.setBitmap(filterPicture); - saveCanvas.drawBitmap(rotate(picture, 90), 0, 0, paint); - canvas.drawBitmap(rotate(picture, 90), 0, 0, paint); + saveCanvas.drawBitmap(rotate(picture, rotate), 0, 0, paint); + canvas.drawBitmap(rotate(picture, rotate), 0, 0, paint); break; }