Fixes (#18)

- Fix Upload Shortcut
- Add Shortcut Icon

Author: smashedr

app/src/main/java/com/djangofiles/djangofiles/MainActivity.kt

@@ -150,7 +150,7 @@ class MainActivity : AppCompatActivity() {
         //Log.d("handleIntent", "authToken: $authToken")
 
         if (savedUrl.isNullOrEmpty()) {
-            Log.w("handleIntent", "Missing Saved URL or Token...")
+            Log.i("handleIntent", "Missing Saved URL or Token...")
 
             navController.navigate(
                 R.id.nav_item_setup, null, NavOptions.Builder()
@@ -164,15 +164,14 @@ class MainActivity : AppCompatActivity() {
             binding.drawerLayout.closeDrawers()
 
             // TODO: Cleanup the logic for handling MAIN intent...
-            val currentDestinationId = navController.currentDestination?.id
-            Log.d("handleIntent", "currentDestinationId: $currentDestinationId")
-            val launcherAction = sharedPreferences.getString("launcher_action", null)
-            Log.d("handleIntent", "launcherAction: $launcherAction")
-            val fromShortcut = intent.getStringExtra("fromShortcut")
-            Log.d("handleIntent", "fromShortcut: $fromShortcut")
+
+            //val currentDestinationId = navController.currentDestination?.id
+            //Log.d("handleIntent", "currentDestinationId: $currentDestinationId")
+            //val launcherAction = sharedPreferences.getString("launcher_action", null)
+            //Log.d("handleIntent", "launcherAction: $launcherAction")
+
             //Log.d("handleIntent", "nav_item_preview: ${R.id.nav_item_preview}")
             //Log.d("handleIntent", "nav_item_short: ${R.id.nav_item_short}")
-            //
             //if (currentDestinationId == R.id.nav_item_preview || currentDestinationId == R.id.nav_item_short) {
             //    Log.i("handleIntent", "ON PREVIEW/SHORT - Navigating to HomeFragment w/ setPopUpTo")
             //    // TODO: Determine the correct navigation call here...
@@ -186,11 +185,14 @@ class MainActivity : AppCompatActivity() {
             //    Log.i("handleIntent", "HOME SETTING SET - Navigating to HomeFragment")
             //    navController.navigate(R.id.nav_item_home)
             //}
-            //// TODO: Determine if this needs to be in the above if/else
-            //if (fromShortcut == "upload") {
-            //    Log.d("handleIntent", "filePickerLauncher.launch")
-            //    filePickerLauncher.launch(arrayOf("*/*"))
-            //}
+
+            // TODO: Determine if this needs to be in the above if/else
+            val fromShortcut = intent.getStringExtra("fromShortcut")
+            Log.d("handleIntent", "fromShortcut: $fromShortcut")
+            if (fromShortcut == "upload") {
+                Log.d("handleIntent", "filePickerLauncher.launch")
+                filePickerLauncher.launch(arrayOf("*/*"))
+            }
 
         } else if (Intent.ACTION_SEND == intent.action) {
             Log.d("handleIntent", "ACTION_SEND")

app/src/main/res/drawable/fa_upload_shortcut.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <group
+      android:scaleX="0.4"
+      android:scaleY="0.4"
+      android:translateX="153.6"
+      android:translateY="153.6">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M288,109.3L288,352c0,17.7 -14.3,32 -32,32s-32,-14.3 -32,-32l0,-242.7 -73.4,73.4c-12.5,12.5 -32.8,12.5 -45.3,0s-12.5,-32.8 0,-45.3l128,-128c12.5,-12.5 32.8,-12.5 45.3,0l128,128c12.5,12.5 12.5,32.8 0,45.3s-32.8,12.5 -45.3,0L288,109.3zM64,352l128,0c0,35.3 28.7,64 64,64s64,-28.7 64,-64l128,0c35.3,0 64,28.7 64,64l0,32c0,35.3 -28.7,64 -64,64L64,512c-35.3,0 -64,-28.7 -64,-64l0,-32c0,-35.3 28.7,-64 64,-64zM432,456a24,24 0,1 0,0 -48,24 24,0 1,0 0,48z"/>
+  </group>
+</vector>

app/src/main/res/drawable/shortcut_upload.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@drawable/fa_upload_shortcut" />
+</adaptive-icon>

app/src/main/res/xml/shortcuts.xml

@@ -3,7 +3,7 @@
     <shortcut
         android:shortcutId="upload"
         android:enabled="true"
-        android:icon="@mipmap/ic_launcher_round"
+        android:icon="@drawable/shortcut_upload"
         android:shortcutShortLabel="@string/upload"
         android:shortcutLongLabel="@string/upload_file">
         <intent