Merge branch 'jensck/3-point-0-point-2'

app/CHANGELOG.md

@@ -1,3 +1,11 @@
+3.0.2
+======
+- Crash fixes
+- Remove some unnecessary resources, cutting down APK size
+- Remove textviewrichdrawable library now that jetpack supports XML compound drawables
+- Make the login screen the default if anyone has ever been logged in before
+- Enable x86_64 builds
+
 3.0.1
 ======
 - Properly ellipsize long device names

app/build.gradle

@@ -30,13 +30,13 @@ android {
         minSdkVersion 21
         targetSdkVersion 28
         // scheme for these version numbers: EPOCH MAJOR MINOR PATCH BUILD
-        versionCode 1_03_00_01_04
-        versionName  "3.0.1"
+        versionCode 1_03_00_02_00
+        versionName  "3.0.2"
 
         vectorDrawables.useSupportLibrary = false  // no need for this since we're min SDK=21
 
         ndk {
-            abiFilters 'armeabi-v7a', 'arm64-v8a' //, "x86_64"
+            abiFilters 'armeabi-v7a', 'arm64-v8a', "x86_64"
         }
     }
 
@@ -94,9 +94,6 @@ dependencies {
     // Support lib doesn't do the "speed dial" pattern off of FABs though, so that would have to be
     // implemented by hand (and as such, might not be worth it.)
     implementation 'com.getbase:floatingactionbutton:1.10.1'
-    implementation('com.f2prateek.bundler:bundler:1.1.2') {
-        exclude module: 'support-v4'
-    }
 
     releaseImplementation 'com.google.firebase:firebase-core:17.2.0'
     releaseImplementation 'com.google.firebase:firebase-analytics:17.2.0'
@@ -120,7 +117,7 @@ dependencies {
     implementation 'uk.co.chrisjenx:calligraphy:2.3.0'
 
     implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     implementation 'androidx.lifecycle:lifecycle-common-java8:2.1.0'

app/src/main/java/io/particle/android/sdk/tinker/TinkerFragment.kt

@@ -99,10 +99,7 @@ class TinkerFragment : Fragment(), OnClickListener {
 
         if (TinkerPrefs.getInstance(requireActivity()).isFirstVisit) {
             instructions_container.isVisible = true
-            fragmentManager?.commit {
-                add(R.id.instructions_container, InstructionsFragment())
-                addToBackStack("InstructionsFragment_TRANSACTION")
-            }
+            fragmentManager?.commit { add(R.id.instructions_container, InstructionsFragment()) }
         }
 
         updateState()
@@ -599,7 +596,7 @@ class InstructionsFragment : Fragment() {
         val v = inflater.inflate(R.layout.tinker_instructions, container, false)
         v.setOnClickListener {
             TinkerPrefs.getInstance(activity!!).setVisited(true)
-            activity!!.supportFragmentManager.popBackStack()
+            fragmentManager?.commit { remove(this@InstructionsFragment) }
         }
         return v
     }

app/src/main/java/io/particle/android/sdk/ui/InspectorActivity.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
+import android.os.Parcelable
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -71,7 +72,8 @@ class InspectorActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        if (savedInstanceState != null) {
+        if (savedInstanceState != null
+            || intent.getParcelableExtra<Parcelable>(EXTRA_DEVICE) == null) {
             finish()
             return
         }

app/src/main/java/io/particle/android/sdk/ui/devicelist/DeviceListFragment.kt

@@ -96,9 +96,9 @@ class DeviceListFragment : Fragment() {
         add_device_fab.collapse()
     }
 
-    @ExperimentalStdlibApi
     override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
+        inflater: LayoutInflater,
+        container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
 
@@ -211,7 +211,7 @@ class DeviceListFragment : Fragment() {
 
     override fun onDestroy() {
         super.onDestroy()
-        deviceSetupCompleteReceiver!!.unregister(activity)
+        deviceSetupCompleteReceiver?.unregister(activity)
     }
 
     private fun onDeviceListUpdated(devices: List<ParticleDevice>) {

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

@@ -85,7 +85,6 @@
     <ScrollView
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginBottom="8dp"
         app:layout_constraintBottom_toTopOf="@id/action_button_divider"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -255,14 +254,18 @@
 
             </LinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="8dp" />
+
         </LinearLayout>
     </ScrollView>
 
     <View
         android:id="@+id/action_button_divider"
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginBottom="2dp"
         android:background="?attr/dividerHorizontal"
         app:layout_constraintBottom_toTopOf="@id/action_filter_device_list"
         app:layout_constraintEnd_toEndOf="parent"
@@ -273,7 +276,7 @@
         style="@style/p_mesh_button_style"
         android:layout_width="0dp"
         android:layout_height="56dp"
-        android:layout_marginBottom="12dp"
+        android:layout_marginBottom="6dp"
         android:text="Show X devices"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@id/guideline_end"