From 229a7a3c090fe3e5217d42d4af70424c39d3c5f3 Mon Sep 17 00:00:00 2001
From: LooKeR <mohit2002ss@gmail.com>
Date: Tue, 26 Oct 2021 11:36:09 +0530
Subject: [PATCH] Add: Icon for details action Improve: Smaller App name on top
 app bar

---
 src/main/kotlin/com/looker/droidify/screen/ProductAdapter.kt  | 1 +
 src/main/kotlin/com/looker/droidify/screen/ProductFragment.kt | 4 +++-
 src/main/kotlin/com/looker/droidify/utility/extension/Text.kt | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/com/looker/droidify/screen/ProductAdapter.kt b/src/main/kotlin/com/looker/droidify/screen/ProductAdapter.kt
index 374313f3..9221be9e 100644
--- a/src/main/kotlin/com/looker/droidify/screen/ProductAdapter.kt
+++ b/src/main/kotlin/com/looker/droidify/screen/ProductAdapter.kt
@@ -1194,6 +1194,7 @@ class ProductAdapter(private val callbacks: Callbacks, private val columns: Int)
                             when (action) {
                                 Action.CANCEL -> context.getDrawable(R.drawable.ic_cancel)
                                 Action.LAUNCH -> context.getDrawable(R.drawable.ic_launch)
+                                Action.DETAILS -> context.getDrawable(R.drawable.ic_tune)
                                 else -> context.getDrawable(R.drawable.ic_download)
                             }
                         iconTint = if (action == Action.CANCEL) holder.actionTintOnCancel
diff --git a/src/main/kotlin/com/looker/droidify/screen/ProductFragment.kt b/src/main/kotlin/com/looker/droidify/screen/ProductFragment.kt
index 08b4375a..1d8b85c1 100644
--- a/src/main/kotlin/com/looker/droidify/screen/ProductFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/screen/ProductFragment.kt
@@ -29,6 +29,7 @@ import com.looker.droidify.utility.RxUtils
 import com.looker.droidify.utility.Utils
 import com.looker.droidify.utility.Utils.startUpdate
 import com.looker.droidify.utility.extension.android.*
+import com.looker.droidify.utility.extension.text.trimAfter
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.disposables.Disposable
@@ -329,7 +330,8 @@ class ProductFragment() : ScreenFragment(), ProductAdapter.Callbacks {
         } == true
 
         (toolbar.parent as CollapsingToolbarLayout).title =
-            if (showPackageName) products[0].first.name else getString(R.string.application)
+            if (showPackageName) products[0].first.name.trimAfter(' ', 2)
+            else getString(R.string.application)
     }
 
     private fun updateToolbarButtons() {
diff --git a/src/main/kotlin/com/looker/droidify/utility/extension/Text.kt b/src/main/kotlin/com/looker/droidify/utility/extension/Text.kt
index a4657a36..6f52c902 100644
--- a/src/main/kotlin/com/looker/droidify/utility/extension/Text.kt
+++ b/src/main/kotlin/com/looker/droidify/utility/extension/Text.kt
@@ -27,7 +27,7 @@ fun String?.trimAfter(char: Char, repeated: Int): String? {
             if (repeated == count) return it.substring(0, i)
         }
     }
-    return null
+    return this
 }
 
 fun String?.trimBefore(char: Char, repeated: Int): String? {