From d52c787508bf5ba0023946228468731a82a1132d Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Wed, 28 Jun 2017 17:08:20 -0700 Subject: Beginning of overlaying about activity --- sample/src/main/AndroidManifest.xml | 4 ++-- .../src/main/kotlin/ca/allanwang/kau/sample/AboutActivity2.kt | 10 ++++++++++ sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt | 3 +-- 3 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 sample/src/main/kotlin/ca/allanwang/kau/sample/AboutActivity2.kt (limited to 'sample/src') 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" /> + android:name=".AboutActivity2" + android:theme="@style/Kau.Translucent.About" /> \ 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 } } -- cgit v1.2.3