Merge pull request #1621 from AllanWang/intro-ui

Intro ui updates

3 files changed, 17 insertions, 16 deletions

diff --git a/app/src/main/res/layout/activity_intro.xml b/app/src/main/res/layout/activity_intro.xml
index e61a618d..5ea43adf 100644
--- a/app/src/main/res/layout/activity_intro.xml
+++ b/app/src/main/res/layout/activity_intro.xml
@@ -6,7 +6,7 @@
     android:fitsSystemWindows="true">
 
     <ca.allanwang.kau.ui.views.RippleCanvas
-        android:id="@+id/intro_ripple"
+        android:id="@+id/ripple"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -15,49 +15,49 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/intro_bar_guide"
+        android:id="@+id/bar_guide"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         app:layout_constraintGuide_end="@dimen/intro_bar_height" />
 
     <androidx.viewpager.widget.ViewPager
-        android:id="@+id/intro_viewpager"
+        android:id="@+id/viewpager"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/intro_bar_guide"
+        app:layout_constraintBottom_toTopOf="@id/bar_guide"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <Button
-        android:id="@+id/intro_skip"
+    <TextView
+        android:id="@+id/skip"
         style="@style/IntroBarButton"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:text="@string/skip"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/intro_bar_guide" />
+        app:layout_constraintTop_toBottomOf="@id/bar_guide" />
 
     <ca.allanwang.kau.ui.widgets.InkPageIndicator
-        android:id="@+id/intro_indicator"
+        android:id="@+id/indicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/intro_bar_guide"
+        app:layout_constraintTop_toBottomOf="@id/bar_guide"
         app:layout_constraintVertical_bias="0.5" />
 
     <ImageButton
-        android:id="@+id/intro_next"
+        android:id="@+id/next"
         style="@style/IntroBarButton"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/intro_bar_guide" />
+        app:layout_constraintTop_toBottomOf="@id/bar_guide" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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>