From 8c87c5037ba5dea5759f41518e33fbeb33b76ad3 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 19 Jan 2020 21:00:37 -0800
Subject: Use textview instead for flat background

---
 .../main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt | 3 ++-
 app/src/main/res/layout/activity_intro.xml                        | 2 +-
 app/src/main/res/layout/intro_theme.xml                           | 8 ++++----
 app/src/main/res/values/styles.xml                                | 3 ++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt
index 77a58cf2..464f2385 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt
@@ -25,6 +25,7 @@ import android.view.WindowManager
 import android.widget.Button
 import android.widget.ImageButton
 import android.widget.ImageView
+import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
@@ -72,7 +73,7 @@ class IntroActivity : KauBaseActivity(), ViewPager.PageTransformer, ViewPager.On
     val viewpager: ViewPager by bindView(R.id.intro_viewpager)
     lateinit var adapter: IntroPageAdapter
     val indicator: InkPageIndicator by bindView(R.id.intro_indicator)
-    val skip: Button by bindView(R.id.intro_skip)
+    val skip: TextView by bindView(R.id.intro_skip)
     val next: ImageButton by bindView(R.id.intro_next)
     private var barHasNext = true
 
diff --git a/app/src/main/res/layout/activity_intro.xml b/app/src/main/res/layout/activity_intro.xml
index e61a618d..3f9dfa1a 100644
--- a/app/src/main/res/layout/activity_intro.xml
+++ b/app/src/main/res/layout/activity_intro.xml
@@ -30,7 +30,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <Button
+    <TextView
         android:id="@+id/intro_skip"
         style="@style/IntroBarButton"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/intro_theme.xml b/app/src/main/res/layout/intro_theme.xml
index cd0538dd..0a9d5f63 100644
--- a/app/src/main/res/layout/intro_theme.xml
+++ b/app/src/main/res/layout/intro_theme.xml
@@ -18,7 +18,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <Button
+    <TextView
         android:id="@+id/intro_theme_light"
         style="@style/IntroButton"
         android:layout_width="wrap_content"
@@ -32,7 +32,7 @@
         app:layout_constraintVertical_bias="0.33"
         tools:layout_editor_absoluteX="112dp" />
 
-    <Button
+    <TextView
         android:id="@+id/intro_theme_dark"
         style="@style/IntroButton"
         android:layout_width="wrap_content"
@@ -46,7 +46,7 @@
         app:layout_constraintVertical_bias="0.33"
         tools:layout_editor_absoluteX="112dp" />
 
-    <Button
+    <TextView
         android:id="@+id/intro_theme_amoled"
         style="@style/IntroButton"
         android:layout_width="wrap_content"
@@ -60,7 +60,7 @@
         app:layout_constraintVertical_bias="0.66"
         tools:layout_editor_absoluteX="112dp" />
 
-    <Button
+    <TextView
         android:id="@+id/intro_theme_glass"
         style="@style/IntroButton"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4775a892..b94f754f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -74,6 +74,7 @@
     <style name="IntroBarButton" parent="Widget.AppCompat.Button.Borderless">
         <item name="android:elevation">0dp</item>
         <item name="android:minWidth">100dp</item>
+        <item name="android:background">?selectableItemBackground</item>
         <item name="android:layout_marginStart">@dimen/kau_padding_small</item>
         <item name="android:layout_marginEnd">@dimen/kau_padding_small</item>
     </style>
@@ -94,7 +95,7 @@
 
     <style name="IntroButton" parent="TextAppearance.AppCompat.Button">
         <item name="android:elevation">0dp</item>
-        <item name="android:background">?android:selectableItemBackgroundBorderless</item>
+        <item name="android:background">?selectableItemBackgroundBorderless</item>
         <item name="android:padding">@dimen/kau_padding_large</item>
     </style>
 
-- 
cgit v1.2.3