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

Merge branch 'develop' into native_account

This commit is contained in:
Mariotaku Lee 2016-12-02 12:42:49 +08:00
parent 756a6dbb4d f6ed7e12d7
commit 5dc912088e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
twidere/build.gradle
View File

@ -35,8 +35,8 @@ android {
applicationId "org.mariotaku.twidere" applicationId "org.mariotaku.twidere"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 25 targetSdkVersion 25
versionCode 216 versionCode 217
versionName '3.2.12' versionName '3.2.13'
multiDexEnabled true multiDexEnabled true
buildConfigField 'boolean', 'LEAK_CANARY_ENABLED', 'Boolean.parseBoolean("false")' buildConfigField 'boolean', 'LEAK_CANARY_ENABLED', 'Boolean.parseBoolean("false")'

2
twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/UserListExtraConfiguration.kt
View File

@ -36,7 +36,7 @@ class UserListExtraConfiguration(key: String) : TabConfiguration.ExtraConfigurat
} }
override fun onCreateView(context: Context, parent: ViewGroup): View { override fun onCreateView(context: Context, parent: ViewGroup): View {
return LayoutInflater.from(context).inflate(R.layout.list_item_simple_user_list, parent, false) return LayoutInflater.from(context).inflate(R.layout.layout_extra_config_user_list, parent, false)
} }
override fun onViewCreated(context: Context, view: View, fragment: TabEditorDialogFragment) { override fun onViewCreated(context: Context, view: View, fragment: TabEditorDialogFragment) {