add About activity handling

README.md

@@ -1,5 +1,5 @@
 # Simple Notes
-<img alt="Logo" src="app/src/main/res/mipmap-xxxhdpi/launcher.png" width="80">
+<img alt="Logo" src="app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" width="80">
 
 A simple textfield for adding quick notes.
 
@@ -20,7 +20,7 @@ This app is just one piece of a bigger series of apps. You can find the rest of
 
 License
 -------
-    Copyright 2016 SimpleMobileTools
+    Copyright 2017 SimpleMobileTools
     
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

app/src/main/AndroidManifest.xml

@@ -29,14 +29,19 @@
         </activity>
 
         <activity
-            android:name=".activities.AboutActivity"
+            android:name="com.simplemobiletools.commons.activities.AboutActivity"
             android:label="@string/about"
             android:parentActivityName=".activities.MainActivity"/>
 
         <activity
-            android:name=".activities.LicenseActivity"
+            android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
+            android:label="@string/customize_colors"
+            android:parentActivityName=".activities.SettingsActivity"/>
+
+        <activity
+            android:name="com.simplemobiletools.commons.activities.LicenseActivity"
             android:label="@string/third_party_licences"
-            android:parentActivityName=".activities.AboutActivity"/>
+            android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity"/>
 
         <activity
             android:name=".activities.SettingsActivity"

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

@@ -1,9 +0,0 @@
-package com.simplemobiletools.notes.activities
-
-import android.os.Bundle
-
-class AboutActivity : SimpleActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-    }
-}

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

@@ -1,18 +0,0 @@
-package com.simplemobiletools.notes.activities
-
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-
-class LicenseActivity : SimpleActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-    }
-
-    private fun openUrl(id: Int) {
-        val url = resources.getString(id)
-        val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
-        startActivity(browserIntent)
-    }
-}

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

@@ -11,6 +11,10 @@ import android.view.View
 import com.simplemobiletools.commons.dialogs.ConfirmationDialog
 import com.simplemobiletools.commons.extensions.toast
 import com.simplemobiletools.commons.extensions.value
+import com.simplemobiletools.commons.helpers.LICENSE_AMBILWARNA
+import com.simplemobiletools.commons.helpers.LICENSE_KOTLIN
+import com.simplemobiletools.commons.helpers.LICENSE_STETHO
+import com.simplemobiletools.notes.BuildConfig
 import com.simplemobiletools.notes.R
 import com.simplemobiletools.notes.TYPE_NOTE
 import com.simplemobiletools.notes.adapters.NotesPagerAdapter
@@ -92,7 +96,7 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
             R.id.share -> shareText()
             R.id.delete_note -> displayDeleteNotePrompt()
             R.id.settings -> startActivity(Intent(applicationContext, SettingsActivity::class.java))
-            R.id.about -> startActivity(Intent(applicationContext, AboutActivity::class.java))
+            R.id.about -> launchAbout()
             else -> return super.onOptionsItemSelected(item)
         }
         return true
@@ -124,6 +128,10 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
         }
     }
 
+    private fun launchAbout() {
+        startAboutActivity(R.string.app_name, LICENSE_KOTLIN or LICENSE_AMBILWARNA or LICENSE_STETHO, BuildConfig.VERSION_NAME)
+    }
+
     private fun displayDeleteNotePrompt() {
         val message = String.format(getString(R.string.delete_note_prompt_message), mCurrentNote.title)
         ConfirmationDialog(this, message) {

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

@@ -1,27 +1,14 @@
 package com.simplemobiletools.notes.activities
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import com.simplemobiletools.commons.activities.BaseSimpleActivity
-import android.view.MenuItem
-
 import com.simplemobiletools.notes.Config
-import com.simplemobiletools.notes.R
 
-open class SimpleActivity : AppCompatActivity() {
+open class SimpleActivity : BaseSimpleActivity() {
     lateinit var config: Config
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        config = Config.newInstance(applicationContext)
         super.onCreate(savedInstanceState)
-    }
+        config = Config.newInstance(applicationContext)
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            android.R.id.home -> {
-                finish()
-                true
-            }
-            else -> super.onOptionsItemSelected(item)
-        }
     }
 }