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

Merge branch 'felix' into 'master'

Browse Source 
Fix front facing + layout profile

See merge request !27
This commit was merged in pull request #27.
This commit is contained in:
Felix Atsma
2017-06-28 16:04:01 +02:00
parent 2621062c60 0560e6a0fb
commit c8f65c0dca
6 changed files with 56 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,7 +127,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
public void onPictureTaken(byte[] data, Camera camera) { public void onPictureTaken(byte[] data, Camera camera) {
mPhoto = BitmapFactory.decodeByteArray(data, 0, data.length, null); 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); mPicPreview.setId(R.id.pic_preview);
mCameraLayout.addView(mPicPreview); mCameraLayout.addView(mPicPreview);
@@ -213,7 +213,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
PicturePreview.filterPrev(); PicturePreview.filterPrev();
PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto); PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto, facing);
mPicPreview.setId(R.id.pic_preview); mPicPreview.setId(R.id.pic_preview);
mCameraLayout.addView(mPicPreview); mCameraLayout.addView(mPicPreview);
@@ -231,7 +231,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
PicturePreview.filterNext(); PicturePreview.filterNext();
PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto); PicturePreview mPicPreview = new PicturePreview(getActivity().getBaseContext(), mPhoto, facing);
mPicPreview.setId(R.id.pic_preview); mPicPreview.setId(R.id.pic_preview);
mCameraLayout.addView(mPicPreview); mCameraLayout.addView(mPicPreview);

29
app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/PicturePreview.java
View File

@@ -9,6 +9,7 @@ import android.graphics.ColorMatrix;
import android.graphics.ColorMatrixColorFilter; import android.graphics.ColorMatrixColorFilter;
import android.graphics.Matrix; import android.graphics.Matrix;
import android.graphics.Paint; import android.graphics.Paint;
import android.hardware.Camera;
import android.util.Log; import android.util.Log;
import android.view.SurfaceHolder; import android.view.SurfaceHolder;
import android.view.SurfaceView; import android.view.SurfaceView;
@@ -26,14 +27,24 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
private static int currentFilter = FILTER_NONE; private static int currentFilter = FILTER_NONE;
int facing;
int rotate;
Bitmap picture; Bitmap picture;
Bitmap filterPicture; Bitmap filterPicture;
public PicturePreview(Context context, Bitmap bmp) { public PicturePreview(Context context, Bitmap bmp, int facing) {
super(context); super(context);
setWillNotDraw(false); setWillNotDraw(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); picture = Bitmap.createScaledBitmap(bmp, bmp.getWidth() / 2, bmp.getHeight() / 2, false);
rotate = 90;
}
Log.d(TAG, "PicturePreview: " + bmp.getWidth() + " " + bmp.getHeight()); Log.d(TAG, "PicturePreview: " + bmp.getWidth() + " " + bmp.getHeight());
} }
@@ -47,8 +58,8 @@ public class PicturePreview extends SurfaceView implements SurfaceHolder.Callbac
switch (currentFilter) { switch (currentFilter) {
case FILTER_NONE: case FILTER_NONE:
canvas.drawBitmap(rotate(picture, 90), 0, 0, null); canvas.drawBitmap(rotate(picture, rotate), 0, 0, null);
filterPicture = rotate(picture, 90); filterPicture = rotate(picture, rotate);
break; break;
case FILTER_SEPIA: case FILTER_SEPIA:
filterPicture = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888); 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); filter = new ColorMatrixColorFilter(cm);
paint.setColorFilter(filter); paint.setColorFilter(filter);
saveCanvas.drawBitmap(rotate(picture, 90), 0, 0, paint); saveCanvas.drawBitmap(rotate(picture, rotate), 0, 0, paint);
canvas.drawBitmap(rotate(picture, 90), 0, 0, paint); canvas.drawBitmap(rotate(picture, rotate), 0, 0, paint);
break; break;
case FILTER_BW: case FILTER_BW:
filterPicture = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888); 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); filter = new ColorMatrixColorFilter(cm);
paint.setColorFilter(filter); paint.setColorFilter(filter);
saveCanvas.setBitmap(filterPicture); saveCanvas.setBitmap(filterPicture);
saveCanvas.drawBitmap(rotate(picture, 90), 0, 0, paint); saveCanvas.drawBitmap(rotate(picture, rotate), 0, 0, paint);
canvas.drawBitmap(rotate(picture, 90), 0, 0, paint); canvas.drawBitmap(rotate(picture, rotate), 0, 0, paint);
break; break;
case FILTER_NEG: case FILTER_NEG:
filterPicture = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888); 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); filter = new ColorMatrixColorFilter(cm);
paint.setColorFilter(filter); paint.setColorFilter(filter);
saveCanvas.setBitmap(filterPicture); saveCanvas.setBitmap(filterPicture);
saveCanvas.drawBitmap(rotate(picture, 90), 0, 0, paint); saveCanvas.drawBitmap(rotate(picture, rotate), 0, 0, paint);
canvas.drawBitmap(rotate(picture, 90), 0, 0, paint); canvas.drawBitmap(rotate(picture, rotate), 0, 0, paint);
break; break;
} }

2
app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimelineFragment.java
View File

@@ -23,7 +23,7 @@ public class TimelineFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_timeline, container, false); 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 = new DownloadClass(getActivity());
downloadClass.getPostsFromServer(); downloadClass.getPostsFromServer();

2
app/MyHyvesBookPlusStagram/app/src/main/res/layout/activity_main.xml
View File

@@ -13,7 +13,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1"
android:padding="16dp"> android:padding="0dp">
</FrameLayout> </FrameLayout>
<android.support.design.widget.BottomNavigationView <android.support.design.widget.BottomNavigationView

12
app/MyHyvesBookPlusStagram/app/src/main/res/layout/fragment_timeline.xml
View File

@@ -5,11 +5,19 @@
android:orientation="vertical" android:orientation="vertical"
tools:context="nl.myhyvesbookplus.tagram.TimelineFragment"> tools:context="nl.myhyvesbookplus.tagram.TimelineFragment">
<ListView <android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/listview" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/swiperefresh"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<ListView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent">
</ListView> </ListView>
</android.support.v4.widget.SwipeRefreshLayout>
</LinearLayout> </LinearLayout>

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

@@ -3,6 +3,10 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<Space
android:layout_width="match_parent"
android:layout_height="15dp" />
<ImageView <ImageView
android:id="@+id/timeline_image_profile" android:id="@+id/timeline_image_profile"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -13,21 +17,31 @@
android:id="@+id/comment_timeline_profile" android:id="@+id/comment_timeline_profile"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="Hallo Ik ben een comment!" /> android:text="Hallo Ik ben een comment!" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp"> android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal">
<TextView <Button
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:text="@string/niet_slecht" /> android:clickable="false"
android:text="@string/niet_slecht"/>
<TextView <TextView
android:id="@+id/niet_slecht_count_profile" android:id="@+id/niet_slecht_count_profile"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center"
android:textSize="20dp"
android:padding="10dp"
android:text="10" /> android:text="10" />
</LinearLayout> </LinearLayout>
<Space
android:layout_width="match_parent"
android:layout_height="15dp" />
</LinearLayout> </LinearLayout>