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

improved user fragment ui

This commit is contained in:
Mariotaku Lee 2017-10-29 00:13:36 +08:00
parent 763452e335
commit 97a8df5f99
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt
View File

@ -164,8 +164,6 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
private var uiColor: Int = 0 private var uiColor: Int = 0
private var primaryColor: Int = 0 private var primaryColor: Int = 0
private var nameFirst: Boolean = false private var nameFirst: Boolean = false
private var previousTabItemIsDark: Int = 0
private var previousActionBarItemIsDark: Int = 0
private var hideBirthdayView: Boolean = false private var hideBirthdayView: Boolean = false
private val friendshipLoaderCallbacks = object : LoaderCallbacks<SingleResponse<ParcelableRelationship>> { private val friendshipLoaderCallbacks = object : LoaderCallbacks<SingleResponse<ParcelableRelationship>> {
@ -1250,9 +1248,6 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
private fun setUiColor(color: Int) { private fun setUiColor(color: Int) {
val theme = Chameleon.getOverrideTheme(activity, activity) val theme = Chameleon.getOverrideTheme(activity, activity)
uiColor = if (color != 0) color else theme.colorPrimary uiColor = if (color != 0) color else theme.colorPrimary
previousActionBarItemIsDark = 0
previousTabItemIsDark = 0
setupViewStyle()
val activity = activity as BaseActivity val activity = activity as BaseActivity
primaryColor = if (theme.isToolbarColored) { primaryColor = if (theme.isToolbarColored) {
color color
@ -1291,11 +1286,9 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
val actionBarElevation = ThemeUtils.getSupportActionBarElevation(activity) val actionBarElevation = ThemeUtils.getSupportActionBarElevation(activity)
ViewCompat.setElevation(toolbar, actionBarElevation) ViewCompat.setElevation(toolbar, actionBarElevation)
// ViewCompat.setElevation(profileHeader, actionBarElevation)
ViewCompat.setElevation(statusBarBackground, actionBarElevation * 2) ViewCompat.setElevation(statusBarBackground, actionBarElevation * 2)
ViewSupport.setOutlineProvider(toolbar, ViewOutlineProviderCompat.BACKGROUND) ViewSupport.setOutlineProvider(toolbar, ViewOutlineProviderCompat.BACKGROUND)
// ViewSupport.setOutlineProvider(profileHeader, ViewOutlineProviderCompat.BOUNDS)
ViewSupport.setOutlineProvider(statusBarBackground, null) ViewSupport.setOutlineProvider(statusBarBackground, null)
} }

17
twidere/src/main/kotlin/org/mariotaku/twidere/view/behavior/userprofile/ToolbarBehavior.kt
View File

@ -41,9 +41,20 @@ internal class ToolbarBehavior(context: Context?, attrs: AttributeSet? = null) :
return dependency.id == R.id.profileHeader return dependency.id == R.id.profileHeader
} }
@SuppressLint("RestrictedApi") override fun onLayoutChild(parent: CoordinatorLayout, child: Toolbar, layoutDirection: Int): Boolean {
val ret = super.onLayoutChild(parent, child, layoutDirection)
updateToolbarFactor(parent, child, parent.getDependencies(child).first())
return ret
}
override fun onDependentViewChanged(parent: CoordinatorLayout, child: Toolbar, dependency: View): Boolean { override fun onDependentViewChanged(parent: CoordinatorLayout, child: Toolbar, dependency: View): Boolean {
val actionBarBackground = child.background as? ActionBarDrawable ?: return false if (updateToolbarFactor(parent, child, dependency)) return false
return true
}
@SuppressLint("RestrictedApi")
private fun updateToolbarFactor(parent: CoordinatorLayout, child: Toolbar, dependency: View): Boolean {
val actionBarBackground = child.background as? ActionBarDrawable ?: return true
val bannerContainer = parent.profileBannerContainer val bannerContainer = parent.profileBannerContainer
val detailsBackground = parent.profileHeaderBackground val detailsBackground = parent.profileHeaderBackground
val bannerBottom = dependency.top + bannerContainer.bottom val bannerBottom = dependency.top + bannerContainer.bottom
@ -69,7 +80,7 @@ internal class ToolbarBehavior(context: Context?, attrs: AttributeSet? = null) :
ThemeUtils.applyToolbarItemColor(parent.context, child, currentActionBarColor) ThemeUtils.applyToolbarItemColor(parent.context, child, currentActionBarColor)
} }
this.actionItemIsDark = actionItemIsDark this.actionItemIsDark = actionItemIsDark
return true return false
} }
} }