Convert the empty state too

Author: rock3r

app/src/main/java/net/squanchy/favorites/view/FavoritesSignedInEmptyLayout.kt

@@ -4,31 +4,22 @@ import android.content.Context
 import android.os.Build
 import android.support.annotation.DrawableRes
 import android.support.annotation.RequiresApi
+import android.support.constraint.ConstraintLayout
 import android.support.design.widget.Snackbar
-import android.text.Html
 import android.util.AttributeSet
 import android.view.View
-import android.widget.LinearLayout
 import kotlinx.android.synthetic.main.merge_no_favorites_view.view.*
 import net.squanchy.R
+import net.squanchy.support.text.parseHtml
 
 class FavoritesSignedInEmptyLayout @JvmOverloads constructor(
     context: Context?,
     attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0,
-    defStyleRes: Int = 0
-) : LinearLayout(context, attrs, defStyleAttr, defStyleRes), FavoritesSignedInEmptyLayoutView {
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr), FavoritesSignedInEmptyLayoutView {
 
     private var counter = 0
 
-    init {
-        super.setOrientation(VERTICAL)
-    }
-
-    override fun setOrientation(orientation: Int): Nothing {
-        throw UnsupportedOperationException("Changing orientation is not supported for ${FavoritesSignedInEmptyLayout::class.java.simpleName}")
-    }
-
     override fun onFinishInflate() {
         super.onFinishInflate()
 
@@ -41,9 +32,10 @@ class FavoritesSignedInEmptyLayout @JvmOverloads constructor(
 
     override fun setButtonImage(@DrawableRes resId: Int) = favoriteFab.setImageResource(resId)
 
-    //TODO do we still need this? Also why is it requiring Nougat?
     @RequiresApi(Build.VERSION_CODES.N)
-    override fun showAchievement(message: String) = Snackbar.make(this, readAsHtml(message), Snackbar.LENGTH_LONG).show()
+    override fun showAchievement(message: String) {
+        Snackbar.make(this, parseHtml(message), Snackbar.LENGTH_LONG).show()
+    }
 
     private val favoriteButtonClickListener = View.OnClickListener {
         presentButtonIcon(counter, this, ::favoritesFilledIconId, ::favoritesEmptyIconId)
@@ -57,7 +49,4 @@ class FavoritesSignedInEmptyLayout @JvmOverloads constructor(
     private fun initialAchieventMessage() = resources.getString(R.string.favorites_achievement_fast_learner)
 
     private fun perseveranceAchievementMessage() = resources.getString(R.string.favorites_achievement_persevering)
-
-    @RequiresApi(Build.VERSION_CODES.N)
-    private fun readAsHtml(message: String): CharSequence = Html.fromHtml(message, Html.FROM_HTML_MODE_LEGACY)
 }

app/src/main/res/layout/merge_no_favorites_view.xml

@@ -1,27 +1,35 @@
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<net.squanchy.favorites.view.FavoritesSignedInEmptyLayout 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"
+  android:id="@+id/emptyViewSignedIn"
   android:layout_width="wrap_content"
   android:layout_height="wrap_content"
-  android:layout_gravity="center"
-  android:orientation="vertical"
-  tools:context="net.squanchy.home.HomeActivity"
+  android:visibility="gone"
+  tools:visibility="visible"
   tools:showIn="@layout/view_page_favorites">
 
   <android.support.design.widget.FloatingActionButton
     android:id="@+id/favoriteFab"
     style="@style/EventDetails.Fab"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="center_horizontal"
-    android:layout_marginBottom="@dimen/favorites_empty_fab_margin_bottom" />
+    android:layout_marginBottom="@dimen/favorites_empty_fab_margin_bottom"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintBottom_toTopOf="@+id/text"
+    app:layout_constraintVertical_chainStyle="packed" />
 
   <TextView
     android:id="@+id/text"
     style="@style/Favorite.Empty.Blurb"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="center_horizontal"
     android:foreground="@drawable/primary_touch_feedback"
-    android:text="@string/favorites_empty_state_signed_in_blurb" />
+    android:text="@string/favorites_empty_state_signed_in_blurb"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toBottomOf="@id/favoriteFab"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintBottom_toBottomOf="parent" />
 
-</merge>
+</net.squanchy.favorites.view.FavoritesSignedInEmptyLayout>

app/src/main/res/layout/view_page_favorites.xml

@@ -25,25 +25,15 @@
 
   </android.support.design.widget.AppBarLayout>
 
-  <net.squanchy.favorites.view.FavoritesSignedInEmptyLayout
-    android:id="@+id/emptyViewSignedIn"
-    android:layout_width="wrap_content"
+  <include layout="@layout/merge_no_favorites_view"
+    android:layout_width="@dimen/match_constraint"
     android:layout_height="wrap_content"
-    android:layout_gravity="center"
     android:layout_marginStart="@dimen/favorites_empty_margin_horizontal"
     android:layout_marginEnd="@dimen/favorites_empty_margin_horizontal"
-    android:visibility="gone"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
     app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent">
-
-    <include
-      layout="@layout/merge_no_favorites_view"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content" />
-
-  </net.squanchy.favorites.view.FavoritesSignedInEmptyLayout>
+    app:layout_constraintStart_toStartOf="parent" />
 
   <android.support.constraint.Group
     android:id="@+id/emptyViewSignedOut"
@@ -101,7 +91,7 @@
     app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintBottom_toBottomOf="parent"
-    tools:visibility="gone"/>
+    tools:visibility="gone" />
 
   <net.squanchy.favorites.view.FavoritesListView
     android:id="@+id/favoritesListView"
@@ -112,6 +102,6 @@
     app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintBottom_toBottomOf="parent"
-    tools:visibility="visible"/>
+    tools:visibility="visible" />
 
 </net.squanchy.favorites.FavoritesPageView>