From 8767654b7d7c8b6ebd0e95edfac0ca2d45d7afe4 Mon Sep 17 00:00:00 2001
From: Lucas Cabral <lucas_cabral.deve@outlook.com>
Date: Mon, 24 May 2021 11:14:02 -0300
Subject: [PATCH] Tela de detalhes pronta para review.

---
 app/src/main/AndroidManifest.xml              |  7 ++-
 .../presenter/adapter/AllCharactersAdapter.kt | 10 ++++
 .../view/CharacterDetailsActivity.kt          | 60 +++++++++++++++++++
 .../res/layout/activity_character_details.xml | 36 +++++++++++
 app/src/main/res/values/colors.xml            |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 6 files changed, 113 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/lucascabral/marvelsuperheroes/presenter/view/CharacterDetailsActivity.kt
 create mode 100644 app/src/main/res/layout/activity_character_details.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 311b249..c761484 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,12 +7,15 @@
     <application
         android:name=".presenter.MarvelApp"
         android:allowBackup="true"
-        android:usesCleartextTraffic="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.MarvelSuperHeroes">
+        android:theme="@style/Theme.MarvelSuperHeroes"
+        android:usesCleartextTraffic="true">
+        <activity
+            android:name=".presenter.view.CharacterDetailsActivity"
+            android:parentActivityName=".presenter.view.AllCharactersActivity" />
         <activity android:name=".presenter.view.AllCharactersActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/lucascabral/marvelsuperheroes/presenter/adapter/AllCharactersAdapter.kt b/app/src/main/java/com/lucascabral/marvelsuperheroes/presenter/adapter/AllCharactersAdapter.kt
index 60d576e..1f62e09 100644
--- a/app/src/main/java/com/lucascabral/marvelsuperheroes/presenter/adapter/AllCharactersAdapter.kt
+++ b/app/src/main/java/com/lucascabral/marvelsuperheroes/presenter/adapter/AllCharactersAdapter.kt
@@ -1,5 +1,6 @@
 package com.lucascabral.marvelsuperheroes.presenter.adapter
 
+import android.content.Intent
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.paging.PagingDataAdapter
@@ -8,6 +9,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.lucascabral.marvelsuperheroes.databinding.ItemCharacterBinding
 import com.lucascabral.marvelsuperheroes.network.model.Character
+import com.lucascabral.marvelsuperheroes.presenter.view.CharacterDetailsActivity
 
 class AllCharactersAdapter: PagingDataAdapter<Character, AllCharactersAdapter.MyViewHolder>(DiffUtilCallBack()) {
 
@@ -30,6 +32,14 @@ class AllCharactersAdapter: PagingDataAdapter<Character, AllCharactersAdapter.My
                 val uri = data.thumbnail.path+"."+data.thumbnail.extension
                 Glide.with(characterImage).load(uri).into(characterImage)
             }
+            itemView.setOnClickListener {
+                val intent = Intent(it.context, CharacterDetailsActivity::class.java)
+                val uri = data.thumbnail.path+"."+data.thumbnail.extension
+                intent.putExtra(CharacterDetailsActivity.HERO_NAME, data.name)
+                intent.putExtra(CharacterDetailsActivity.HERO_DESCRIPTION, data.description)
+                intent.putExtra(CharacterDetailsActivity.HERO_URI, uri)
+                it.context.startActivity(intent)
+            }
         }
     }
 
diff --git a/app/src/main/java/com/lucascabral/marvelsuperheroes/presenter/view/CharacterDetailsActivity.kt b/app/src/main/java/com/lucascabral/marvelsuperheroes/presenter/view/CharacterDetailsActivity.kt
new file mode 100644
index 0000000..960b99b
--- /dev/null
+++ b/app/src/main/java/com/lucascabral/marvelsuperheroes/presenter/view/CharacterDetailsActivity.kt
@@ -0,0 +1,60 @@
+package com.lucascabral.marvelsuperheroes.presenter.view
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.bumptech.glide.Glide
+import com.lucascabral.marvelsuperheroes.R
+import com.lucascabral.marvelsuperheroes.databinding.ActivityCharacterDetailsBinding
+
+class CharacterDetailsActivity : AppCompatActivity() {
+
+    private lateinit var detailsBinding: ActivityCharacterDetailsBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        detailsBinding = ActivityCharacterDetailsBinding.inflate(layoutInflater)
+        setContentView(detailsBinding.root)
+
+        val (name: String?, uri: String?, description: String?) = getDataExtra()
+
+        setupViews(name, uri, description)
+        setupToolbar(name)
+    }
+
+    override fun onSupportNavigateUp(): Boolean {
+        finish()
+        return true
+    }
+
+    private fun getDataExtra(): Triple<String?, String?, String?> {
+        val name: String? = intent.getStringExtra(HERO_NAME)
+        val uri: String? = intent.getStringExtra(HERO_URI)
+        val description: String? = intent.getStringExtra(HERO_DESCRIPTION)
+        return Triple(name, uri, description)
+    }
+
+    private fun setupViews(name: String?, uri: String?, description: String?) {
+        detailsBinding.apply {
+            Glide.with(this@CharacterDetailsActivity).load(uri).into(descriptionCharacterImageView)
+            if (description.isNullOrEmpty()) {
+                descriptionCharacterTextView.text = getString(R.string.character_unknown, name)
+            } else {
+                descriptionCharacterTextView.text = description
+            }
+        }
+    }
+
+    private fun setupToolbar(name: String?) {
+        supportActionBar?.apply {
+            title = name
+            setDisplayHomeAsUpEnabled(true)
+            setDisplayShowHomeEnabled(true)
+        }
+    }
+
+    companion object {
+        const val HERO_NAME = "name"
+        const val HERO_DESCRIPTION = "description"
+        const val HERO_URI = "uri"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_character_details.xml b/app/src/main/res/layout/activity_character_details.xml
new file mode 100644
index 0000000..839d7a8
--- /dev/null
+++ b/app/src/main/res/layout/activity_character_details.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    android:background="@color/main_background">
+
+    <ImageView
+        android:id="@+id/descriptionCharacterImageView"
+        android:layout_width="0dp"
+        android:layout_height="250dp"
+        android:layout_marginStart="22dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="20dp"
+        android:contentDescription="@string/character_image_contentDesc"
+        android:scaleType="fitCenter"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@tools:sample/avatars" />
+
+    <TextView
+        android:id="@+id/descriptionCharacterTextView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="30dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginEnd="30dp"
+        android:textColor="@color/black"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/descriptionCharacterImageView"
+        tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c7f5faf..6b002b4 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -12,4 +12,5 @@
     <color name="red_toolbar">#CC0000</color>
     <color name="redDark_toolbar">#990000</color>
     <color name="redDark2_toolbar">#7f0000</color>
+    <color name="warm_grey">#8d8c8c</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index de67d46..33a931e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,5 @@
 <resources>
     <string name="app_name">Marvel Super Heroes</string>
     <string name="character_image_contentDesc">Character image</string>
+    <string name="character_unknown">There\'s no information about %1$s</string>
 </resources>
\ No newline at end of file