From 833269fd0afe3a8c7fc6c32e68fb291982aaf43e Mon Sep 17 00:00:00 2001
From: Viktor De Pasquale <info@depasquale.wiki>
Date: Mon, 18 Nov 2019 17:49:03 +0100
Subject: [PATCH] Updated install from storage button to be more expressive

---
 .../magisk/model/entity/recycler/ModuleRvItem.kt  | 10 ++++++++--
 app/src/main/res/layout/item_module_download.xml  |  9 ++++-----
 app/src/main/res/values/attrs.xml                 |  2 ++
 app/src/main/res/values/styles_md2.xml            |  4 ++++
 app/src/main/res/values/styles_md2_impl.xml       | 15 +++++++++++++++
 5 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt
index a6c1e4037..87ee8eaf3 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt
@@ -84,6 +84,12 @@ class RepoRvItem(val item: Repo) : ComparableRvItem<RepoRvItem>() {
 object InstallModule : ComparableRvItem<InstallModule>() {
     override val layoutRes = R.layout.item_module_download
 
+    override fun onBindingBound(binding: ViewDataBinding) {
+        super.onBindingBound(binding)
+        val params = binding.root.layoutParams as? StaggeredGridLayoutManager.LayoutParams
+        params?.isFullSpan = true
+    }
+
     override fun contentSameAs(other: InstallModule) = this == other
     override fun itemSameAs(other: InstallModule) = this === other
 }
@@ -116,8 +122,8 @@ class SectionTitle(
 
     override fun onBindingBound(binding: ViewDataBinding) {
         super.onBindingBound(binding)
-        val params = binding.root.layoutParams as StaggeredGridLayoutManager.LayoutParams
-        params.isFullSpan = true
+        val params = binding.root.layoutParams as? StaggeredGridLayoutManager.LayoutParams
+        params?.isFullSpan = true
     }
 
     override fun itemSameAs(other: SectionTitle): Boolean = this === other
diff --git a/app/src/main/res/layout/item_module_download.xml b/app/src/main/res/layout/item_module_download.xml
index 1bfb357f9..5a4e8e825 100644
--- a/app/src/main/res/layout/item_module_download.xml
+++ b/app/src/main/res/layout/item_module_download.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout 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">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
 
@@ -16,15 +15,15 @@
     </data>
 
     <com.google.android.material.button.MaterialButton
-        style="?styleButtonTextSecondary"
+        style="?styleButtonOutlined"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:onClick="@{() -> viewModel.installPressed()}"
         android:text="@string/module_action_install_external"
         android:textAllCaps="false"
         android:textSize="12sp"
+        app:cornerRadius="@dimen/r1"
         app:icon="@drawable/ic_module_storage_md2"
-        app:iconPadding="@dimen/l_50"
-        tools:layout_width="150dp" />
+        app:iconPadding="@dimen/l_50" />
 
 </layout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index f43a01a0f..07957fced 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -24,6 +24,8 @@
     <!--Button-->
     <attr name="styleButtonDefault" format="reference" />
     <attr name="styleButtonDefaultOnPrimary" format="reference" />
+    <attr name="styleButtonOutlined" format="reference" />
+    <attr name="styleButtonOutlinedOnPrimary" format="reference" />
     <attr name="styleButtonFlat" format="reference" />
     <attr name="styleButtonFlatOnPrimary" format="reference" />
     <attr name="styleButtonText" format="reference" />
diff --git a/app/src/main/res/values/styles_md2.xml b/app/src/main/res/values/styles_md2.xml
index 51d1ea35f..30a2be50c 100644
--- a/app/src/main/res/values/styles_md2.xml
+++ b/app/src/main/res/values/styles_md2.xml
@@ -36,6 +36,10 @@
 
         <item name="styleButtonDefault">@style/WidgetFoundation.Button</item>
         <item name="styleButtonDefaultOnPrimary">@style/WidgetFoundation.Button.OnPrimary</item>
+        <item name="styleButtonOutlined">@style/WidgetFoundation.Button.Outlined</item>
+        <item name="styleButtonOutlinedOnPrimary">
+            @style/WidgetFoundation.Button.Outlined.OnPrimary
+        </item>
         <item name="styleButtonFlat">@style/WidgetFoundation.Button.Flat</item>
         <item name="styleButtonFlatOnPrimary">@style/WidgetFoundation.Button.Flat.OnPrimary</item>
         <item name="styleButtonText">@style/WidgetFoundation.Button.Text</item>
diff --git a/app/src/main/res/values/styles_md2_impl.xml b/app/src/main/res/values/styles_md2_impl.xml
index 044834786..b5034dc4a 100644
--- a/app/src/main/res/values/styles_md2_impl.xml
+++ b/app/src/main/res/values/styles_md2_impl.xml
@@ -66,6 +66,21 @@ variant. Make sure to use style referenced by attribute defined it attrs.xml.
         <item name="iconTint">?colorPrimary</item>
     </style>
 
+    <style name="WidgetFoundation.Button.Outlined" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="android:textStyle">bold</item>
+        <item name="iconGravity">textStart</item>
+        <item name="iconPadding">@dimen/l1</item>
+        <item name="strokeColor">?colorPrimary</item>
+        <item name="android:textColor">?colorPrimary</item>
+    </style>
+
+    <style name="WidgetFoundation.Button.Outlined.OnPrimary">
+        <item name="strokeColor">?colorOnPrimary</item>
+        <item name="rippleColor">?colorOnPrimary</item>
+        <item name="android:textColor">?colorOnPrimary</item>
+        <item name="iconTint">?colorOnPrimary</item>
+    </style>
+
     <style name="WidgetFoundation.Button.Flat" parent="Widget.MaterialComponents.Button.UnelevatedButton">
         <item name="android:textStyle">bold</item>
         <item name="iconGravity">textStart</item>