From 7d30c4ec9a847db9b4314ed1f5b692eeee4cc0b6 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 12 Nov 2016 15:55:38 +0100 Subject: [PATCH] convert 3 simple activity to kotlin --- .../activities/LicenseActivity.java | 31 ----------- .../activities/SettingsActivity.java | 53 ------------------- .../activities/SimpleActivity.java | 31 ----------- .../filemanager/activities/LicenseActivity.kt | 22 ++++++++ .../activities/SettingsActivity.kt | 37 +++++++++++++ .../filemanager/activities/SimpleActivity.kt | 28 ++++++++++ 6 files changed, 87 insertions(+), 115 deletions(-) delete mode 100644 app/src/main/java/com/simplemobiletools/filemanager/activities/LicenseActivity.java delete mode 100644 app/src/main/java/com/simplemobiletools/filemanager/activities/SettingsActivity.java delete mode 100644 app/src/main/java/com/simplemobiletools/filemanager/activities/SimpleActivity.java create mode 100644 app/src/main/kotlin/com/simplemobiletools/filemanager/activities/LicenseActivity.kt create mode 100644 app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SettingsActivity.kt create mode 100644 app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SimpleActivity.kt diff --git a/app/src/main/java/com/simplemobiletools/filemanager/activities/LicenseActivity.java b/app/src/main/java/com/simplemobiletools/filemanager/activities/LicenseActivity.java deleted file mode 100644 index 882a9b90..00000000 --- a/app/src/main/java/com/simplemobiletools/filemanager/activities/LicenseActivity.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.simplemobiletools.filemanager.activities; - -import android.content.Intent; -import android.net.Uri; -import android.os.Bundle; - -import com.simplemobiletools.filemanager.R; - -import butterknife.ButterKnife; -import butterknife.OnClick; - -public class LicenseActivity extends SimpleActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_license); - ButterKnife.bind(this); - } - - @OnClick(R.id.license_butterknife_title) - public void butterKnifeClicked() { - openUrl(R.string.butterknife_url); - } - - private void openUrl(int id) { - final String url = getResources().getString(id); - final Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); - startActivity(browserIntent); - } -} diff --git a/app/src/main/java/com/simplemobiletools/filemanager/activities/SettingsActivity.java b/app/src/main/java/com/simplemobiletools/filemanager/activities/SettingsActivity.java deleted file mode 100644 index 80dc7c5f..00000000 --- a/app/src/main/java/com/simplemobiletools/filemanager/activities/SettingsActivity.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.simplemobiletools.filemanager.activities; - -import android.os.Bundle; -import android.support.v4.app.TaskStackBuilder; -import android.support.v7.widget.SwitchCompat; - -import com.simplemobiletools.filemanager.Config; -import com.simplemobiletools.filemanager.R; - -import butterknife.BindView; -import butterknife.ButterKnife; -import butterknife.OnClick; - -public class SettingsActivity extends SimpleActivity { - @BindView(R.id.settings_dark_theme) SwitchCompat mDarkThemeSwitch; - @BindView(R.id.settings_show_hidden) SwitchCompat mShowHiddenSwitch; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_settings); - mConfig = Config.newInstance(getApplicationContext()); - ButterKnife.bind(this); - - setupDarkTheme(); - setupShowHidden(); - } - - private void setupDarkTheme() { - mDarkThemeSwitch.setChecked(mConfig.getIsDarkTheme()); - } - - private void setupShowHidden() { - mShowHiddenSwitch.setChecked(mConfig.getShowHidden()); - } - - @OnClick(R.id.settings_dark_theme_holder) - public void handleDarkTheme() { - mDarkThemeSwitch.setChecked(!mDarkThemeSwitch.isChecked()); - mConfig.setIsDarkTheme(mDarkThemeSwitch.isChecked()); - restartActivity(); - } - - @OnClick(R.id.settings_show_hidden_holder) - public void handleShowHidden() { - mShowHiddenSwitch.setChecked(!mShowHiddenSwitch.isChecked()); - mConfig.setShowHidden(mShowHiddenSwitch.isChecked()); - } - - private void restartActivity() { - TaskStackBuilder.create(getApplicationContext()).addNextIntentWithParentStack(getIntent()).startActivities(); - } -} diff --git a/app/src/main/java/com/simplemobiletools/filemanager/activities/SimpleActivity.java b/app/src/main/java/com/simplemobiletools/filemanager/activities/SimpleActivity.java deleted file mode 100644 index 9df519b1..00000000 --- a/app/src/main/java/com/simplemobiletools/filemanager/activities/SimpleActivity.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.simplemobiletools.filemanager.activities; - -import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; -import android.view.MenuItem; - -import com.simplemobiletools.filemanager.Config; -import com.simplemobiletools.filemanager.R; - -public class SimpleActivity extends AppCompatActivity { - protected Config mConfig; - - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - mConfig = Config.newInstance(getApplicationContext()); - setTheme(mConfig.getIsDarkTheme() ? R.style.AppTheme_Dark : R.style.AppTheme); - super.onCreate(savedInstanceState); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case android.R.id.home: - finish(); - return true; - default: - return super.onOptionsItemSelected(item); - } - } -} diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/LicenseActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/LicenseActivity.kt new file mode 100644 index 00000000..42b53440 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/LicenseActivity.kt @@ -0,0 +1,22 @@ +package com.simplemobiletools.filemanager.activities + +import android.content.Intent +import android.net.Uri +import android.os.Bundle +import com.simplemobiletools.filemanager.R +import kotlinx.android.synthetic.main.activity_license.* + +class LicenseActivity : SimpleActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_license) + license_butterknife_title.setOnClickListener { openUrl(R.string.butterknife_url) } + } + + private fun openUrl(id: Int) { + val url = resources.getString(id) + val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) + startActivity(browserIntent) + } +} diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SettingsActivity.kt new file mode 100644 index 00000000..6f7520d4 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SettingsActivity.kt @@ -0,0 +1,37 @@ +package com.simplemobiletools.filemanager.activities + +import android.os.Bundle +import android.support.v4.app.TaskStackBuilder +import com.simplemobiletools.filemanager.R +import kotlinx.android.synthetic.main.activity_settings.* + +class SettingsActivity : SimpleActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_settings) + + setupDarkTheme() + setupShowHidden() + } + + private fun setupDarkTheme() { + settings_dark_theme.isChecked = mConfig.isDarkTheme + settings_dark_theme_holder.setOnClickListener { + settings_dark_theme.toggle() + mConfig.isDarkTheme = settings_dark_theme.isChecked + restartActivity() + } + } + + private fun setupShowHidden() { + settings_show_hidden.isChecked = mConfig.showHidden + settings_show_hidden_holder.setOnClickListener { + settings_show_hidden.toggle() + mConfig.showHidden = settings_show_hidden.isChecked + } + } + + private fun restartActivity() { + TaskStackBuilder.create(applicationContext).addNextIntentWithParentStack(intent).startActivities() + } +} diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SimpleActivity.kt new file mode 100644 index 00000000..bd70489d --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SimpleActivity.kt @@ -0,0 +1,28 @@ +package com.simplemobiletools.filemanager.activities + +import android.os.Bundle +import android.support.v7.app.AppCompatActivity +import android.view.MenuItem + +import com.simplemobiletools.filemanager.Config +import com.simplemobiletools.filemanager.R + +open class SimpleActivity : AppCompatActivity() { + lateinit var mConfig: Config + + override fun onCreate(savedInstanceState: Bundle?) { + mConfig = Config.newInstance(applicationContext) + setTheme(if (mConfig.isDarkTheme) R.style.AppTheme_Dark else R.style.AppTheme) + super.onCreate(savedInstanceState) + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + return when (item.itemId) { + android.R.id.home -> { + finish() + true + } + else -> super.onOptionsItemSelected(item) + } + } +}