Changed navigation between activities.

README.md

@@ -32,9 +32,9 @@ The application contains two modules:
 See [gcUnicorn-webapp album](https://photos.app.goo.gl/vA4nyUmZSjE3HxUQ8) for full resolution screenshots.
 
 ### Android application
-![Main activity](https://goo.gl/A1jLmC) ![Settings activity](https://goo.gl/oGEHA4) ![About activity](https://goo.gl/xvvdJB)
+![Main activity](https://goo.gl/FPmUJ1) ![Settings activity](https://goo.gl/NLgWMW) ![About activity](https://goo.gl/1mWPo6)
 
-See [gcUnicorn-android album](https://photos.app.goo.gl/rkFMoohCSW3YfsYc8) for full resolution screenshots.
+See [gcUnicorn-android album](https://photos.app.goo.gl/8TUfrMJ5ZF7pc8nLA) for full resolution screenshots.
 
 ## How to run
 ### Web application
@@ -198,6 +198,10 @@ Once the properties are provided, signing will be enabled automatically.
 * __Skip premium caches__ - If enabled the tool will simply skip premium caches __earlier__. If you are a _basic member_ and disable this option, the tool will try to load cache's details anyway and once it discovers that it can not load the cache (because you are a _basic member_), it skips it. (The tool has no idea whether you are a _basic member_ or a _premium_ one.)
 
 ## Release notes
+##### 2018-11-23: android v1.0.1
+* __android__
+  * Changed navigation between activities.
+
 ##### 2018-11-23: core v2.0.0 & webapp v1.0.3 & android v1.0.0
 * __core__
   * Removed Java 8 features not available at Android SDK 16. (See [How to build](#core).)

android/build.gradle

@@ -103,7 +103,7 @@ android {
 
         multiDexEnabled true
 
-        versionCode 1
+        versionCode 2
         versionName project.version
 
         vectorDrawables.useSupportLibrary = true

android/gradle.properties

@@ -16,4 +16,4 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
-version=1.0.0
+version=1.0.1

android/src/main/AndroidManifest.xml

@@ -45,6 +45,8 @@
         <activity
                 android:name=".ui.activity.SearchActivity"
                 android:label="@string/activity_search"
+                android:exported="true"
+                android:launchMode="singleTop"
                 android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -65,19 +67,15 @@
         <activity
                 android:name=".ui.activity.SettingsActivity"
                 android:label="@string/action_settings"
-                android:theme="@style/AppTheme.NoActionBar">
-            <meta-data
-                    android:name="android.support.PARENT_ACTIVITY"
-                    android:value=".ui.activity.SearchActivity"/>
+                android:theme="@style/AppTheme.NoActionBar"
+                android:parentActivityName=".ui.activity.SearchActivity">
         </activity>
 
         <activity
                 android:name=".ui.activity.AboutActivity"
                 android:label="@string/action_about"
-                android:theme="@style/AppTheme.NoActionBar">
-            <meta-data
-                    android:name="android.support.PARENT_ACTIVITY"
-                    android:value=".ui.activity.SearchActivity"/>
+                android:theme="@style/AppTheme.NoActionBar"
+                android:parentActivityName=".ui.activity.SearchActivity">
         </activity>
 
         <service

android/src/main/kotlin/cz/babi/gcunicorn/android/ui/activity/AboutActivity.kt

@@ -20,7 +20,9 @@ package cz.babi.gcunicorn.android.ui.activity
 
 import android.content.pm.PackageManager
 import android.os.Bundle
+import android.support.v4.app.NavUtils
 import android.text.method.LinkMovementMethod
+import android.view.MenuItem
 import cz.babi.gcunicorn.android.R
 import kotlinx.android.synthetic.main.activity_about.about_toolbar as toolbar
 import kotlinx.android.synthetic.main.layout_about.about_app_name as appNameTextView
@@ -30,7 +32,7 @@ import kotlinx.android.synthetic.main.layout_about.about_github as githubTextVie
  * About activity.
  *
  * @author Martin Misiarz `<dev.misiarz@gmail.com>`
- * @version 1.0.0
+ * @version 1.0.1
  * @since 1.0.0
  */
 class AboutActivity : BaseAppCompatActivity() {
@@ -39,7 +41,6 @@ class AboutActivity : BaseAppCompatActivity() {
         setContentView(R.layout.activity_about)
 
         setSupportActionBar(toolbar)
-        supportActionBar?.setHomeButtonEnabled(true)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
         val version: String = try {
@@ -49,4 +50,15 @@ class AboutActivity : BaseAppCompatActivity() {
         appNameTextView.text = getString(R.string.text_app_name) + "-" + getString(R.string.text_android) + version
         githubTextView.movementMethod = LinkMovementMethod.getInstance()
     }
-}
+
+    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+        return when (item?.itemId) {
+            android.R.id.home -> {
+                NavUtils.navigateUpFromSameTask(this)
+
+                return true
+            }
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+}

android/src/main/kotlin/cz/babi/gcunicorn/android/ui/activity/SearchActivity.kt

@@ -89,7 +89,7 @@ import kotlinx.android.synthetic.main.layout_search.search_skip_premium as skipP
  * Search activity.
  *
  * @author Martin Misiarz `<dev.misiarz@gmail.com>`
- * @version 1.0.0
+ * @version 1.0.1
  * @since 1.0.0
  */
 class SearchActivity : BaseAppCompatActivity(), ActivityCompat.OnRequestPermissionsResultCallback {
@@ -260,6 +260,10 @@ class SearchActivity : BaseAppCompatActivity(), ActivityCompat.OnRequestPermissi
                 startActivity(Intent(this, AboutActivity::class.java))
                 true
             }
+            android.R.id.home -> {
+                finish()
+                true
+            }
             else -> super.onOptionsItemSelected(item)
         }
     }
@@ -293,6 +297,12 @@ class SearchActivity : BaseAppCompatActivity(), ActivityCompat.OnRequestPermissi
 
         setSupportActionBar(toolbar)
 
+        intent?.let {
+            if (it.action == LocusConst.INTENT_ITEM_POINT_TOOLS || it.action == LocusConst.INTENT_ITEM_MAIN_FUNCTION_GC) {
+                supportActionBar?.setDisplayHomeAsUpEnabled(true)
+            }
+        }
+
         // Fill the spinner with available cache types.
         cacheTypeSpinner.adapter = ArrayAdapter(this, R.layout.item_spinner, CacheType.values().map { it.pattern })
                 .apply {

android/src/main/kotlin/cz/babi/gcunicorn/android/ui/activity/SettingsActivity.kt

@@ -19,22 +19,35 @@
 package cz.babi.gcunicorn.android.ui.activity
 
 import android.os.Bundle
+import android.support.v4.app.NavUtils
+import android.view.MenuItem
 import cz.babi.gcunicorn.android.R
 import kotlinx.android.synthetic.main.activity_settings.settings_toolbar as toolbar
 
 /**
  * Settings activity.
  *
- * @author Martin Misiarz
- * @author dev.misiarz@gmail.com
+ * @author Martin Misiarz `<dev.misiarz@gmail.com>`
+ * @version 1.0.1
+ * @since 1.0.0
  */
 class SettingsActivity : BaseAppCompatActivity() {
 
     override fun onAfterCreate(savedInstanceState: Bundle?) {
         setContentView(R.layout.activity_settings)
 
         setSupportActionBar(toolbar)
-        supportActionBar?.setHomeButtonEnabled(true)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
     }
+
+    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+        return when (item?.itemId) {
+            android.R.id.home -> {
+                NavUtils.navigateUpFromSameTask(this)
+
+                return true
+            }
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
 }