From 63467bca6cabad84caabff69dd199fd85cd8962e Mon Sep 17 00:00:00 2001 From: Tyler Wong Date: Thu, 20 Aug 2020 23:37:21 -0700 Subject: [PATCH] Prepare Release 1.0.0-alpha01 --- app/build.gradle.kts | 6 ++++++ app/src/main/java/me/tylerbwong/stack/ui/MainActivity.kt | 2 ++ .../me/tylerbwong/stack/ui/bookmarks/BookmarksFragment.kt | 5 +++++ .../java/me/tylerbwong/stack/ui/drafts/DraftsFragment.kt | 5 +++++ .../java/me/tylerbwong/stack/ui/search/SearchFragment.kt | 5 +++++ app/src/main/res/menu/menu_main.xml | 3 ++- buildSrc/src/main/kotlin/AndroidConfig.kt | 4 ++-- .../main/kotlin/me/tylerbwong/stack/plugins/StackPlugin.kt | 2 +- gradle.properties | 1 + 9 files changed, 29 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index bb941a8b..7a596dab 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -24,6 +24,12 @@ android { viewBinding = true } + buildTypes { + getByName("release") { + isShrinkResources = true + } + } + composeOptions { kotlinCompilerVersion = Versions.kotlin kotlinCompilerExtensionVersion = Versions.compose diff --git a/app/src/main/java/me/tylerbwong/stack/ui/MainActivity.kt b/app/src/main/java/me/tylerbwong/stack/ui/MainActivity.kt index b0272359..90242f6f 100755 --- a/app/src/main/java/me/tylerbwong/stack/ui/MainActivity.kt +++ b/app/src/main/java/me/tylerbwong/stack/ui/MainActivity.kt @@ -213,6 +213,8 @@ class MainActivity : BaseActivity( .show(fragment) .commit() + invalidateOptionsMenu() + hideKeyboard() true diff --git a/app/src/main/java/me/tylerbwong/stack/ui/bookmarks/BookmarksFragment.kt b/app/src/main/java/me/tylerbwong/stack/ui/bookmarks/BookmarksFragment.kt index bf3fa3b3..d7cda5ce 100644 --- a/app/src/main/java/me/tylerbwong/stack/ui/bookmarks/BookmarksFragment.kt +++ b/app/src/main/java/me/tylerbwong/stack/ui/bookmarks/BookmarksFragment.kt @@ -26,6 +26,11 @@ class BookmarksFragment : BaseFragment(HomeFragmentBinding: private val bottomNav by lazy { activity?.findViewById(R.id.bottomNav) } + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setHasOptionsMenu(false) + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) viewModel.siteLiveData.observe(viewLifecycleOwner) { diff --git a/app/src/main/java/me/tylerbwong/stack/ui/drafts/DraftsFragment.kt b/app/src/main/java/me/tylerbwong/stack/ui/drafts/DraftsFragment.kt index cdae9f79..a3f0a5de 100644 --- a/app/src/main/java/me/tylerbwong/stack/ui/drafts/DraftsFragment.kt +++ b/app/src/main/java/me/tylerbwong/stack/ui/drafts/DraftsFragment.kt @@ -26,6 +26,11 @@ class DraftsFragment : BaseFragment(HomeFragmentBinding::in private val bottomNav by lazy { activity?.findViewById(R.id.bottomNav) } + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setHasOptionsMenu(false) + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) viewModel.siteLiveData.observe(viewLifecycleOwner) { diff --git a/app/src/main/java/me/tylerbwong/stack/ui/search/SearchFragment.kt b/app/src/main/java/me/tylerbwong/stack/ui/search/SearchFragment.kt index 06283b09..b43a4ee5 100644 --- a/app/src/main/java/me/tylerbwong/stack/ui/search/SearchFragment.kt +++ b/app/src/main/java/me/tylerbwong/stack/ui/search/SearchFragment.kt @@ -33,6 +33,11 @@ class SearchFragment : BaseFragment(HomeFragmentBinding::in FilterInputItem(viewModel.searchPayload) { payload -> viewModel.search(payload) } ) + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setHasOptionsMenu(false) + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) binding.recyclerView.apply { diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 6a0a05b5..141d7f84 100755 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -7,5 +7,6 @@ android:id="@+id/settings" android:icon="@drawable/ic_settings" android:title="@string/settings" - app:showAsAction="never" /> + android:orderInCategory="100" + app:showAsAction="ifRoom" /> diff --git a/buildSrc/src/main/kotlin/AndroidConfig.kt b/buildSrc/src/main/kotlin/AndroidConfig.kt index 2986f242..9fbea403 100644 --- a/buildSrc/src/main/kotlin/AndroidConfig.kt +++ b/buildSrc/src/main/kotlin/AndroidConfig.kt @@ -3,6 +3,6 @@ object AndroidConfig { const val COMPILE_SDK = 30 const val MIN_SDK = 23 const val TARGET_SDK = 30 - const val VERSION_CODE = 6 - const val VERSION_NAME = "0.2.2" + const val VERSION_CODE = 7 + const val VERSION_NAME = "1.0.0-alpha01" } diff --git a/buildSrc/src/main/kotlin/me/tylerbwong/stack/plugins/StackPlugin.kt b/buildSrc/src/main/kotlin/me/tylerbwong/stack/plugins/StackPlugin.kt index 2184b1a2..83063bc6 100644 --- a/buildSrc/src/main/kotlin/me/tylerbwong/stack/plugins/StackPlugin.kt +++ b/buildSrc/src/main/kotlin/me/tylerbwong/stack/plugins/StackPlugin.kt @@ -54,7 +54,7 @@ class StackPlugin : Plugin { buildTypes { getByName("release") { - isMinifyEnabled = false + isMinifyEnabled = true proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro") } } diff --git a/gradle.properties b/gradle.properties index 00b4024c..07ce1b8e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,6 +12,7 @@ # org.gradle.parallel=true #Sat Dec 21 17:04:08 PST 2019 android.enableJetifier=true +android.enableR8.fullMode=true android.useAndroidX=true kotlin.code.style=official org.gradle.configureondemand=false