diff options
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 | 6 |
1 files changed, 2 insertions, 4 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 c092111..44f3210 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt | |||
@@ -18,7 +18,6 @@ import org.pacien.tincapp.context.AppInfo | |||
18 | * @author pacien | 18 | * @author pacien |
19 | */ | 19 | */ |
20 | abstract class BaseActivity : AppCompatActivity() { | 20 | abstract class BaseActivity : AppCompatActivity() { |
21 | |||
22 | override fun onCreate(savedInstanceState: Bundle?) { | 21 | override fun onCreate(savedInstanceState: Bundle?) { |
23 | super.onCreate(savedInstanceState) | 22 | super.onCreate(savedInstanceState) |
24 | setContentView(R.layout.base) | 23 | setContentView(R.layout.base) |
@@ -38,7 +37,7 @@ abstract class BaseActivity : AppCompatActivity() { | |||
38 | resources.getString(R.string.app_license) + "\n\n" + | 37 | resources.getString(R.string.app_license) + "\n\n" + |
39 | AppInfo.all()) | 38 | AppInfo.all()) |
40 | .setNeutralButton(R.string.action_open_project_website) { _, _ -> App.openURL(resources.getString(R.string.app_website_url)) } | 39 | .setNeutralButton(R.string.action_open_project_website) { _, _ -> App.openURL(resources.getString(R.string.app_website_url)) } |
41 | .setPositiveButton(R.string.action_close, App.dismissAction) | 40 | .setPositiveButton(R.string.action_close, { _, _ -> Unit }) |
42 | .show() | 41 | .show() |
43 | } | 42 | } |
44 | 43 | ||
@@ -47,6 +46,5 @@ abstract class BaseActivity : AppCompatActivity() { | |||
47 | protected fun showProgressDialog(@StringRes msg: Int): ProgressDialog = ProgressDialog.show(this, null, getString(msg), true, false) | 46 | protected fun showProgressDialog(@StringRes msg: Int): ProgressDialog = ProgressDialog.show(this, null, getString(msg), true, false) |
48 | protected fun showErrorDialog(msg: String): AlertDialog = AlertDialog.Builder(this) | 47 | protected fun showErrorDialog(msg: String): AlertDialog = AlertDialog.Builder(this) |
49 | .setTitle(R.string.title_error).setMessage(msg) | 48 | .setTitle(R.string.title_error).setMessage(msg) |
50 | .setPositiveButton(R.string.action_close, App.dismissAction).show() | 49 | .setPositiveButton(R.string.action_close, { _, _ -> Unit }).show() |
51 | |||
52 | } | 50 | } |