diff options
author | pacien | 2018-08-05 22:12:46 +0200 |
---|---|---|
committer | pacien | 2018-08-05 22:12:46 +0200 |
commit | 9012ef92ed810f4a08b5f01cd2c18430a277eacf (patch) | |
tree | 7e2dc8f9b61698e895fab07bc524575af5ec484b /app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt | |
parent | a9d1ac81374119e33871484c8749a94d11a71cae (diff) | |
download | tincapp-9012ef92ed810f4a08b5f01cd2c18430a277eacf.tar.gz |
Code style
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt index 3e2bebd..4b1cb91 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt | |||
@@ -78,7 +78,7 @@ abstract class BaseActivity : AppCompatActivity() { | |||
78 | resources.getString(R.string.app_license) + "\n\n" + | 78 | resources.getString(R.string.app_license) + "\n\n" + |
79 | AppInfo.all()) | 79 | AppInfo.all()) |
80 | .setNeutralButton(R.string.action_open_project_website) { _, _ -> App.openURL(resources.getString(R.string.app_website_url)) } | 80 | .setNeutralButton(R.string.action_open_project_website) { _, _ -> App.openURL(resources.getString(R.string.app_website_url)) } |
81 | .setPositiveButton(R.string.action_close, { _, _ -> Unit }) | 81 | .setPositiveButton(R.string.action_close) { _, _ -> Unit } |
82 | .show() | 82 | .show() |
83 | } | 83 | } |
84 | 84 | ||
@@ -96,13 +96,13 @@ abstract class BaseActivity : AppCompatActivity() { | |||
96 | resources.getString(R.string.message_app_crash), | 96 | resources.getString(R.string.message_app_crash), |
97 | resources.getString(R.string.message_crash_logged, AppPaths.appLogFile().absolutePath) | 97 | resources.getString(R.string.message_crash_logged, AppPaths.appLogFile().absolutePath) |
98 | ).joinToString("\n\n")) | 98 | ).joinToString("\n\n")) |
99 | .setNeutralButton(R.string.action_send_report, { _, _ -> | 99 | .setNeutralButton(R.string.action_send_report) { _, _ -> |
100 | App.sendMail( | 100 | App.sendMail( |
101 | resources.getString(R.string.app_dev_email), | 101 | resources.getString(R.string.app_dev_email), |
102 | listOf(R.string.app_name, R.string.title_app_crash).joinToString(" / ", transform = resources::getString), | 102 | listOf(R.string.app_name, R.string.title_app_crash).joinToString(" / ", transform = resources::getString), |
103 | AppPaths.appLogFile().let { if (it.exists()) it.readText() else "" }) | 103 | AppPaths.appLogFile().let { if (it.exists()) it.readText() else "" }) |
104 | }) | 104 | } |
105 | .setPositiveButton(R.string.action_close, { _, _ -> Unit }) | 105 | .setPositiveButton(R.string.action_close) { _, _ -> Unit } |
106 | .show() | 106 | .show() |
107 | } | 107 | } |
108 | 108 | ||
@@ -111,5 +111,5 @@ abstract class BaseActivity : AppCompatActivity() { | |||
111 | protected fun showProgressDialog(@StringRes msg: Int): AlertDialog = ProgressModal.show(this, getString(msg)) | 111 | protected fun showProgressDialog(@StringRes msg: Int): AlertDialog = ProgressModal.show(this, getString(msg)) |
112 | protected fun showErrorDialog(msg: String): AlertDialog = AlertDialog.Builder(this) | 112 | protected fun showErrorDialog(msg: String): AlertDialog = AlertDialog.Builder(this) |
113 | .setTitle(R.string.title_error).setMessage(msg) | 113 | .setTitle(R.string.title_error).setMessage(msg) |
114 | .setPositiveButton(R.string.action_close, { _, _ -> Unit }).show() | 114 | .setPositiveButton(R.string.action_close) { _, _ -> Unit }.show() |
115 | } | 115 | } |