Skip to content

Commit 0315b32

Browse files
committed
add About activity handling
1 parent e7566ca commit 0315b32

File tree

6 files changed

+22
-49
lines changed

6 files changed

+22
-49
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Simple Notes
2-
<img alt="Logo" src="app/src/main/res/mipmap-xxxhdpi/launcher.png" width="80">
2+
<img alt="Logo" src="app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" width="80">
33

44
A simple textfield for adding quick notes.
55

@@ -20,7 +20,7 @@ This app is just one piece of a bigger series of apps. You can find the rest of
2020

2121
License
2222
-------
23-
Copyright 2016 SimpleMobileTools
23+
Copyright 2017 SimpleMobileTools
2424

2525
Licensed under the Apache License, Version 2.0 (the "License");
2626
you may not use this file except in compliance with the License.

app/src/main/AndroidManifest.xml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,19 @@
2929
</activity>
3030

3131
<activity
32-
android:name=".activities.AboutActivity"
32+
android:name="com.simplemobiletools.commons.activities.AboutActivity"
3333
android:label="@string/about"
3434
android:parentActivityName=".activities.MainActivity"/>
3535

3636
<activity
37-
android:name=".activities.LicenseActivity"
37+
android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
38+
android:label="@string/customize_colors"
39+
android:parentActivityName=".activities.SettingsActivity"/>
40+
41+
<activity
42+
android:name="com.simplemobiletools.commons.activities.LicenseActivity"
3843
android:label="@string/third_party_licences"
39-
android:parentActivityName=".activities.AboutActivity"/>
44+
android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity"/>
4045

4146
<activity
4247
android:name=".activities.SettingsActivity"

app/src/main/kotlin/com/simplemobiletools/notes/activities/AboutActivity.kt

Lines changed: 0 additions & 9 deletions
This file was deleted.

app/src/main/kotlin/com/simplemobiletools/notes/activities/LicenseActivity.kt

Lines changed: 0 additions & 18 deletions
This file was deleted.

app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ import android.view.View
1111
import com.simplemobiletools.commons.dialogs.ConfirmationDialog
1212
import com.simplemobiletools.commons.extensions.toast
1313
import com.simplemobiletools.commons.extensions.value
14+
import com.simplemobiletools.commons.helpers.LICENSE_AMBILWARNA
15+
import com.simplemobiletools.commons.helpers.LICENSE_KOTLIN
16+
import com.simplemobiletools.commons.helpers.LICENSE_STETHO
17+
import com.simplemobiletools.notes.BuildConfig
1418
import com.simplemobiletools.notes.R
1519
import com.simplemobiletools.notes.TYPE_NOTE
1620
import com.simplemobiletools.notes.adapters.NotesPagerAdapter
@@ -92,7 +96,7 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
9296
R.id.share -> shareText()
9397
R.id.delete_note -> displayDeleteNotePrompt()
9498
R.id.settings -> startActivity(Intent(applicationContext, SettingsActivity::class.java))
95-
R.id.about -> startActivity(Intent(applicationContext, AboutActivity::class.java))
99+
R.id.about -> launchAbout()
96100
else -> return super.onOptionsItemSelected(item)
97101
}
98102
return true
@@ -124,6 +128,10 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
124128
}
125129
}
126130

131+
private fun launchAbout() {
132+
startAboutActivity(R.string.app_name, LICENSE_KOTLIN or LICENSE_AMBILWARNA or LICENSE_STETHO, BuildConfig.VERSION_NAME)
133+
}
134+
127135
private fun displayDeleteNotePrompt() {
128136
val message = String.format(getString(R.string.delete_note_prompt_message), mCurrentNote.title)
129137
ConfirmationDialog(this, message) {
Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,14 @@
11
package com.simplemobiletools.notes.activities
22

33
import android.os.Bundle
4-
import android.support.v7.app.AppCompatActivity
5-
import android.view.MenuItem
6-
4+
import com.simplemobiletools.commons.activities.BaseSimpleActivity
75
import com.simplemobiletools.notes.Config
8-
import com.simplemobiletools.notes.R
96

10-
open class SimpleActivity : AppCompatActivity() {
7+
open class SimpleActivity : BaseSimpleActivity() {
118
lateinit var config: Config
129

1310
override fun onCreate(savedInstanceState: Bundle?) {
14-
config = Config.newInstance(applicationContext)
1511
super.onCreate(savedInstanceState)
16-
}
17-
18-
override fun onOptionsItemSelected(item: MenuItem): Boolean {
19-
return when (item.itemId) {
20-
android.R.id.home -> {
21-
finish()
22-
true
23-
}
24-
else -> super.onOptionsItemSelected(item)
25-
}
12+
config = Config.newInstance(applicationContext)
2613
}
2714
}

0 commit comments

Comments
 (0)