Merge pull request #20 from amardeshbd/feature/2_grid_view_for_layout_selection_refinement

Feature/2 grid view for layout selection refinement

Author: hossain-khan

.idea/copyright/apache_license.xml

@@ -18,7 +18,7 @@ A demo application for Android `ConstraintLayout` with various usage with sample
   * [ ] Horizontal Axis: left, right, start and end sides
   * [ ] Vertical Axis: top, bottom sides and text baseline
 - [ ] Margins
-- [ ] Centering positioning and bias
+- [x] Centering positioning and bias
 - [ ] Circular positioning _(Added in 1.1)_
 - [ ] Visibility behavior
 - [ ] Dimension constraints
@@ -45,3 +45,8 @@ These are the **my** objectives for this demo application.
 * Learn and use the new architecture components in the sample app
 * Learn and use proper architecture for the app - likely MVVM
 * Document everything well so that future external contribution is easier
+
+## Preview
+Here is a snapshot of current progress _(This will be updated from time to time)_.  
+
+![Browse Layout Variances](https://user-images.githubusercontent.com/99822/39676220-f20ef5c6-5134-11e8-9430-08f90b5fe5fb.png) ![Show Layout Screen](https://user-images.githubusercontent.com/99822/39676265-a0bb1f28-5135-11e8-8c34-014cef844e97.png)

.idea/copyright/profiles_settings.xml

@@ -16,11 +16,11 @@
 
 package com.hossainkhan.android.demo.browse
 
-import android.content.Context
 import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import android.widget.TextView
 import com.hossainkhan.android.demo.R
 import com.hossainkhan.android.demo.data.LayoutInformation
@@ -36,6 +36,7 @@ class LayoutBrowseAdapter(
     class ViewHolder(itemViewRoot: View,
                      private val onClickListener: (Int) -> Unit) : RecyclerView.ViewHolder(itemViewRoot) {
         val itemName = itemViewRoot.findViewById<TextView>(R.id.layout_preview_name)!!
+        val itemThumb = itemViewRoot.findViewById<ImageView>(R.id.imageView)
 
         init {
             itemViewRoot.setOnClickListener {
@@ -60,6 +61,7 @@ class LayoutBrowseAdapter(
         // - get element from your dataset at this position
         // - replace the contents of the view with that element
         holder.itemName.text = data[position].title
+        holder.itemThumb.setImageResource(data[position].thumbnailResourceId)
     }
 
     // Return the size of your dataset (invoked by the layout manager)

README.md

@@ -18,6 +18,7 @@ package com.hossainkhan.android.demo.browse
 
 import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
+import android.support.v7.widget.GridLayoutManager
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.view.View
@@ -44,7 +45,7 @@ class MainActivity : AppCompatActivity() {
         Timber.d("Got data: ${appDataStore.isFirstTime()}")
         appDataStore.updateFirstTimeUser(false)
 
-        viewManager = LinearLayoutManager(this)
+        viewManager = GridLayoutManager(this, resources.getInteger(R.integer.grid_column_count))
         viewAdapter = LayoutBrowseAdapter(
                 data = appDataStore.layoutStore.supportedLayoutInfos,
                 itemSelectedListener = this::onLayoutItemSelected)

app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseAdapter.kt

@@ -38,4 +38,18 @@ class AppDataStore @Inject constructor(
         preferences.edit().putBoolean(PREF_KEY_IS_FIRST_TIME_USER, isFirstTime).apply()
     }
 
+    /**
+     * Checks if layout information should be shown to user, and updates the flag if it should be shown.
+     *
+     * @return `true`, if it's first time being checked, else `false`
+     */
+    fun shouldshowLayoutInformation(layoutId: Int): Boolean {
+        val layoutPreferenceKey = layoutStore.getLayoutUrl(layoutId)
+        val shouldShow = preferences.getBoolean(layoutPreferenceKey, true)
+        if (shouldShow) {
+            preferences.edit().putBoolean(layoutPreferenceKey, false).apply()
+        }
+        return shouldShow
+    }
+
 }

app/src/main/java/com/hossainkhan/android/demo/browse/MainActivity.kt

@@ -28,11 +28,13 @@ class LayoutDataStore @Inject constructor(
         private val resources: Resources) {
     val supportedLayoutInfos = listOf(
             LayoutInformation(
-                    layoutResourceId = R.layout.activity_positioning_top_left,
+                    layoutResourceId = R.layout.preview_positioning_top_left,
+                    thumbnailResourceId = R.drawable.ic_positioning_top_left,
                     title = "Positioning: Top Left",
                     description = "Top left using constraints."),
             LayoutInformation(
-                    layoutResourceId = R.layout.activity_positioning_centered,
+                    layoutResourceId = R.layout.preview_positioning_centered,
+                    thumbnailResourceId = R.drawable.ic_positioning_center,
                     title = "Positioning: Centered",
                     description = "Centered view using constraints on top-bottom and left-right.")
     )
@@ -52,7 +54,7 @@ class LayoutDataStore @Inject constructor(
      */
     fun getLayoutUrl(@LayoutRes layoutResourceId: Int): String {
         // Containes package name and layout name
-        // com.hossainkhan.android.demo:layout/activity_positioning_top_left
+        // com.hossainkhan.android.demo:layout/preview_positioning_top_left
         val resourceName = resources.getResourceName(layoutResourceId)
 
         if(!resourceName.contains("layout")) {

app/src/main/java/com/hossainkhan/android/demo/data/AppDataStore.kt

@@ -16,6 +16,7 @@
 
 package com.hossainkhan.android.demo.data
 
+import android.support.annotation.DrawableRes
 import android.support.annotation.LayoutRes
 
 /**
@@ -24,6 +25,8 @@ import android.support.annotation.LayoutRes
 data class LayoutInformation(
         @LayoutRes
         val layoutResourceId: Int,
+        @DrawableRes
+        val thumbnailResourceId: Int,
         val title: CharSequence,
         val description: CharSequence
 )

app/src/main/java/com/hossainkhan/android/demo/data/LayoutDataStore.kt

@@ -81,7 +81,7 @@ class LayoutPositioningDemoActivity : AppCompatActivity() {
     /**
      * Loads layout information and previews in a snackbar.
      */
-    private fun showLayoutInfo(layoutInformation: LayoutInformation) {
+    private fun showLayoutInfo(layoutInformation: LayoutInformation, fromUser: Boolean = false) {
         if (flashbar == null) {
             flashbar = Flashbar.Builder(this)
                     .gravity(Flashbar.Gravity.BOTTOM)
@@ -108,8 +108,13 @@ class LayoutPositioningDemoActivity : AppCompatActivity() {
                     .build()
         }
 
-        if (flashbar?.isShowing() == false) {
-            flashbar?.show()
+        Timber.d("Flash bar showing: %s", flashbar?.isShown())
+        if (flashbar?.isShown() == false) {
+            if (fromUser || appDataStore.shouldshowLayoutInformation(layoutInformation.layoutResourceId)) {
+                flashbar?.show()
+            }
+        } else {
+            flashbar?.dismiss()
         }
     }
 
@@ -138,7 +143,7 @@ class LayoutPositioningDemoActivity : AppCompatActivity() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             R.id.show_layout_info_menu_item -> {
-                showLayoutInfo(layoutInformation)
+                showLayoutInfo(layoutInformation, true)
                 true
             }
             else -> super.onOptionsItemSelected(item)