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 | 20 |
1 files changed, 13 insertions, 7 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 a51d401..d9d549b 100644 --- a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt +++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt | |||
@@ -26,7 +26,7 @@ import android.support.design.widget.Snackbar | |||
26 | import android.support.v7.app.AlertDialog | 26 | import android.support.v7.app.AlertDialog |
27 | import android.support.v7.app.AppCompatActivity | 27 | import android.support.v7.app.AppCompatActivity |
28 | import android.view.* | 28 | import android.view.* |
29 | import kotlinx.android.synthetic.main.base.* | 29 | import kotlinx.android.synthetic.main.base_activity.* |
30 | import org.pacien.tincapp.R | 30 | import org.pacien.tincapp.R |
31 | import org.pacien.tincapp.context.App | 31 | import org.pacien.tincapp.context.App |
32 | import org.pacien.tincapp.context.AppInfo | 32 | import org.pacien.tincapp.context.AppInfo |
@@ -37,11 +37,12 @@ import org.pacien.tincapp.context.CrashRecorder | |||
37 | * @author pacien | 37 | * @author pacien |
38 | */ | 38 | */ |
39 | abstract class BaseActivity : AppCompatActivity() { | 39 | abstract class BaseActivity : AppCompatActivity() { |
40 | private val rootView by lazy { base_activity_frame!! } | ||
40 | private var active = false | 41 | private var active = false |
41 | 42 | ||
42 | override fun onCreate(savedInstanceState: Bundle?) { | 43 | override fun onCreate(savedInstanceState: Bundle?) { |
43 | super.onCreate(savedInstanceState) | 44 | super.onCreate(savedInstanceState) |
44 | setContentView(R.layout.base) | 45 | super.setContentView(R.layout.base_activity) |
45 | } | 46 | } |
46 | 47 | ||
47 | override fun onCreateOptionsMenu(m: Menu): Boolean { | 48 | override fun onCreateOptionsMenu(m: Menu): Boolean { |
@@ -69,6 +70,10 @@ abstract class BaseActivity : AppCompatActivity() { | |||
69 | super.onStop() | 70 | super.onStop() |
70 | } | 71 | } |
71 | 72 | ||
73 | override fun setContentView(layoutResID: Int) { | ||
74 | layoutInflater.inflate(layoutResID, rootView) | ||
75 | } | ||
76 | |||
72 | override fun getSupportActionBar() = super.getSupportActionBar()!! | 77 | override fun getSupportActionBar() = super.getSupportActionBar()!! |
73 | 78 | ||
74 | fun startActivityChooser(target: Intent, title: String) { | 79 | fun startActivityChooser(target: Intent, title: String) { |
@@ -76,7 +81,8 @@ abstract class BaseActivity : AppCompatActivity() { | |||
76 | startActivity(intentChooser) | 81 | startActivity(intentChooser) |
77 | } | 82 | } |
78 | 83 | ||
79 | fun aboutDialog(@Suppress("UNUSED_PARAMETER") i: MenuItem) { | 84 | @Suppress("UNUSED_PARAMETER") |
85 | fun aboutDialog(m: MenuItem) { | ||
80 | AlertDialog.Builder(this) | 86 | AlertDialog.Builder(this) |
81 | .setTitle(resources.getString(R.string.app_name)) | 87 | .setTitle(resources.getString(R.string.app_name)) |
82 | .setMessage(resources.getString(R.string.app_short_desc) + "\n\n" + | 88 | .setMessage(resources.getString(R.string.app_short_desc) + "\n\n" + |
@@ -112,11 +118,11 @@ abstract class BaseActivity : AppCompatActivity() { | |||
112 | .show() | 118 | .show() |
113 | } | 119 | } |
114 | 120 | ||
115 | fun inflate(@LayoutRes layout: Int) = layoutInflater.inflate(layout, main_content, false)!! | 121 | fun inflate(@LayoutRes layout: Int) = layoutInflater.inflate(layout, rootView, false)!! |
116 | fun inflate(inflateFunc: (LayoutInflater, ViewGroup, Boolean) -> View) = inflateFunc(layoutInflater, main_content, false) | 122 | fun inflate(inflateFunc: (LayoutInflater, ViewGroup?, Boolean) -> View) = inflateFunc(layoutInflater, rootView, false) |
117 | 123 | ||
118 | fun notify(@StringRes msg: Int) = Snackbar.make(activity_base, msg, Snackbar.LENGTH_LONG).show() | 124 | fun notify(@StringRes msg: Int) = Snackbar.make(base_activity_frame, msg, Snackbar.LENGTH_LONG).show() |
119 | fun notify(msg: String) = Snackbar.make(activity_base, msg, Snackbar.LENGTH_LONG).show() | 125 | fun notify(msg: String) = Snackbar.make(base_activity_frame, msg, Snackbar.LENGTH_LONG).show() |
120 | 126 | ||
121 | fun showErrorDialog(msg: String): AlertDialog = AlertDialog.Builder(this) | 127 | fun showErrorDialog(msg: String): AlertDialog = AlertDialog.Builder(this) |
122 | .setTitle(R.string.title_error).setMessage(msg) | 128 | .setTitle(R.string.title_error).setMessage(msg) |