From 041d661a5912ed1396a2d8963711a67c6c429263 Mon Sep 17 00:00:00 2001 From: AlhousseineC Date: Mon, 25 Mar 2019 19:05:09 -0500 Subject: [PATCH 01/11] Created layout --- .idea/render.experimental.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .idea/render.experimental.xml diff --git a/.idea/render.experimental.xml b/.idea/render.experimental.xml new file mode 100644 index 0000000..8ec256a --- /dev/null +++ b/.idea/render.experimental.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file From 9e5417f476266a6ea7e3b6f086a45671898f9fd5 Mon Sep 17 00:00:00 2001 From: AlhousseineC Date: Mon, 25 Mar 2019 19:27:22 -0500 Subject: [PATCH 02/11] Created ImageViewer Class, construtor, getters and setter --- .../imageveiwer3/ImageViewerModel.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 app/src/main/java/com/example/imageveiwer3/ImageViewerModel.java diff --git a/app/src/main/java/com/example/imageveiwer3/ImageViewerModel.java b/app/src/main/java/com/example/imageveiwer3/ImageViewerModel.java new file mode 100644 index 0000000..c7cfea7 --- /dev/null +++ b/app/src/main/java/com/example/imageveiwer3/ImageViewerModel.java @@ -0,0 +1,36 @@ +package com.example.imageveiwer3; + +import android.net.Uri; + +import java.io.Serializable; + +public class ImageViewerModel implements Serializable { + private String pictureUri; + private String name; + + public ImageViewerModel(String pictureUri, String name) { + this.pictureUri = pictureUri; + this.name = name; + } + + public ImageViewerModel(String pictureUri) { + this.pictureUri = pictureUri; + } + + + public Uri getPictureUri() { + return Uri.parse(pictureUri); + } + + public void setPictureUri(Uri pictureUri) { + this.pictureUri = pictureUri.toString(); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} From dda87de72054930416ee68716d1e07d0c450c87a Mon Sep 17 00:00:00 2001 From: AlhousseineC Date: Mon, 25 Mar 2019 20:43:17 -0500 Subject: [PATCH 03/11] Create generateTextView method and ImageViewerDetails() --- .../example/imageveiwer3/ImagerViewerrDetails.java | 13 +++++++++++++ .../res/layout/activity_imager_viewerr_details.xml | 9 +++++++++ 2 files changed, 22 insertions(+) create mode 100644 app/src/main/java/com/example/imageveiwer3/ImagerViewerrDetails.java create mode 100644 app/src/main/res/layout/activity_imager_viewerr_details.xml diff --git a/app/src/main/java/com/example/imageveiwer3/ImagerViewerrDetails.java b/app/src/main/java/com/example/imageveiwer3/ImagerViewerrDetails.java new file mode 100644 index 0000000..84f4923 --- /dev/null +++ b/app/src/main/java/com/example/imageveiwer3/ImagerViewerrDetails.java @@ -0,0 +1,13 @@ +package com.example.imageveiwer3; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +public class ImagerViewerrDetails extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_imager_viewerr_details); + } +} diff --git a/app/src/main/res/layout/activity_imager_viewerr_details.xml b/app/src/main/res/layout/activity_imager_viewerr_details.xml new file mode 100644 index 0000000..8154b4f --- /dev/null +++ b/app/src/main/res/layout/activity_imager_viewerr_details.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file From 9ffdd567cfed1c2291c07092273ddb0b5d197dc1 Mon Sep 17 00:00:00 2001 From: AlhousseineC Date: Mon, 25 Mar 2019 23:38:23 -0500 Subject: [PATCH 04/11] Create an Intent and onActiviatyResults() --- .../java/com/example/imageveiwer3/ImagerViewerrDetails.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/example/imageveiwer3/ImagerViewerrDetails.java b/app/src/main/java/com/example/imageveiwer3/ImagerViewerrDetails.java index 84f4923..931b828 100644 --- a/app/src/main/java/com/example/imageveiwer3/ImagerViewerrDetails.java +++ b/app/src/main/java/com/example/imageveiwer3/ImagerViewerrDetails.java @@ -1,7 +1,7 @@ package com.example.imageveiwer3; -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; + import android.support.v7.app.AppCompatActivity; + import android.os.Bundle; public class ImagerViewerrDetails extends AppCompatActivity { From b2fed8389ba33e6232dd2bdd1adb800dc2aedb4c Mon Sep 17 00:00:00 2001 From: AlhousseineC Date: Tue, 26 Mar 2019 00:35:46 -0500 Subject: [PATCH 05/11] added onClickListener --- .../imageveiwer3/ImageViewerDetails.java | 28 +++++++++++++++++++ .../imageveiwer3/ImagerViewerrDetails.java | 13 --------- .../layout/activity_image_viewer_details.xml | 25 +++++++++++++++++ .../activity_imager_viewerr_details.xml | 9 ------ 4 files changed, 53 insertions(+), 22 deletions(-) create mode 100644 app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java delete mode 100644 app/src/main/java/com/example/imageveiwer3/ImagerViewerrDetails.java create mode 100644 app/src/main/res/layout/activity_image_viewer_details.xml delete mode 100644 app/src/main/res/layout/activity_imager_viewerr_details.xml diff --git a/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java b/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java new file mode 100644 index 0000000..90f6525 --- /dev/null +++ b/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java @@ -0,0 +1,28 @@ +package com.example.imageveiwer3; + + import android.content.Intent; + import android.support.v7.app.AppCompatActivity; + import android.os.Bundle; + import android.widget.ImageView; + import android.widget.TextView; + +public class ImageViewerDetails extends AppCompatActivity { + + TextView imageDetails; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_image_viewer_details); + + imageDetails = findViewById(R.id.details_of_image); + ImageView receivedImage = findViewById(R.id.received_image); + + Intent getImage = getIntent(); + ImageViewerModel imageViewerModel = (ImageViewerModel) getImage.getSerializableExtra("sentImage"); + receivedImage.setImageURI(imageViewerModel.getPictureUri()); + + + + } +} diff --git a/app/src/main/java/com/example/imageveiwer3/ImagerViewerrDetails.java b/app/src/main/java/com/example/imageveiwer3/ImagerViewerrDetails.java deleted file mode 100644 index 931b828..0000000 --- a/app/src/main/java/com/example/imageveiwer3/ImagerViewerrDetails.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.imageveiwer3; - - import android.support.v7.app.AppCompatActivity; - import android.os.Bundle; - -public class ImagerViewerrDetails extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_imager_viewerr_details); - } -} diff --git a/app/src/main/res/layout/activity_image_viewer_details.xml b/app/src/main/res/layout/activity_image_viewer_details.xml new file mode 100644 index 0000000..cf6b346 --- /dev/null +++ b/app/src/main/res/layout/activity_image_viewer_details.xml @@ -0,0 +1,25 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_imager_viewerr_details.xml b/app/src/main/res/layout/activity_imager_viewerr_details.xml deleted file mode 100644 index 8154b4f..0000000 --- a/app/src/main/res/layout/activity_imager_viewerr_details.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file From 3f0fd345898767c61e2fb0a7e2d6c24c9f19fb3a Mon Sep 17 00:00:00 2001 From: AlhousseineC Date: Tue, 26 Mar 2019 00:44:01 -0500 Subject: [PATCH 06/11] getIntent and finish --- .../java/com/example/imageveiwer3/ImageViewerDetails.java | 6 ++++-- app/src/main/res/layout/activity_image_viewer_details.xml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java b/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java index 90f6525..302e354 100644 --- a/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java +++ b/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java @@ -8,20 +8,22 @@ public class ImageViewerDetails extends AppCompatActivity { - TextView imageDetails; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_image_viewer_details); - imageDetails = findViewById(R.id.details_of_image); + TextView imageDetails = findViewById(R.id.details_of_image); ImageView receivedImage = findViewById(R.id.received_image); Intent getImage = getIntent(); ImageViewerModel imageViewerModel = (ImageViewerModel) getImage.getSerializableExtra("sentImage"); receivedImage.setImageURI(imageViewerModel.getPictureUri()); + imageDetails.setText(imageViewerModel.getName()); + } diff --git a/app/src/main/res/layout/activity_image_viewer_details.xml b/app/src/main/res/layout/activity_image_viewer_details.xml index cf6b346..aeae167 100644 --- a/app/src/main/res/layout/activity_image_viewer_details.xml +++ b/app/src/main/res/layout/activity_image_viewer_details.xml @@ -17,7 +17,7 @@ android:layout_marginTop="20dp" android:layout_below="@id/received_image" android:textSize="30dp" - android:text="info" + android:layout_centerHorizontal="true" android:layout_width="wrap_content" android:layout_height="wrap_content" /> From 3b495415000ebfe3467af146d9d51b2a7d90b160 Mon Sep 17 00:00:00 2001 From: AlhousseineC Date: Tue, 26 Mar 2019 10:43:59 -0500 Subject: [PATCH 07/11] added lifeCycles --- .../imageveiwer3/ImageViewerDetails.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java b/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java index 302e354..7308e9a 100644 --- a/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java +++ b/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java @@ -3,6 +3,7 @@ import android.content.Intent; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; + import android.util.Log; import android.widget.ImageView; import android.widget.TextView; @@ -27,4 +28,36 @@ protected void onCreate(Bundle savedInstanceState) { } + + + @Override + protected void onStart() { + super.onStart(); + Log.i("ActivityLifecycle",getLocalClassName() + " - onStart"); + + } + + @Override + protected void onResume() { + super.onResume(); + Log.i("ActivityLifecycle",getLocalClassName() + " - onResume"); + } + + @Override + protected void onPause() { + super.onPause(); + Log.i("ActivityLifecycle",getLocalClassName() + " - onPause"); + } + + @Override + protected void onStop() { + super.onStop(); + Log.i("ActivityLifecycle",getLocalClassName() + " - onStop"); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + Log.i("ActivityLifecycle",getLocalClassName() + " - onDestroy"); + } } From 34a9c55356b144153fe1d3e5c7bd0b099a537507 Mon Sep 17 00:00:00 2001 From: AlhousseineC Date: Tue, 26 Mar 2019 15:17:44 -0500 Subject: [PATCH 08/11] Added Full Screeon activity --- .../example/imageveiwer3/ImageViewerDetails.java | 7 +++++++ .../example/imageveiwer3/ViewImageFullScreen.java | 13 +++++++++++++ .../res/layout/activity_view_image_full_screen.xml | 9 +++++++++ app/src/main/res/values/attrs.xml | 12 ++++++++++++ 4 files changed, 41 insertions(+) create mode 100644 app/src/main/java/com/example/imageveiwer3/ViewImageFullScreen.java create mode 100644 app/src/main/res/layout/activity_view_image_full_screen.xml create mode 100644 app/src/main/res/values/attrs.xml diff --git a/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java b/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java index 7308e9a..fc3ed5e 100644 --- a/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java +++ b/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java @@ -4,6 +4,7 @@ import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.util.Log; + import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -18,6 +19,12 @@ protected void onCreate(Bundle savedInstanceState) { TextView imageDetails = findViewById(R.id.details_of_image); ImageView receivedImage = findViewById(R.id.received_image); + receivedImage.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent fullScreenImage = new Intent(Intent.) + } + }); Intent getImage = getIntent(); ImageViewerModel imageViewerModel = (ImageViewerModel) getImage.getSerializableExtra("sentImage"); diff --git a/app/src/main/java/com/example/imageveiwer3/ViewImageFullScreen.java b/app/src/main/java/com/example/imageveiwer3/ViewImageFullScreen.java new file mode 100644 index 0000000..d45ca9c --- /dev/null +++ b/app/src/main/java/com/example/imageveiwer3/ViewImageFullScreen.java @@ -0,0 +1,13 @@ +package com.example.imageveiwer3; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +public class ViewImageFullScreen extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_view_image_full_screen); + } +} diff --git a/app/src/main/res/layout/activity_view_image_full_screen.xml b/app/src/main/res/layout/activity_view_image_full_screen.xml new file mode 100644 index 0000000..1180e1e --- /dev/null +++ b/app/src/main/res/layout/activity_view_image_full_screen.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml new file mode 100644 index 0000000..7ce840e --- /dev/null +++ b/app/src/main/res/values/attrs.xml @@ -0,0 +1,12 @@ + + + + + + + + + From 80f865629afd631985462e6a4367dc5f32218305 Mon Sep 17 00:00:00 2001 From: AlhousseineC Date: Tue, 26 Mar 2019 16:48:08 -0500 Subject: [PATCH 09/11] Added Full Screeon activity --- .../imageveiwer3/FullscreenActivity.java | 205 ++++++++++++++++++ .../imageveiwer3/ImageViewerDetails.java | 24 +- .../imageveiwer3/ViewImageFullScreen.java | 13 -- .../main/res/layout/activity_fullscreen.xml | 40 ++++ .../activity_view_image_full_screen.xml | 9 - 5 files changed, 264 insertions(+), 27 deletions(-) create mode 100644 app/src/main/java/com/example/imageveiwer3/FullscreenActivity.java delete mode 100644 app/src/main/java/com/example/imageveiwer3/ViewImageFullScreen.java create mode 100644 app/src/main/res/layout/activity_fullscreen.xml delete mode 100644 app/src/main/res/layout/activity_view_image_full_screen.xml diff --git a/app/src/main/java/com/example/imageveiwer3/FullscreenActivity.java b/app/src/main/java/com/example/imageveiwer3/FullscreenActivity.java new file mode 100644 index 0000000..f255e47 --- /dev/null +++ b/app/src/main/java/com/example/imageveiwer3/FullscreenActivity.java @@ -0,0 +1,205 @@ +package com.example.imageveiwer3; + +import android.annotation.SuppressLint; +import android.content.Intent; +import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.os.Handler; +import android.util.Log; +import android.view.MotionEvent; +import android.view.View; +import android.widget.ImageView; + +/** + * An example full-screen activity that shows and hides the system UI (i.e. + * status bar and navigation/system bar) with user interaction. + */ +public class FullscreenActivity extends AppCompatActivity { + /** + * Whether or not the system UI should be auto-hidden after + * {@link #AUTO_HIDE_DELAY_MILLIS} milliseconds. + */ + private static final boolean AUTO_HIDE = true; + + /** + * If {@link #AUTO_HIDE} is set, the number of milliseconds to wait after + * user interaction before hiding the system UI. + */ + private static final int AUTO_HIDE_DELAY_MILLIS = 3000; + + /** + * Some older devices needs a small delay between UI widget updates + * and a change of the status and navigation bar. + */ + private static final int UI_ANIMATION_DELAY = 300; + private final Handler mHideHandler = new Handler(); + private ImageView fullScreenImage; + private final Runnable mHidePart2Runnable = new Runnable() { + @SuppressLint("InlinedApi") + @Override + public void run() { + // Delayed removal of status and navigation bar + + // Note that some of these constants are new as of API 16 (Jelly Bean) + // and API 19 (KitKat). It is safe to use them, as they are inlined + // at compile-time and do nothing on earlier devices. + fullScreenImage.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE + | View.SYSTEM_UI_FLAG_FULLSCREEN + | View.SYSTEM_UI_FLAG_LAYOUT_STABLE + | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY + | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION); + } + }; + private View mControlsView; + private final Runnable mShowPart2Runnable = new Runnable() { + @Override + public void run() { + // Delayed display of UI elements + ActionBar actionBar = getSupportActionBar(); + if (actionBar != null) { + actionBar.show(); + } + mControlsView.setVisibility(View.VISIBLE); + } + }; + private boolean mVisible; + private final Runnable mHideRunnable = new Runnable() { + @Override + public void run() { + hide(); + } + }; + /** + * Touch listener to use for in-layout UI controls to delay hiding the + * system UI. This is to prevent the jarring behavior of controls going away + * while interacting with activity UI. + */ + private final View.OnTouchListener mDelayHideTouchListener = new View.OnTouchListener() { + @Override + public boolean onTouch(View view, MotionEvent motionEvent) { + if (AUTO_HIDE) { + delayedHide(AUTO_HIDE_DELAY_MILLIS); + } + return false; + } + }; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setContentView(R.layout.activity_fullscreen); + + mVisible = true; + mControlsView = findViewById(R.id.fullscreen_content_controls); + fullScreenImage = findViewById(R.id.fullscreen_content); + + Intent intent = getIntent(); + ImageViewerModel imageViewerModel = (ImageViewerModel) intent.getSerializableExtra("sentImage"); + fullScreenImage.setImageURI(imageViewerModel.getPictureUri()); + + + // Set up the user interaction to manually show or hide the system UI. + fullScreenImage.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + toggle(); + } + }); + + + + + + + + + + } + + @Override + protected void onPostCreate(Bundle savedInstanceState) { + super.onPostCreate(savedInstanceState); + + // Trigger the initial hide() shortly after the activity has been + // created, to briefly hint to the user that UI controls + // are available. + delayedHide(100); + } + + private void toggle() { + if (mVisible) { + hide(); + } else { + show(); + } + } + + private void hide() { + // Hide UI first + ActionBar actionBar = getSupportActionBar(); + if (actionBar != null) { + actionBar.hide(); + } + mControlsView.setVisibility(View.GONE); + mVisible = false; + + // Schedule a runnable to remove the status and navigation bar after a delay + mHideHandler.removeCallbacks(mShowPart2Runnable); + mHideHandler.postDelayed(mHidePart2Runnable, UI_ANIMATION_DELAY); + } + + @SuppressLint("InlinedApi") + private void show() { + // Show the system bar + fullScreenImage.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION); + mVisible = true; + + // Schedule a runnable to display UI elements after a delay + mHideHandler.removeCallbacks(mHidePart2Runnable); + mHideHandler.postDelayed(mShowPart2Runnable, UI_ANIMATION_DELAY); + } + + /** + * Schedules a call to hide() in delay milliseconds, canceling any + * previously scheduled calls. + */ + private void delayedHide(int delayMillis) { + mHideHandler.removeCallbacks(mHideRunnable); + mHideHandler.postDelayed(mHideRunnable, delayMillis); + } + + @Override + protected void onStart() { + super.onStart(); + Log.i("ActivityLifecycle",getLocalClassName() + " - onStart"); + + } + + @Override + protected void onResume() { + super.onResume(); + Log.i("ActivityLifecycle",getLocalClassName() + " - onResume"); + } + + @Override + protected void onPause() { + super.onPause(); + Log.i("ActivityLifecycle",getLocalClassName() + " - onPause"); + } + + @Override + protected void onStop() { + super.onStop(); + Log.i("ActivityLifecycle",getLocalClassName() + " - onStop"); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + Log.i("ActivityLifecycle",getLocalClassName() + " - onDestroy"); + } +} diff --git a/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java b/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java index fc3ed5e..fa6f422 100644 --- a/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java +++ b/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java @@ -1,5 +1,6 @@ package com.example.imageveiwer3; + import android.content.Context; import android.content.Intent; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; @@ -10,6 +11,8 @@ public class ImageViewerDetails extends AppCompatActivity { + Context context = this; + @Override @@ -19,18 +22,29 @@ protected void onCreate(Bundle savedInstanceState) { TextView imageDetails = findViewById(R.id.details_of_image); ImageView receivedImage = findViewById(R.id.received_image); + + + + + Intent getImage = getIntent(); + final ImageViewerModel imageViewerModel = (ImageViewerModel) getImage.getSerializableExtra("sentImage"); + receivedImage.setImageURI(imageViewerModel.getPictureUri()); + + imageDetails.setText(imageViewerModel.getName()); + receivedImage.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent fullScreenImage = new Intent(Intent.) + + Intent sentImage = new Intent(context,FullscreenActivity.class); + sentImage.putExtra("sentImage",imageViewerModel); + startActivity(sentImage); + + } }); - Intent getImage = getIntent(); - ImageViewerModel imageViewerModel = (ImageViewerModel) getImage.getSerializableExtra("sentImage"); - receivedImage.setImageURI(imageViewerModel.getPictureUri()); - imageDetails.setText(imageViewerModel.getName()); diff --git a/app/src/main/java/com/example/imageveiwer3/ViewImageFullScreen.java b/app/src/main/java/com/example/imageveiwer3/ViewImageFullScreen.java deleted file mode 100644 index d45ca9c..0000000 --- a/app/src/main/java/com/example/imageveiwer3/ViewImageFullScreen.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.imageveiwer3; - -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; - -public class ViewImageFullScreen extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_view_image_full_screen); - } -} diff --git a/app/src/main/res/layout/activity_fullscreen.xml b/app/src/main/res/layout/activity_fullscreen.xml new file mode 100644 index 0000000..e0a438f --- /dev/null +++ b/app/src/main/res/layout/activity_fullscreen.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_view_image_full_screen.xml b/app/src/main/res/layout/activity_view_image_full_screen.xml deleted file mode 100644 index 1180e1e..0000000 --- a/app/src/main/res/layout/activity_view_image_full_screen.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file From 4b549db5817326f8e56dbec3d3bc6685d7447df9 Mon Sep 17 00:00:00 2001 From: AlhousseineC Date: Tue, 26 Mar 2019 16:55:47 -0500 Subject: [PATCH 10/11] Added Full Screeon activity --- .../java/com/example/imageveiwer3/FullscreenActivity.java | 6 ++++++ .../java/com/example/imageveiwer3/ImageViewerDetails.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/app/src/main/java/com/example/imageveiwer3/FullscreenActivity.java b/app/src/main/java/com/example/imageveiwer3/FullscreenActivity.java index f255e47..48b0230 100644 --- a/app/src/main/java/com/example/imageveiwer3/FullscreenActivity.java +++ b/app/src/main/java/com/example/imageveiwer3/FullscreenActivity.java @@ -202,4 +202,10 @@ protected void onDestroy() { super.onDestroy(); Log.i("ActivityLifecycle",getLocalClassName() + " - onDestroy"); } + + @Override + public void onBackPressed() { + super.onBackPressed(); + Log.i("ActivityLifecycle",getLocalClassName() + " - onBackPressed"); + } } diff --git a/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java b/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java index fa6f422..7776c59 100644 --- a/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java +++ b/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java @@ -81,4 +81,10 @@ protected void onDestroy() { super.onDestroy(); Log.i("ActivityLifecycle",getLocalClassName() + " - onDestroy"); } + + @Override + public void onBackPressed() { + super.onBackPressed(); + Log.i("ActivityLifecycle",getLocalClassName() + " - onBackPressed"); + } } From 184f139770d028e2458f8e95fd89deb8a7679536 Mon Sep 17 00:00:00 2001 From: AlhousseineC Date: Tue, 26 Mar 2019 17:41:58 -0500 Subject: [PATCH 11/11] created static data --- .../java/com/example/imageveiwer3/FullscreenActivity.java | 2 +- .../java/com/example/imageveiwer3/ImageViewerDetails.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/example/imageveiwer3/FullscreenActivity.java b/app/src/main/java/com/example/imageveiwer3/FullscreenActivity.java index 48b0230..c9ec78f 100644 --- a/app/src/main/java/com/example/imageveiwer3/FullscreenActivity.java +++ b/app/src/main/java/com/example/imageveiwer3/FullscreenActivity.java @@ -97,7 +97,7 @@ protected void onCreate(Bundle savedInstanceState) { fullScreenImage = findViewById(R.id.fullscreen_content); Intent intent = getIntent(); - ImageViewerModel imageViewerModel = (ImageViewerModel) intent.getSerializableExtra("sentImage"); + ImageViewerModel imageViewerModel = (ImageViewerModel) intent.getSerializableExtra(MainActivity.KEY_IMAGE); fullScreenImage.setImageURI(imageViewerModel.getPictureUri()); diff --git a/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java b/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java index 7776c59..4948699 100644 --- a/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java +++ b/app/src/main/java/com/example/imageveiwer3/ImageViewerDetails.java @@ -27,7 +27,7 @@ protected void onCreate(Bundle savedInstanceState) { Intent getImage = getIntent(); - final ImageViewerModel imageViewerModel = (ImageViewerModel) getImage.getSerializableExtra("sentImage"); + final ImageViewerModel imageViewerModel = (ImageViewerModel) getImage.getSerializableExtra(MainActivity.KEY_IMAGE); receivedImage.setImageURI(imageViewerModel.getPictureUri()); imageDetails.setText(imageViewerModel.getName()); @@ -37,7 +37,7 @@ protected void onCreate(Bundle savedInstanceState) { public void onClick(View v) { Intent sentImage = new Intent(context,FullscreenActivity.class); - sentImage.putExtra("sentImage",imageViewerModel); + sentImage.putExtra(MainActivity.KEY_IMAGE,imageViewerModel); startActivity(sentImage);