aboutsummaryrefslogtreecommitdiff
path: root/sample/src/main
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-06-28 17:08:20 -0700
committerAllan Wang <me@allanwang.ca>2017-06-28 17:08:20 -0700
commitd52c787508bf5ba0023946228468731a82a1132d (patch)
treea5048581dc74c9f0a87d43d83eb7e7d2c69ff309 /sample/src/main
parent0d7bf678f84f60a11e7c7cdbaa31bfe6ef21166c (diff)
downloadkau-d52c787508bf5ba0023946228468731a82a1132d.tar.gz
kau-d52c787508bf5ba0023946228468731a82a1132d.tar.bz2
kau-d52c787508bf5ba0023946228468731a82a1132d.zip
Beginning of overlaying about activity
Diffstat (limited to 'sample/src/main')
-rw-r--r--sample/src/main/AndroidManifest.xml4
-rw-r--r--sample/src/main/kotlin/ca/allanwang/kau/sample/AboutActivity2.kt10
-rw-r--r--sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt3
3 files changed, 13 insertions, 4 deletions
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 2a55f62..c424284 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -23,8 +23,8 @@
android:name=".AnimActivity"
android:theme="@style/AppTheme.Slide" />
<activity
- android:name=".AboutActivity"
- android:theme="@style/Theme.AppCompat.NoActionBar" />
+ android:name=".AboutActivity2"
+ android:theme="@style/Kau.Translucent.About" />
</application>
</manifest> \ No newline at end of file
diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/AboutActivity2.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/AboutActivity2.kt
new file mode 100644
index 0000000..0e2a3fb
--- /dev/null
+++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/AboutActivity2.kt
@@ -0,0 +1,10 @@
+package ca.allanwang.kau.sample
+
+import ca.allanwang.kau.about.AboutActivityBase
+
+/**
+ * Created by Allan Wang on 2017-06-27.
+ */
+class AboutActivity2 : AboutActivityBase(R.string::class.java) {
+
+} \ No newline at end of file
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 d8e7e33..46c5968 100644
--- a/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt
+++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt
@@ -3,7 +3,6 @@ package ca.allanwang.kau.sample
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
-import ca.allanwang.kau.about.AboutActivityBase
import ca.allanwang.kau.email.sendEmail
import ca.allanwang.kau.kpref.CoreAttributeContract
import ca.allanwang.kau.kpref.KPrefActivity
@@ -150,7 +149,7 @@ class MainActivity : KPrefActivity() {
plainText(R.string.kau_lorem_ipsum) {
onClick = {
_, _, _ ->
- startActivity(AboutActivity::class.java)
+ startActivity(AboutActivity2::class.java, transition = true)
false
}
}