Minor Fixes (#29)

- Fix Double Copy Toast
- Fix Host and User Focus
- Cleanup Unused Files

Author: smashedr

.gitignore

@@ -7,6 +7,7 @@
 .gradle/
 .kotlin/
 captures/
+app/debug
 app/release
 
 local.properties

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

@@ -444,12 +444,16 @@ class MainActivity : AppCompatActivity() {
     }
 }
 
-fun copyToClipboard(context: Context, url: String) {
+fun copyToClipboard(context: Context, url: String, msg: String? = null) {
     Log.d("copyToClipboard", "url: $url")
+    var message = msg
+    if (msg == null){
+        message = context.getString(R.string.tst_copied_clipboard)
+    }
     val clipboard = context.getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
     val clip = ClipData.newPlainText("URL", url)
     clipboard.setPrimaryClip(clip)
-    Toast.makeText(context, "Copied URL to Clipboard.", Toast.LENGTH_SHORT).show()
+    Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
 }
 
 fun isURL(url: String): Boolean {

app/src/main/java/com/djangofiles/djangofiles/ui/PreviewFragment.kt

@@ -204,9 +204,6 @@ class PreviewFragment : Fragment() {
                     withContext(Dispatchers.Main) {
                         if (fileResponse != null) {
                             copyToClipboard(requireContext(), fileResponse.url)
-                            val msg = getString(R.string.tst_copied_clipboard)
-                            Log.d("processUpload", "msg: $msg")
-                            Toast.makeText(requireContext(), msg, Toast.LENGTH_SHORT).show()
                             navController.navigate(
                                 R.id.nav_item_home,
                                 bundleOf("url" to fileResponse.url),

app/src/main/java/com/djangofiles/djangofiles/ui/ShortFragment.kt

@@ -152,8 +152,6 @@ class ShortFragment : Fragment() {
                     withContext(Dispatchers.Main) {
                         if (shortResponse != null) {
                             copyToClipboard(requireContext(), shortResponse.url)
-                            val msg = getString(R.string.tst_copied_clipboard)
-                            Toast.makeText(requireContext(), msg, Toast.LENGTH_SHORT).show()
                             val shareUrl = sharedPreferences.getBoolean("share_after_short", true)
                             Log.d("processShort", "shareUrl: $shareUrl")
                             if (shareUrl) {

app/src/main/java/com/djangofiles/djangofiles/ui/settings/LoginFragment.kt

@@ -56,6 +56,7 @@ class LoginFragment : Fragment() {
         Log.d("Main[onCreate]", "versionName: $versionName")
 
         binding.hostnameText.requestFocus()
+        binding.hostnameText.setSelection(binding.hostnameText.text.length)
 
         val loginFunction = View.OnClickListener {
             Log.d("OnClickListener", "it: ${it.id}")

app/src/main/java/com/djangofiles/djangofiles/ui/settings/LoginTwoFragment.kt

@@ -25,6 +25,7 @@ import com.djangofiles.djangofiles.databinding.FragmentLoginTwoBinding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import androidx.core.view.isVisible
 
 class LoginTwoFragment : Fragment() {
 
@@ -80,6 +81,10 @@ class LoginTwoFragment : Fragment() {
             }
         }
 
+        if (binding.loginLocal.isVisible){
+            binding.loginUsername.requestFocus()
+        }
+
         val sharedPreferences =
             requireContext().getSharedPreferences("AppPreferences", MODE_PRIVATE)
 

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

@@ -5,8 +5,8 @@
 
     <string name="tst_upload_error">Error Uploading!</string>
     <string name="tst_no_url">URL Not Set!</string>
-    <string name="tst_copied_clipboard">Copied to Clipboard.</string>
     <string name="tst_uploading_file">Uploading File…</string>
+    <string name="tst_copied_clipboard">Copied to Clipboard</string>
 
     <string name="upload">Upload</string>
     <string name="upload_file">Upload File</string>
@@ -21,6 +21,4 @@
     <string name="vanity">Vanity</string>
     <string name="file_name">File Name</string>
     <string name="shorten_url">Shorten URL</string>
-
-    <string name="github_link"><![CDATA[<a href="https://django-files.github.io/">https://django-files.github.io</a>]]></string>
 </resources>