From a22d671aa4b8cc077c14efadddb0ebfcd92819f8 Mon Sep 17 00:00:00 2001
From: kkjsw17 <kkjsw17@naver.com>
Date: Sun, 20 Jun 2021 16:40:43 +0900
Subject: [PATCH] Big view of Article image

---
 .../konkuk/koogle/Activity/ArticleActivity.kt |  6 ++---
 .../koogle/Activity/ImageViewActivity.kt      | 11 ++++++++--
 .../main/res/layout/activity_image_view.xml   | 22 ++++++++++++++-----
 app/src/main/res/layout/item_article.xml      |  1 +
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/kr/ac/konkuk/koogle/Activity/ArticleActivity.kt b/app/src/main/java/kr/ac/konkuk/koogle/Activity/ArticleActivity.kt
index 83d587c..f361889 100644
--- a/app/src/main/java/kr/ac/konkuk/koogle/Activity/ArticleActivity.kt
+++ b/app/src/main/java/kr/ac/konkuk/koogle/Activity/ArticleActivity.kt
@@ -137,9 +137,9 @@ class ArticleActivity : AppCompatActivity() {
         imageAdapter = ArticleImageAdapter()
         imageAdapter.itemClickListener = object : ArticleImageAdapter.OnItemClickListener {
             override fun onItemClick(holder: ArticleImageAdapter.ViewHolder, uri: Uri) {
-//                val intent = Intent(this@ArticleActivity, ImageViewActivity::class.java)
-//                intent.putExtra("uri", uri)
-//                startActivity(intent)
+                val intent = Intent(this@ArticleActivity, ImageViewActivity::class.java)
+                intent.putExtra("url", uri.toString())
+                startActivity(intent)
             }
         }
         binding.photoImageRecyclerView.adapter = imageAdapter
diff --git a/app/src/main/java/kr/ac/konkuk/koogle/Activity/ImageViewActivity.kt b/app/src/main/java/kr/ac/konkuk/koogle/Activity/ImageViewActivity.kt
index 8ded453..a58d79e 100644
--- a/app/src/main/java/kr/ac/konkuk/koogle/Activity/ImageViewActivity.kt
+++ b/app/src/main/java/kr/ac/konkuk/koogle/Activity/ImageViewActivity.kt
@@ -3,8 +3,10 @@ package kr.ac.konkuk.koogle.Activity
 import android.net.Uri
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import com.bumptech.glide.Glide
 import kr.ac.konkuk.koogle.R
 import kr.ac.konkuk.koogle.databinding.ActivityImageViewBinding
+import java.net.URLEncoder
 
 class ImageViewActivity : AppCompatActivity() {
     lateinit var binding: ActivityImageViewBinding
@@ -14,7 +16,12 @@ class ImageViewActivity : AppCompatActivity() {
         binding = ActivityImageViewBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        val uri = intent.getSerializableExtra("uri") as Uri
-        binding.imageView.setImageURI(uri)
+        Glide.with(binding.imageView)
+            .load(intent.getStringExtra("url"))
+            .into(binding.imageView)
+
+        binding.cancelImageView.setOnClickListener {
+            finish()
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_image_view.xml b/app/src/main/res/layout/activity_image_view.xml
index e9958a1..25c1e01 100644
--- a/app/src/main/res/layout/activity_image_view.xml
+++ b/app/src/main/res/layout/activity_image_view.xml
@@ -1,15 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Activity.ImageViewActivity"
-    android:background="@color/black">
+    android:background="@color/black"
+    tools:context=".Activity.ImageViewActivity">
 
     <ImageView
         android:id="@+id/imageView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="centerCrop" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        android:scaleType="fitCenter" />
+
+    <ImageView
+        android:id="@+id/cancelImageView"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_gravity="right|top"
+        android:layout_margin="20dp"
+        app:srcCompat="@drawable/cancel"
+        app:tint="#FFFFFF"
+        tools:layout_editor_absoluteX="345dp"
+        tools:ignore="RtlHardcoded" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_article.xml b/app/src/main/res/layout/item_article.xml
index b52e3ed..669e747 100644
--- a/app/src/main/res/layout/item_article.xml
+++ b/app/src/main/res/layout/item_article.xml
@@ -72,6 +72,7 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:padding="6dp"
+        android:scaleType="center"
         android:src="@drawable/profile_image"
         app:srcCompat="@drawable/ic_launcher_foreground" />