From bffb7f1dd47eab957e1a103ef1ceaafe6695f21d Mon Sep 17 00:00:00 2001 From: zt515 Date: Thu, 24 Aug 2017 23:32:04 +0800 Subject: [PATCH] Improve: Cleanup code --- .../main/java/io/neoterm/ui/crash/CrashActivity.kt | 4 ++-- .../io/neoterm/ui/customize/ColorSchemeActivity.kt | 4 ++-- .../java/io/neoterm/ui/pm/PackageManagerActivity.kt | 4 ++-- .../ui/pm/adapter/holder/PackageViewHolder.kt | 4 ++-- .../main/java/io/neoterm/ui/setup/SetupActivity.kt | 2 +- .../main/java/io/neoterm/ui/support/AboutActivity.kt | 7 +++---- app/src/main/java/io/neoterm/ui/support/Donation.kt | 11 ++++------- .../main/java/io/neoterm/ui/support/HelpActivity.kt | 2 +- .../main/java/io/neoterm/ui/term/NeoTermActivity.kt | 12 ++++++------ .../io/neoterm/ui/term/NeoTermRemoteInterface.kt | 4 ++-- .../java/io/neoterm/ui/term/tab/TermTabDecorator.kt | 3 +-- 11 files changed, 26 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/io/neoterm/ui/crash/CrashActivity.kt b/app/src/main/java/io/neoterm/ui/crash/CrashActivity.kt index ce0aee2..3528efd 100644 --- a/app/src/main/java/io/neoterm/ui/crash/CrashActivity.kt +++ b/app/src/main/java/io/neoterm/ui/crash/CrashActivity.kt @@ -16,7 +16,7 @@ class CrashActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.ui_crash) - setSupportActionBar(findViewById(R.id.crash_toolbar)) + setSupportActionBar(findViewById(R.id.crash_toolbar)) (findViewById(R.id.crash_model)).text = getString(R.string.crash_model, collectModelInfo()) (findViewById(R.id.crash_app_version)).text = getString(R.string.crash_app, collectAppInfo()) @@ -36,7 +36,7 @@ class CrashActivity : AppCompatActivity() { return "are.you.kidding.me.NoExceptionFoundException: This is a bug, please contact developers!" } - fun collectAppInfo(): String { + private fun collectAppInfo(): String { val pm = packageManager val info = pm.getPackageInfo(packageName, 0) return "${info.versionName} (${info.versionCode})" diff --git a/app/src/main/java/io/neoterm/ui/customize/ColorSchemeActivity.kt b/app/src/main/java/io/neoterm/ui/customize/ColorSchemeActivity.kt index 6905e7a..5805115 100644 --- a/app/src/main/java/io/neoterm/ui/customize/ColorSchemeActivity.kt +++ b/app/src/main/java/io/neoterm/ui/customize/ColorSchemeActivity.kt @@ -35,10 +35,10 @@ class ColorSchemeActivity : BaseCustomizeActivity() { .build() var changed = false - lateinit var editingColorScheme: NeoColorScheme + private lateinit var editingColorScheme: NeoColorScheme lateinit var adapter: ColorItemAdapter - val colorSchemeComponent = ComponentManager.getComponent() + private val colorSchemeComponent = ComponentManager.getComponent() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/io/neoterm/ui/pm/PackageManagerActivity.kt b/app/src/main/java/io/neoterm/ui/pm/PackageManagerActivity.kt index ef1f3c7..7619229 100644 --- a/app/src/main/java/io/neoterm/ui/pm/PackageManagerActivity.kt +++ b/app/src/main/java/io/neoterm/ui/pm/PackageManagerActivity.kt @@ -58,8 +58,8 @@ class PackageManagerActivity : AppCompatActivity(), SearchView.OnQueryTextListen setSupportActionBar(toolbar) supportActionBar?.setDisplayHomeAsUpEnabled(true) - progressBar = findViewById(R.id.package_loading_progress_bar) - recyclerView = findViewById(R.id.package_list) + progressBar = findViewById(R.id.package_loading_progress_bar) + recyclerView = findViewById(R.id.package_list) recyclerView.setHasFixedSize(true) adapter = PackageAdapter(this, COMPARATOR, object : PackageAdapter.Listener { override fun onModelClicked(model: PackageModel) { diff --git a/app/src/main/java/io/neoterm/ui/pm/adapter/holder/PackageViewHolder.kt b/app/src/main/java/io/neoterm/ui/pm/adapter/holder/PackageViewHolder.kt index e1a7c0d..f0dd7af 100755 --- a/app/src/main/java/io/neoterm/ui/pm/adapter/holder/PackageViewHolder.kt +++ b/app/src/main/java/io/neoterm/ui/pm/adapter/holder/PackageViewHolder.kt @@ -10,8 +10,8 @@ import io.neoterm.ui.pm.adapter.PackageAdapter import io.neoterm.ui.pm.model.PackageModel class PackageViewHolder(private val rootView: View, private val listener: PackageAdapter.Listener) : SortedListAdapter.ViewHolder(rootView) { - private val packageNameView: TextView = rootView.findViewById(R.id.package_item_name) - private val packageDescView: TextView = rootView.findViewById(R.id.package_item_desc) + private val packageNameView: TextView = rootView.findViewById(R.id.package_item_name) + private val packageDescView: TextView = rootView.findViewById(R.id.package_item_desc) override fun performBind(item: PackageModel) { rootView.setOnClickListener { listener.onModelClicked(item) } diff --git a/app/src/main/java/io/neoterm/ui/setup/SetupActivity.kt b/app/src/main/java/io/neoterm/ui/setup/SetupActivity.kt index 714aa92..a0fbb00 100644 --- a/app/src/main/java/io/neoterm/ui/setup/SetupActivity.kt +++ b/app/src/main/java/io/neoterm/ui/setup/SetupActivity.kt @@ -14,7 +14,7 @@ import io.neoterm.utils.PackageUtils * @author kiva */ class SetupActivity : AppCompatActivity() { - var aptUpdated = false + private var aptUpdated = false override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/io/neoterm/ui/support/AboutActivity.kt b/app/src/main/java/io/neoterm/ui/support/AboutActivity.kt index e81f108..f6c7e67 100644 --- a/app/src/main/java/io/neoterm/ui/support/AboutActivity.kt +++ b/app/src/main/java/io/neoterm/ui/support/AboutActivity.kt @@ -6,7 +6,6 @@ import android.net.Uri import android.os.Bundle import android.support.v7.app.AlertDialog import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.Toolbar import android.view.MenuItem import android.view.View import android.widget.TextView @@ -26,7 +25,7 @@ class AboutActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.ui_about) - setSupportActionBar(findViewById(R.id.about_toolbar)) + setSupportActionBar(findViewById(R.id.about_toolbar)) supportActionBar?.setDisplayHomeAsUpEnabled(true) try { @@ -76,10 +75,10 @@ class AboutActivity : AppCompatActivity() { AlertDialog.Builder(this) .setTitle(R.string.support_donate_label) .setMessage(R.string.support_donate_dialog_text) - .setPositiveButton(R.string.support_donate_alipay, {_, _ -> + .setPositiveButton(R.string.support_donate_alipay, { _, _ -> Donation.donateByAlipay(this, "FKX025062MBLAG6E90RYBC") }) - .setNegativeButton(R.string.support_donate_qq, {_, _ -> + .setNegativeButton(R.string.support_donate_qq, { _, _ -> Donation.donateByQQ(this) }) .setNeutralButton(android.R.string.no, null) diff --git a/app/src/main/java/io/neoterm/ui/support/Donation.kt b/app/src/main/java/io/neoterm/ui/support/Donation.kt index 9fa13b6..667b606 100644 --- a/app/src/main/java/io/neoterm/ui/support/Donation.kt +++ b/app/src/main/java/io/neoterm/ui/support/Donation.kt @@ -10,9 +10,6 @@ import io.neoterm.R import java.net.URISyntaxException object Donation { - // 支付宝包名 - private val ALIPAY_PACKAGE_NAME = "com.eg.android.AlipayGphone" - // 旧版支付宝二维码通用 Intent Scheme Url 格式 private val INTENT_URL_FORMAT = "intent://platformapi/startapp?saId=10000007&" + "clientVersion=3.7.0.0718&qrcode=https%3A%2F%2Fqr.alipay.com%2F{payCode}%3F_s" + @@ -33,19 +30,19 @@ object Donation { } private fun startIntentUrl(activity: Activity, intentFullUrl: String): Boolean { - try { + return try { val intent = Intent.parseUri( intentFullUrl, Intent.URI_INTENT_SCHEME ) activity.startActivity(intent) - return true + true } catch (e: URISyntaxException) { e.printStackTrace() - return false + false } catch (e: ActivityNotFoundException) { e.printStackTrace() - return false + false } } } \ No newline at end of file diff --git a/app/src/main/java/io/neoterm/ui/support/HelpActivity.kt b/app/src/main/java/io/neoterm/ui/support/HelpActivity.kt index 7c89cb4..f5f6f02 100644 --- a/app/src/main/java/io/neoterm/ui/support/HelpActivity.kt +++ b/app/src/main/java/io/neoterm/ui/support/HelpActivity.kt @@ -13,7 +13,7 @@ class HelpActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.ui_faq) - setSupportActionBar(findViewById(R.id.faq_toolbar)) + setSupportActionBar(findViewById(R.id.faq_toolbar)) supportActionBar?.setDisplayHomeAsUpEnabled(true) } diff --git a/app/src/main/java/io/neoterm/ui/term/NeoTermActivity.kt b/app/src/main/java/io/neoterm/ui/term/NeoTermActivity.kt index 9a4838e..3d84bf8 100644 --- a/app/src/main/java/io/neoterm/ui/term/NeoTermActivity.kt +++ b/app/src/main/java/io/neoterm/ui/term/NeoTermActivity.kt @@ -331,9 +331,9 @@ class NeoTermActivity : AppCompatActivity(), ServiceConnection, SharedPreference forEachTab { it.resetStatus() } } - private fun floatTabUp(tab: TermTab) { - Toast.makeText(this, "In Progress", Toast.LENGTH_SHORT).show() - } +// private fun floatTabUp(tab: TermTab) { +// Toast.makeText(this, "In Progress", Toast.LENGTH_SHORT).show() +// } private fun forceAddSystemSession() { if (!tabSwitcher.isSwitcherShown) { @@ -507,9 +507,9 @@ class NeoTermActivity : AppCompatActivity(), ServiceConnection, SharedPreference return RevealAnimation.Builder().setX(x).setY(y).create() } - private fun createPeekAnimation(): Animation { - return PeekAnimation.Builder().setX(tabSwitcher.width / 2f).create() - } +// private fun createPeekAnimation(): Animation { +// return PeekAnimation.Builder().setX(tabSwitcher.width / 2f).create() +// } private fun getNavigationMenuItem(): View? { val toolbars = tabSwitcher.toolbars diff --git a/app/src/main/java/io/neoterm/ui/term/NeoTermRemoteInterface.kt b/app/src/main/java/io/neoterm/ui/term/NeoTermRemoteInterface.kt index d0c41dc..85c5141 100644 --- a/app/src/main/java/io/neoterm/ui/term/NeoTermRemoteInterface.kt +++ b/app/src/main/java/io/neoterm/ui/term/NeoTermRemoteInterface.kt @@ -27,7 +27,7 @@ import java.io.File * @author kiva */ class NeoTermRemoteInterface : AppCompatActivity(), ServiceConnection { - var termService: NeoTermService? = null + private var termService: NeoTermService? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -118,7 +118,7 @@ class NeoTermRemoteInterface : AppCompatActivity(), ServiceConnection { when (extra) { is ArrayList<*> -> { - (0..extra.size - 1) + (0 until extra.size) .map { extra[it] } .takeWhile { it is Uri } .mapTo(filesToHandle, { File((it as Uri).path).absolutePath }) diff --git a/app/src/main/java/io/neoterm/ui/term/tab/TermTabDecorator.kt b/app/src/main/java/io/neoterm/ui/term/tab/TermTabDecorator.kt index 324c91e..df2892b 100644 --- a/app/src/main/java/io/neoterm/ui/term/tab/TermTabDecorator.kt +++ b/app/src/main/java/io/neoterm/ui/term/tab/TermTabDecorator.kt @@ -55,13 +55,12 @@ class TermTabDecorator(val context: NeoTermActivity) : TabSwitcherDecorator() { colorSchemeManager.applyColorScheme(view, extraKeysView, colorSchemeManager.getCurrentColorScheme()) if (tab is TermTab) { - val termTab = tab val termData = tab.termData TerminalUtils.setupTerminalSession(termData.termSession) // 复用前一次的 TermSessionCallback 和 TermViewClient - termData.initializeViewWith(termTab, view, extraKeysView) + termData.initializeViewWith(tab, view, extraKeysView) if (termData.termSession != null) { termData.viewClient?.updateExtraKeys(termData.termSession?.title, true)