From 9f765a9cbfa24644162dde01a62ec269a2b53b4c Mon Sep 17 00:00:00 2001
From: Shubham Kumar <shubham.kumar1739@gmail.com>
Date: Fri, 14 Feb 2020 02:21:22 +0530
Subject: [PATCH] fix: Add TRY button in the Skills List #2493

Add a method tryButtonClicked() in the SkillFragmentCallback
which plays the skill when the Try button is clicked from the Skills List
itself.

Implement the method in the skills activity to send the skill data to SUSI
in ChatActivity.
---
 .../fossasia/susi/ai/skills/SkillFragmentCallback.kt |  2 ++
 .../org/fossasia/susi/ai/skills/SkillsActivity.kt    | 12 ++++++++++++
 .../adapters/recycleradapters/SkillListAdapter.kt    | 10 ++++++++++
 .../adapters/viewholders/SkillViewHolder.kt          |  3 +++
 app/src/main/res/layout/item_skill.xml               | 11 +++++++++++
 5 files changed, 38 insertions(+)

diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/SkillFragmentCallback.kt b/app/src/main/java/org/fossasia/susi/ai/skills/SkillFragmentCallback.kt
index 1c9d8316b3..04960cb87f 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/SkillFragmentCallback.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/SkillFragmentCallback.kt
@@ -7,4 +7,6 @@ interface SkillFragmentCallback {
     fun loadDetailFragment(skillData: SkillData?, skillGroup: String?, skillTag: String)
 
     fun loadGroupWiseSkillsFragment(group: String)
+
+    fun tryButtonClicked(position: Int, data: SkillData)
 }
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/SkillsActivity.kt b/app/src/main/java/org/fossasia/susi/ai/skills/SkillsActivity.kt
index 6e45502248..cd195a1d74 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/SkillsActivity.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/SkillsActivity.kt
@@ -405,6 +405,18 @@ class SkillsActivity : AppCompatActivity(), SkillFragmentCallback {
                 .commit()
     }
 
+    override fun tryButtonClicked(position: Int, data: SkillData) {
+        overridePendingTransition(R.anim.trans_right_in, R.anim.trans_right_out)
+        val intent = Intent(this@SkillsActivity, ChatActivity::class.java)
+        intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK
+        if (data.examples.isNotEmpty())
+            intent.putExtra("example", data.examples[0])
+        else
+            intent.putExtra("example", "")
+        startActivity(intent)
+        finish()
+    }
+
     fun handleOnLoadingFragment() {
         hideSoftKeyboard(this, window.decorView)
         if (isSearchOpened) {
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/recycleradapters/SkillListAdapter.kt b/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/recycleradapters/SkillListAdapter.kt
index 4deb160bcf..cfb11b88f0 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/recycleradapters/SkillListAdapter.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/recycleradapters/SkillListAdapter.kt
@@ -5,6 +5,7 @@ import android.support.annotation.NonNull
 import android.support.v7.widget.RecyclerView
 import android.text.TextUtils
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.helper.Utils
@@ -45,6 +46,15 @@ class SkillListAdapter(val context: Context, private val skillDetails: List<Skil
                 holder.skillRatingBar.rating = stars.averageStar
                 holder.totalRatings.text = stars.totalStar.toString()
             }
+
+            // if skill data is empty, button visibility gone
+            if (skillData.examples.isEmpty()) {
+                holder.skillItemTryButton.visibility = View.GONE
+            }
+            // sent skill data on try button clicked
+            holder.skillItemTryButton.setOnClickListener({
+                skillCallback.tryButtonClicked(position, skillDetails?.get(position))
+            })
         }
     }
 
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/viewholders/SkillViewHolder.kt b/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/viewholders/SkillViewHolder.kt
index 5e9e9b7e9c..daa914cd65 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/viewholders/SkillViewHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/viewholders/SkillViewHolder.kt
@@ -2,9 +2,11 @@ package org.fossasia.susi.ai.skills.skilllisting.adapters.viewholders
 
 import android.support.v7.widget.RecyclerView
 import android.view.View
+import android.widget.Button
 import android.widget.ImageView
 import android.widget.RatingBar
 import android.widget.TextView
+import kotlinx.android.synthetic.main.fragment_skill_details.*
 import kotterknife.bindView
 import org.fossasia.susi.ai.R
 
@@ -15,6 +17,7 @@ class SkillViewHolder(itemView: View, private val listener: ClickListener?) : Re
     val skillPreviewExample: TextView by bindView(R.id.skill_preview_example)
     val skillRatingBar: RatingBar by bindView(R.id.cv_rating_bar)
     val totalRatings: TextView by bindView(R.id.cv_total_ratings)
+    val skillItemTryButton: Button by bindView(R.id.skillItemTryButton)
 
     init {
         itemView.setOnClickListener(this)
diff --git a/app/src/main/res/layout/item_skill.xml b/app/src/main/res/layout/item_skill.xml
index 7b95bfa704..647dc931bd 100644
--- a/app/src/main/res/layout/item_skill.xml
+++ b/app/src/main/res/layout/item_skill.xml
@@ -100,6 +100,17 @@
                     android:text="@string/digit_zero"
                     android:textColor="@color/colorPrimary" />
 
+                <Button
+                    android:id="@+id/skillItemTryButton"
+                    android:layout_width="@dimen/button_width_skill_details"
+                    android:layout_height="@dimen/button_height_skill_details"
+                    android:layout_marginEnd="@dimen/margin_small"
+                    android:layout_marginRight="@dimen/margin_small"
+                    android:layout_marginBottom="@dimen/margin_small"
+                    android:backgroundTint="@color/colorPrimary"
+                    android:text="@string/try_it"
+                    android:textColor="@color/md_white_1000" />
+
             </LinearLayout>
         </LinearLayout>