Merge branch 'release/v1.2.1'

edipo2s · edipo2s · commit 1873049469de · 2017-06-13T19:08:13.000-03:00
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -14,7 +14,7 @@ android {
     defaultConfig {
         applicationId "com.ediposouza.teslesgendstracker"
         minSdkVersion prepareToRelease ? 16 : 21
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode appVersionCode
         versionName appVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -80,7 +80,7 @@ ext {
     okIOVersion = "1.12.+"
     okHttpVersion = "3.7.+"
     playServicesVersion = "10.2.6"
-    supportLibraryVersion = "25.3.1"
+    supportLibraryVersion = "25.4.0"
     threetenabpVersion = "1.0.+"
 
     testMockitoVersion = "2.7.+"
diff --git a/app/src/main/kotlin/com/ediposouza/teslesgendstracker/ui/basics/BasicsFragment.kt b/app/src/main/kotlin/com/ediposouza/teslesgendstracker/ui/basics/BasicsFragment.kt
@@ -53,7 +53,7 @@ class BasicsFragment : BaseFragment() {
     override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setHasOptionsMenu(true)
-        activity.dash_navigation_view.setCheckedItem(R.id.menu_wabbatrack)
+        activity.dash_navigation_view.setCheckedItem(R.id.menu_basics)
         basics_view_pager.adapter = BasicsPageAdapter(context, childFragmentManager)
         basics_view_pager.addOnPageChangeListener(pageChange)
     }
diff --git a/app/src/main/kotlin/com/ediposouza/teslesgendstracker/ui/decks/tabs/DecksPublicFragment.kt b/app/src/main/kotlin/com/ediposouza/teslesgendstracker/ui/decks/tabs/DecksPublicFragment.kt
@@ -36,7 +36,7 @@ import java.text.NumberFormat
 open class DecksPublicFragment : BaseFragment() {
 
     val ADS_EACH_ITEMS = 10 //after 10 lines
-    val DECK_PAGE_SIZE = 8
+    val DECK_PAGE_SIZE = 20
 
     protected var searchFilter: String? = null
     protected var currentClasses = DeckClass.values()
diff --git a/app/src/main/kotlin/com/ediposouza/teslesgendstracker/util/AppExtensions.kt b/app/src/main/kotlin/com/ediposouza/teslesgendstracker/util/AppExtensions.kt
@@ -8,6 +8,7 @@ import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import android.os.Bundle
+import android.support.annotation.DrawableRes
 import android.support.annotation.LayoutRes
 import android.support.design.widget.BottomSheetBehavior
 import android.support.v4.app.Fragment
@@ -175,12 +176,12 @@ fun ImageView.loadFromCard(card: Card, transform: ((Bitmap) -> Bitmap)? = null,
         if (name.isEmpty() || shortName.isEmpty()) {
             this@loadFromCard.setImageResource(R.drawable.card_back)
         } else {
-            this@loadFromCard.loadFromCard(set.toString(), attr.name, shortName, transform, onNotFound)
+            this@loadFromCard.loadFromCard(set.toString(), attr.name, shortName, null, transform, onNotFound)
         }
     }
 }
 
-fun ImageView.loadFromCard(cardSet: String, cardAttr: String, cardShortName: String,
+fun ImageView.loadFromCard(cardSet: String, cardAttr: String, cardShortName: String, @DrawableRes placeholder: Int? = null,
                            transform: ((Bitmap) -> Bitmap)? = null, onNotFound: (() -> Unit)? = null) {
     if (cardShortName.isEmpty()) {
         setImageResource(R.drawable.card_back)
@@ -190,16 +191,18 @@ fun ImageView.loadFromCard(cardSet: String, cardAttr: String, cardShortName: Str
     val attrName = cardAttr.toLowerCase().capitalize()
     val imagePath = "${Card.CARD_PATH}/$setName/$attrName/$cardShortName.webp"
     Timber.d(imagePath)
-    loadLocalCardImage(imagePath, transform)
+    loadLocalCardImage(imagePath, placeholder, transform)
     val remotePath = imagePath.takeIf { cardShortName.contains("_") } ?: "v${context.getCurrentVersion()}/$imagePath"
     Timber.d("Local: $imagePath - Remote: $remotePath")
-    loadRemoteCardImage(remotePath, transform, imagePath, onNotFound)
+    loadRemoteCardImage(remotePath, placeholder, transform, imagePath, onNotFound)
 }
 
-private fun ImageView.loadLocalCardImage(imagePath: String, transform: ((Bitmap) -> Bitmap)?) {
-    Glide.with(context)
-            .load("file:///android_asset/$imagePath")
-            .crossFade()
+private fun ImageView.loadLocalCardImage(imagePath: String, @DrawableRes placeholder: Int? = null, transform: ((Bitmap) -> Bitmap)?) {
+    val request = Glide.with(context).load("file:///android_asset/$imagePath")
+    placeholder?.let {
+        request.placeholder(it)
+    }
+    request.crossFade()
             .bitmapTransform(object : Transformation<Bitmap> {
                 override fun transform(resource: Resource<Bitmap>, outWidth: Int, outHeight: Int): Resource<Bitmap> {
                     return transform?.let {
@@ -214,12 +217,15 @@ private fun ImageView.loadLocalCardImage(imagePath: String, transform: ((Bitmap)
             .into(this)
 }
 
-private fun ImageView.loadRemoteCardImage(remotePath: String, transform: ((Bitmap) -> Bitmap)?, imagePath: String, onNotFound: (() -> Unit)?) {
-    FirebaseStorage.getInstance().reference.child(remotePath).metadata.addOnSuccessListener { metadata ->
+private fun ImageView.loadRemoteCardImage(remotePath: String, @DrawableRes placeholder: Int? = null,
+                                          transform: ((Bitmap) -> Bitmap)?, imagePath: String, onNotFound: (() -> Unit)?) {
+    FirebaseStorage.getInstance().reference.child(remotePath).downloadUrl.addOnSuccessListener { url ->
         try {
-            Glide.with(context)
-                    .load(metadata.downloadUrl)
-                    .crossFade()
+            val request = Glide.with(context).load(url)
+            placeholder?.let {
+                request.placeholder(it)
+            }
+            request.crossFade()
                     .bitmapTransform(object : Transformation<Bitmap> {
                         override fun transform(resource: Resource<Bitmap>, outWidth: Int, outHeight: Int): Resource<Bitmap> {
                             return transform?.let {
@@ -242,9 +248,9 @@ private fun ImageView.loadRemoteCardImage(remotePath: String, transform: ((Bitma
 
 fun ImageView.loadFromPatch(patch: PatchChange, patchUuid: String, newImage: Boolean) {
     with(patch) {
-        loadFromCard(set.capitalize(), attr.capitalize(), shortName + "_" + patchUuid) {
+        loadFromCard(set.capitalize(), attr.capitalize(), shortName + "_" + patchUuid, R.drawable.card_back) {
             if (newImage) {
-                loadFromCard(set.capitalize(), attr.capitalize(), shortName)
+                loadFromCard(set.capitalize(), attr.capitalize(), shortName, R.drawable.card_back)
             }
         }
     }
diff --git a/app/src/main/res/layout/itemlist_basics_levelup_evolve.xml b/app/src/main/res/layout/itemlist_basics_levelup_evolve.xml
@@ -30,10 +30,10 @@
 
     <ImageView
         android:id="@+id/basics_levelup_source"
-        android:layout_width="wrap_content"
+        android:layout_width="@dimen/card_width_nicro"
         android:layout_height="@dimen/card_height_micro"
         android:layout_marginBottom="16dp"
-        android:layout_marginStart="32dp"
+        android:layout_marginStart="40dp"
         android:layout_marginTop="16dp"
         android:src="@drawable/card_back"
         app:layout_constraintBottom_toBottomOf="@+id/basics_levelup_target2"
@@ -58,7 +58,7 @@
 
     <ImageView
         android:id="@+id/basics_levelup_target1"
-        android:layout_width="wrap_content"
+        android:layout_width="@dimen/card_width_nicro"
         android:layout_height="@dimen/card_height_micro"
         android:layout_marginTop="16dp"
         android:src="@drawable/card_back"
@@ -69,7 +69,7 @@
 
     <ImageView
         android:id="@+id/basics_levelup_target2"
-        android:layout_width="wrap_content"
+        android:layout_width="@dimen/card_width_nicro"
         android:layout_height="@dimen/card_height_micro"
         android:layout_marginEnd="0dp"
         android:src="@drawable/card_back"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -23,6 +23,7 @@
     <!-- Cards List -->
     <dimen name="card_height">200dp</dimen>
     <dimen name="card_height_micro">160dp</dimen>
+    <dimen name="card_width_nicro">110dp</dimen>
     <dimen name="card_height_nano">130dp</dimen>
     <dimen name="card_width_nano">90dp</dimen>
     <dimen name="card_qtd_height">16dp</dimen>
diff --git a/build.gradle b/build.gradle
@@ -2,8 +2,8 @@
 
 buildscript {
     ext {
-        appVersionName = "1.2.0"
-        appVersionCode = 32
+        appVersionName = "1.2.1"
+        appVersionCode = 34
         prepareToRelease = false
 
         kotlin_version = "1.1.2-4"

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ class BasicsFragment : BaseFragment() {`
`53`	`53`	`override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {`
`54`	`54`	`super.onViewCreated(view, savedInstanceState)`
`55`	`55`	`setHasOptionsMenu(true)`
`56`		`- activity.dash_navigation_view.setCheckedItem(R.id.menu_wabbatrack)`
	`56`	`+ activity.dash_navigation_view.setCheckedItem(R.id.menu_basics)`
`57`	`57`	`basics_view_pager.adapter = BasicsPageAdapter(context, childFragmentManager)`
`58`	`58`	`basics_view_pager.addOnPageChangeListener(pageChange)`
`59`	`59`	`}`