mirror of
https://github.com/TwidereProject/Twidere-Android
synced 2025-02-16 19:50:53 +01:00
updated travis config
This commit is contained in:
parent
ca2fe166fe
commit
11c1b925dd
32
.travis.yml
32
.travis.yml
@ -1,15 +1,10 @@
|
||||
language: android
|
||||
|
||||
android:
|
||||
components:
|
||||
# Uncomment the lines below if you want to
|
||||
# use the latest revision of Android SDK Tools
|
||||
- platform-tools
|
||||
- tools
|
||||
|
||||
# The BuildTools version used by your project
|
||||
- platform-tools
|
||||
- build-tools-25.0.2
|
||||
|
||||
# The SDK version used to compile your project
|
||||
- android-25
|
||||
|
||||
# Additional components
|
||||
@ -22,10 +17,6 @@ android:
|
||||
- 'android-sdk-license-.+'
|
||||
- 'google-gdk-license-.+'
|
||||
|
||||
# Specify at least one system image,
|
||||
# if you need to run emulator(s) during your tests
|
||||
# - sys-img-armeabi-v7a-android-19
|
||||
# - sys-img-x86-android-17
|
||||
sudo: false
|
||||
|
||||
jdk:
|
||||
@ -45,14 +36,14 @@ addons:
|
||||
- openssh-client
|
||||
- git
|
||||
|
||||
#before_cache:
|
||||
# - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
|
||||
# - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
|
||||
#cache:
|
||||
# directories:
|
||||
# - $HOME/.gradle/caches/
|
||||
# - $HOME/.gradle/wrapper/
|
||||
# - $HOME/.m2/
|
||||
before_cache:
|
||||
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
|
||||
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
|
||||
cache:
|
||||
directories:
|
||||
- $HOME/.gradle/caches/
|
||||
- $HOME/.gradle/wrapper/
|
||||
- $HOME/.m2/
|
||||
|
||||
before_install:
|
||||
- openssl aes-256-cbc -K $encrypted_9b8203f9524d_key -iv $encrypted_9b8203f9524d_iv -in travis/configs/twidere_private_config.tar.gz.enc -out travis/configs/twidere_private_config.tar.gz -d
|
||||
@ -79,7 +70,8 @@ before_script:
|
||||
# Validate if Google components fetched successfully
|
||||
- test -f twidere/src/google/AndroidManifest.xml
|
||||
|
||||
script: ./gradlew compileGoogleReleaseKotlin
|
||||
script:
|
||||
- ./gradlew build
|
||||
|
||||
deploy:
|
||||
provider: releases
|
||||
|
@ -161,7 +161,6 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
|
||||
private set
|
||||
private var account: AccountDetails? = null
|
||||
private var relationship: ParcelableRelationship? = null
|
||||
private var locale: Locale? = null
|
||||
private var getUserInfoLoaderInitialized: Boolean = false
|
||||
private var getFriendShipLoaderInitialized: Boolean = false
|
||||
private var bannerWidth: Int = 0
|
||||
@ -502,6 +501,8 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
|
||||
} else {
|
||||
createdAtContainer.visibility = View.GONE
|
||||
}
|
||||
val locale = Locale.getDefault()
|
||||
|
||||
listedContainer.listedCount.text = Utils.getLocalizedNumber(locale, user.listed_count)
|
||||
val groupsCount = if (user.extras != null) user.extras.groups_count else -1
|
||||
groupsContainer.groupsCount.text = Utils.getLocalizedNumber(locale, groupsCount)
|
||||
@ -667,7 +668,6 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
|
||||
userColorNameManager.registerColorChangedListener(this)
|
||||
userColorNameManager.registerNicknameChangedListener(this)
|
||||
nameFirst = preferences.getBoolean(KEY_NAME_FIRST)
|
||||
locale = resources.configuration.locale
|
||||
cardBackgroundColor = ThemeUtils.getCardBackgroundColor(activity,
|
||||
ThemeUtils.getThemeBackgroundOption(activity),
|
||||
ThemeUtils.getUserThemeBackgroundAlpha(activity))
|
||||
@ -683,7 +683,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
|
||||
})
|
||||
|
||||
|
||||
userFragmentView.setWindowInsetsListener { left, top, right, bottom ->
|
||||
userFragmentView.setWindowInsetsListener { _, top, _, _ ->
|
||||
profileContentContainer.setPadding(0, top, 0, 0)
|
||||
profileBannerSpace.statusBarHeight = top
|
||||
|
||||
@ -695,7 +695,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
|
||||
profileBannerSpace.toolbarHeight = toolbarHeight
|
||||
}
|
||||
}
|
||||
profileContentContainer.setOnSizeChangedListener { view, w, h, oldw, oldh ->
|
||||
profileContentContainer.setOnSizeChangedListener { _, _, _, _, _ ->
|
||||
val toolbarHeight = toolbar.measuredHeight
|
||||
userProfileDrawer.setPadding(0, toolbarHeight, 0, 0)
|
||||
profileBannerSpace.toolbarHeight = toolbarHeight
|
||||
@ -947,7 +947,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
|
||||
val paging = Paging()
|
||||
paging.count(100)
|
||||
do {
|
||||
val resp = getUserListMemberships(user.key.id, paging, true)
|
||||
val resp = getUserListMemberships(id, paging, true)
|
||||
result.addAll(resp)
|
||||
nextCursor = resp.nextCursor
|
||||
paging.cursor(nextCursor)
|
||||
@ -1317,9 +1317,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
|
||||
uiColor = color
|
||||
previousActionBarItemIsDark = 0
|
||||
previousTabItemIsDark = 0
|
||||
if (actionBarBackground == null) {
|
||||
setupBaseActionBar()
|
||||
}
|
||||
setupBaseActionBar()
|
||||
val activity = activity as BaseActivity
|
||||
val theme = Chameleon.getOverrideTheme(activity, activity)
|
||||
if (theme.isToolbarColored) {
|
||||
@ -1328,9 +1326,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
|
||||
primaryColor = theme.colorToolbar
|
||||
}
|
||||
primaryColorDark = ChameleonUtils.darkenColor(primaryColor)
|
||||
if (actionBarBackground != null) {
|
||||
actionBarBackground!!.color = primaryColor
|
||||
}
|
||||
actionBarBackground.color = primaryColor
|
||||
val taskColor: Int
|
||||
if (theme.isToolbarColored) {
|
||||
taskColor = ColorUtils.setAlphaComponent(color, 0xFF)
|
||||
@ -1438,7 +1434,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
|
||||
tabOutlineAlphaFactor = 1f
|
||||
}
|
||||
|
||||
actionBarBackground?.apply {
|
||||
actionBarBackground.apply {
|
||||
this.factor = factor
|
||||
this.outlineAlphaFactor = tabOutlineAlphaFactor
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user