Skip to content

Commit

Permalink
Merge branch 'release/1.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
sangcomz committed Dec 15, 2022
2 parents bed56f5 + d5c6e68 commit 128187b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ class DetailImageActivity : BaseActivity(), DetailImageContract.View, OnPageChan

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
window.requestFeature(Window.FEATURE_CONTENT_TRANSITIONS)
}
setContentView(R.layout.activity_detail_activity)
initView()

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ _FishBun_ is a highly customizable image picker for Android.
<img src="/pic/fishbuns.png">


## What's New in _FishBun_ 1.1.0? :tada:
## What's New in _FishBun_? :tada:

- sdk version update
- fix crash issue [#234](https://github.com/sangcomz/FishBun/issues/234) [#253](https://github.com/sangcomz/FishBun/issues/253)


## Customizable Styles
Expand Down
2 changes: 1 addition & 1 deletion publish/release.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ githubRelease {
tagName = version
targetCommitish = 'master'
body = """## Release Note
* update sdk version to 33
* fix issue #234 #254
"""
name = version
}
4 changes: 2 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include ':FishBunDemo', ':FishBun'

gradle.ext.versionCode = 36
gradle.ext.versionName = '1.1.0'
gradle.ext.versionCode = 37
gradle.ext.versionName = '1.1.1'

gradle.ext.set('minSdk', 15)
gradle.ext.set('targetSdk', 33)
Expand Down

0 comments on commit 128187b

Please sign in to comment.