Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

updated versions

This commit is contained in:
Mariotaku Lee 2018-05-01 12:48:36 +08:00
parent afdb786de6
commit 8b24ebc6bf
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@ -6,7 +6,7 @@ buildscript {
maven { url 'https://plugins.gradle.org/m2/' } maven { url 'https://plugins.gradle.org/m2/' }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.1.1' classpath 'com.android.tools.build:gradle:3.1.2'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
} }
@ -43,12 +43,12 @@ subprojects {
libVersions = [ libVersions = [
Kotlin : "${kotlinVersion}", Kotlin : "${kotlinVersion}",
MultiDex : '1.0.3', MultiDex : '1.0.3',
SupportLib : '27.1.0', SupportLib : '27.1.1',
SupportTest : '1.0.0', SupportTest : '1.0.0',
MariotakuCommons : '0.9.22', MariotakuCommons : '0.9.22',
RestFu : '0.9.61', RestFu : '0.9.61',
ObjectCursor : '0.9.21', ObjectCursor : '0.9.21',
PlayServices : '11.8.0', PlayServices : '15.0.0',
PlayBilling : '1.0', PlayBilling : '1.0',
MapsUtils : '0.5', MapsUtils : '0.5',
DropboxCoreSdk : '3.0.3', DropboxCoreSdk : '3.0.3',
@ -78,9 +78,9 @@ subprojects {
ACRA : '4.9.2', ACRA : '4.9.2',
AbstractTask : '0.9.8', AbstractTask : '0.9.8',
Dagger : '2.11', Dagger : '2.11',
StethoBeanShellREPL : '0.3', StethoBeanShellREPL : '0.5',
ArchLifecycleExtensions: '1.1.1', ArchLifecycleExtensions: '1.1.1',
ArchPaging : '1.0.0-alpha7', ArchPaging : '1.0.0-rc1',
ConstraintLayout : '1.1.0-beta6', ConstraintLayout : '1.1.0-beta6',
MessageBubbleView : '2.1', MessageBubbleView : '2.1',
] ]

6
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserQrDialogFragment.kt
View File

@ -78,8 +78,7 @@ class UserQrDialogFragment : BaseDialogFragment() {
private val user: ParcelableUser private val user: ParcelableUser
get() = arguments!!.user!! get() = arguments!!.user!!
override fun onCreate(savedInstanceState: Bundle?) { init {
super.onCreate(savedInstanceState)
setStyle(STYLE_NO_FRAME, R.style.Theme_Twidere_Dark_Dialog_NoFrame) setStyle(STYLE_NO_FRAME, R.style.Theme_Twidere_Dark_Dialog_NoFrame)
} }
@ -134,7 +133,8 @@ class UserQrDialogFragment : BaseDialogFragment() {
background.recycle() background.recycle()
return@then result return@then result
}.successUi { bitmap -> }.successUi { bitmap ->
val fragment = weakThis?.takeIf { it.context != null && it.view != null } ?: return@successUi val fragment = weakThis?.takeIf { it.context != null && it.view != null }
?: return@successUi
fragment.qrView.visibility = View.VISIBLE fragment.qrView.visibility = View.VISIBLE
fragment.qrProgress.visibility = View.GONE fragment.qrProgress.visibility = View.GONE
fragment.qrView.setImageDrawable(BitmapDrawable(fragment.resources, bitmap).apply { fragment.qrView.setImageDrawable(BitmapDrawable(fragment.resources, bitmap).apply {