Skip to content

Commit

Permalink
Prepare Release 1.0.0-alpha01
Browse files Browse the repository at this point in the history
  • Loading branch information
tylerbwong committed Aug 21, 2020
1 parent 06dc705 commit 63467bc
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 4 deletions.
6 changes: 6 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ android {
viewBinding = true
}

buildTypes {
getByName("release") {
isShrinkResources = true
}
}

composeOptions {
kotlinCompilerVersion = Versions.kotlin
kotlinCompilerExtensionVersion = Versions.compose
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/me/tylerbwong/stack/ui/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(
.show(fragment)
.commit()

invalidateOptionsMenu()

hideKeyboard()

true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ class BookmarksFragment : BaseFragment<HomeFragmentBinding>(HomeFragmentBinding:

private val bottomNav by lazy { activity?.findViewById<View>(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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ class DraftsFragment : BaseFragment<HomeFragmentBinding>(HomeFragmentBinding::in

private val bottomNav by lazy { activity?.findViewById<View>(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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ class SearchFragment : BaseFragment<HomeFragmentBinding>(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 {
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/menu/menu_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
</menu>
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/AndroidConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class StackPlugin : Plugin<Project> {

buildTypes {
getByName("release") {
isMinifyEnabled = false
isMinifyEnabled = true
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
}
}
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 63467bc

Please sign in to comment.