From 8fb4093dc69d9e90d288d0c4b550f52b140fe11d Mon Sep 17 00:00:00 2001 From: NerdNumber9 Date: Wed, 4 Jan 2017 23:34:47 -0500 Subject: [PATCH] Various bug fixes and code cleanup. --- app/build.gradle | 2 +- app/src/main/java/exh/ui/batchadd/BatchAddFragment.kt | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3bf1b1a3b..54d0df0f1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -232,4 +232,4 @@ repositories { } //Firebase (EH) -//apply plugin: 'com.google.gms.google-services' +apply plugin: 'com.google.gms.google-services' diff --git a/app/src/main/java/exh/ui/batchadd/BatchAddFragment.kt b/app/src/main/java/exh/ui/batchadd/BatchAddFragment.kt index 5e9cecdb9..0ee5d2fdf 100644 --- a/app/src/main/java/exh/ui/batchadd/BatchAddFragment.kt +++ b/app/src/main/java/exh/ui/batchadd/BatchAddFragment.kt @@ -26,7 +26,7 @@ class BatchAddFragment : BaseFragment() { = inflater.inflate(R.layout.eh_fragment_batch_add, container, false)!! override fun onViewCreated(view: View?, savedInstanceState: Bundle?) { - setToolbarTitle("Batch Add") + setToolbarTitle("Batch add") setup() } @@ -35,8 +35,10 @@ class BatchAddFragment : BaseFragment() { btn_add_galleries.setOnClickListener { val galleries = galleries_box.text.toString() //Check text box has content - if(galleries.isNullOrBlank()) + if(galleries.isNullOrBlank()) { noGalleriesSpecified() + return@setOnClickListener + } //Too lazy to actually deal with orientation changes activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR @@ -71,12 +73,15 @@ class BatchAddFragment : BaseFragment() { } //Show report + val succeededCount = succeeded.size + val failedCount = failed.size + if(succeeded.isEmpty()) succeeded += "None" if(failed.isEmpty()) failed += "None" val succeededReport = succeeded.joinToString(separator = "\n", prefix = "Added:\n") val failedReport = failed.joinToString(separator = "\n", prefix = "Failed:\n") - val summary = "Summary:\nAdded: ${succeeded.size} gallerie(s)\nFailed: ${failed.size} gallerie(s)" + val summary = "Summary:\nAdded: $succeededCount gallerie(s)\nFailed: $failedCount gallerie(s)" val report = listOf(succeededReport, failedReport, summary).joinToString(separator = "\n\n")