From af7997321c66752302e891720242d9a0793b4047 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Thu, 21 Apr 2022 22:36:58 +0530
Subject: [PATCH] Code Cleanup

---
 .../retromusic/dialogs/SavePlaylistDialog.kt  |  8 +++----
 .../retromusic/extensions/ViewExtensions.kt   |  2 +-
 .../fragments/about/AboutFragment.kt          | 23 ++++++++++---------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SavePlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SavePlaylistDialog.kt
index 2b9c136b2..157a1b221 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SavePlaylistDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SavePlaylistDialog.kt
@@ -61,10 +61,8 @@ class SavePlaylistDialog : DialogFragment() {
                             )
                             withContext(Dispatchers.Main) {
                                 showToast(
-                                    String.format(
-                                        requireContext().getString(R.string.saved_playlist_to),
-                                        data?.lastPathSegment
-                                    ),
+                                    requireContext().getString(R.string.saved_playlist_to,
+                                        data?.lastPathSegment),
                                     Toast.LENGTH_LONG
                                 )
                                 dismiss()
@@ -88,7 +86,7 @@ class SavePlaylistDialog : DialogFragment() {
                 }
                 withContext(Dispatchers.Main) {
                     showToast(
-                        String.format(getString(R.string.saved_playlist_to), file),
+                        getString(R.string.saved_playlist_to, file),
                         Toast.LENGTH_LONG
                     )
                     dismiss()
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt
index f4d94ea06..2c7dc75ed 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt
@@ -122,7 +122,7 @@ fun View.focusAndShowKeyboard() {
  */
 fun View.drawAboveSystemBars(onlyPortrait: Boolean = true) {
     if (PreferenceUtil.isFullScreenMode) return
-    if (onlyPortrait && RetroUtil.isLandscape()) return
+    if (onlyPortrait && RetroUtil.isLandscape) return
     applyInsetter {
         type(navigationBars = true) {
             margin()
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/about/AboutFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/about/AboutFragment.kt
index d6c439905..847f7b928 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/about/AboutFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/about/AboutFragment.kt
@@ -18,7 +18,6 @@ import android.content.pm.PackageManager
 import android.os.Bundle
 import android.view.View
 import androidx.core.app.ShareCompat
-import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -30,7 +29,7 @@ import code.name.monkey.retromusic.databinding.FragmentAboutBinding
 import code.name.monkey.retromusic.extensions.openUrl
 import code.name.monkey.retromusic.fragments.LibraryViewModel
 import code.name.monkey.retromusic.util.NavigationUtil
-import code.name.monkey.retromusic.util.RetroUtil
+import dev.chrisbanes.insetter.applyInsetter
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
 class AboutFragment : Fragment(R.layout.fragment_about), View.OnClickListener {
@@ -44,29 +43,31 @@ class AboutFragment : Fragment(R.layout.fragment_about), View.OnClickListener {
         binding.aboutContent.cardOther.version.setSummary(getAppVersion())
         setUpView()
         loadContributors()
-        // This is a workaround as CollapsingToolbarLayout consumes insets and
-        // insets are not passed to child views
-        // https://github.com/material-components/material-components-android/issues/1310
-        if (!RetroUtil.isLandscape()) {
-            binding.aboutContent.root.updatePadding(bottom = RetroUtil.getNavigationBarHeight())
+
+        binding.aboutContent.root.applyInsetter {
+            type(navigationBars = true) {
+                padding()
+            }
         }
     }
 
     private fun setUpView() {
         binding.aboutContent.cardRetroInfo.appGithub.setOnClickListener(this)
         binding.aboutContent.cardRetroInfo.faqLink.setOnClickListener(this)
-        binding.aboutContent.cardSocial.telegramLink.setOnClickListener(this)
         binding.aboutContent.cardRetroInfo.appRate.setOnClickListener(this)
         binding.aboutContent.cardRetroInfo.appTranslation.setOnClickListener(this)
         binding.aboutContent.cardRetroInfo.appShare.setOnClickListener(this)
         binding.aboutContent.cardRetroInfo.donateLink.setOnClickListener(this)
+        binding.aboutContent.cardRetroInfo.bugReportLink.setOnClickListener(this)
+
+        binding.aboutContent.cardSocial.telegramLink.setOnClickListener(this)
         binding.aboutContent.cardSocial.instagramLink.setOnClickListener(this)
         binding.aboutContent.cardSocial.twitterLink.setOnClickListener(this)
+        binding.aboutContent.cardSocial.pinterestLink.setOnClickListener(this)
+        binding.aboutContent.cardSocial.websiteLink.setOnClickListener(this)
+
         binding.aboutContent.cardOther.changelog.setOnClickListener(this)
         binding.aboutContent.cardOther.openSource.setOnClickListener(this)
-        binding.aboutContent.cardSocial.pinterestLink.setOnClickListener(this)
-        binding.aboutContent.cardRetroInfo.bugReportLink.setOnClickListener(this)
-        binding.aboutContent.cardSocial.websiteLink.setOnClickListener(this)
     }
 
     override fun onClick(view: View) {