Merge pull request #39 from Block-Equity/upgradeSupport28

Upgrade targetSDK to API 28 and support libraries to 28.0.0
Block-Equity · Nov 5, 2018 · 88c80f6 · 88c80f6
2 parents 8ab966e + 52e30fe
commit 88c80f6
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 37 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,11 +4,11 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
         applicationId "blockeq.com.stellarwallet"
         minSdkVersion 19
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 14
         versionName "1.0.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

diff --git a/app/src/main/java/blockeq/com/stellarwallet/activities/WalletActivity.kt b/app/src/main/java/blockeq/com/stellarwallet/activities/WalletActivity.kt
@@ -7,7 +7,6 @@ import blockeq.com.stellarwallet.R
 import blockeq.com.stellarwallet.fragments.SettingsFragment
 import blockeq.com.stellarwallet.fragments.TradingFragment
 import blockeq.com.stellarwallet.fragments.WalletFragment
-import blockeq.com.stellarwallet.helpers.disableShiftMode
 
 class WalletActivity : BaseActivity() {
 
@@ -53,7 +52,6 @@ class WalletActivity : BaseActivity() {
 
     private fun setupNav() {
         val bottomNavigation: BottomNavigationView = findViewById(R.id.navigationView)
-        bottomNavigation.disableShiftMode()
         bottomNavigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener)
         bottomNavigation.selectedItemId = R.id.nav_wallet
     }

diff --git a/app/src/main/java/blockeq/com/stellarwallet/helpers/BottomNavigationShiftMode.kt b/app/src/main/java/blockeq/com/stellarwallet/helpers/BottomNavigationShiftMode.kt
diff --git a/app/src/main/java/blockeq/com/stellarwallet/reusables/views/CustomSelector.kt b/app/src/main/java/blockeq/com/stellarwallet/reusables/views/CustomSelector.kt
@@ -37,7 +37,7 @@ class CustomSelector @JvmOverloads constructor(
             val typedArray = context.obtainStyledAttributes(it,
                     R.styleable.CustomSelector, 0, 0)
             setHint(typedArray.getString(R.styleable.CustomSelector_hint))
-            setColor(typedArray.getColor(R.styleable.CustomSelector_strokeColor,
+            setColor(typedArray.getColor(R.styleable.CustomSelector_customStrokeColor,
                     ContextCompat.getColor(context, R.color.alto)))
             setInputType(typedArray.getInt(R.styleable.CustomSelector_inputType, 0))
         }

diff --git a/app/src/main/res/layout/activity_wallet.xml b/app/src/main/res/layout/activity_wallet.xml
@@ -29,6 +29,7 @@
         app:itemBackground="@color/bottomNavigationColor"
         app:itemIconTint="@color/color_nav_icons"
         app:itemTextColor="@color/color_nav_icons"
-        app:menu="@menu/navigation"/>
+        app:menu="@menu/navigation"
+        app:labelVisibilityMode="labeled" />
 
 </android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
@@ -3,7 +3,7 @@
     <declare-styleable name="CustomSelector">
         <attr name="label" format="string" />
         <attr name="hint" format="string" />
-        <attr name="strokeColor" format="reference" />
+        <attr name="customStrokeColor" format="reference" />
         <attr name="focusColor" format="reference" />
         <attr name="cetTextColor" format="reference" />
         <attr name="hintColor" format="reference" />

diff --git a/build.gradle b/build.gradle
@@ -28,8 +28,8 @@ task clean(type: Delete) {
 }
 
 ext {
-    supportLibraryVersion = '27.1.1'
-    constrainLayoutVersion = '1.1.2'
+    supportLibraryVersion = '28.0.0'
+    constrainLayoutVersion = '1.1.3'
     novaCryptoVersion = '0.1.9'
     junitVersion = '4.12'
     testRunnerVersion = '1.0.2'