diff options
| author | Allan Wang <me@allanwang.ca> | 2019-06-07 14:25:56 -0400 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2019-06-07 14:25:56 -0400 |
| commit | 1ac55ac5b029d792b2c5a93ef7548d3588c6bab2 (patch) | |
| tree | 7436434a963163b7b923775eda195c838ee32b1e /sample | |
| parent | 940b3142f0a1364ba56e5117e16da51207c44d44 (diff) | |
| parent | eb9317015c6535bfa36166d254ec954f81d8df97 (diff) | |
| download | kau-1ac55ac5b029d792b2c5a93ef7548d3588c6bab2.tar.gz kau-1ac55ac5b029d792b2c5a93ef7548d3588c6bab2.tar.bz2 kau-1ac55ac5b029d792b2c5a93ef7548d3588c6bab2.zip | |
Merge branch 'dev' into plugin-object
Diffstat (limited to 'sample')
| -rw-r--r-- | sample/build.gradle | 5 | ||||
| -rw-r--r-- | sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt | 14 | ||||
| -rw-r--r-- | sample/src/main/res/values/colors.xml | 6 |
3 files changed, 10 insertions, 15 deletions
diff --git a/sample/build.gradle b/sample/build.gradle index 8f408be..5f795db 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -80,6 +80,11 @@ android { pickFirst 'META-INF/library_release.kotlin_module' } + compileOptions { + sourceCompatibility '1.8' + targetCompatibility '1.8' + } + sourceSets { main.java.srcDirs += 'src/main/kotlin' test.java.srcDirs += 'src/test/kotlin' diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt index d9586c4..9ce3f42 100644 --- a/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt +++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt @@ -260,12 +260,7 @@ class MainActivity : KPrefActivity() { if (KPrefSample.version < BuildConfig.VERSION_CODE) { KPrefSample.version = BuildConfig.VERSION_CODE if (!BuildConfig.DEBUG) - showChangelog(R.xml.kau_changelog, KPrefSample.textColor) { - // TODO MD Color -// titleColor(KPrefSample.textColor) -// backgroundColor(KPrefSample.bgColor) -// positiveColor(KPrefSample.accentColor) - } + showChangelog(R.xml.kau_changelog) } supportActionBar?.apply { setDisplayHomeAsUpEnabled(false) @@ -298,12 +293,7 @@ class MainActivity : KPrefActivity() { override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { - R.id.action_changelog -> showChangelog(R.xml.kau_changelog, KPrefSample.textColor) { - // TODO MD Color -// titleColor(KPrefSample.textColor) -// backgroundColor(KPrefSample.bgColor) -// positiveColor(KPrefSample.accentColor) - } + R.id.action_changelog -> showChangelog(R.xml.kau_changelog) R.id.action_settings -> startActivity<AnimActivity>() R.id.action_email -> sendEmail(R.string.your_email, R.string.your_subject) else -> return super.onOptionsItemSelected(item) diff --git a/sample/src/main/res/values/colors.xml b/sample/src/main/res/values/colors.xml index 3ab3e9c..12363c4 100644 --- a/sample/src/main/res/values/colors.xml +++ b/sample/src/main/res/values/colors.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="colorPrimary">#3F51B5</color> - <color name="colorPrimaryDark">#303F9F</color> - <color name="colorAccent">#FF4081</color> + <color name="colorPrimary">#2196F3</color> + <color name="colorPrimaryDark">#1976D2</color> + <color name="colorAccent">#FF5722</color> </resources> |