Skip to content
Snippets Groups Projects
Commit 62c0e1bd authored by John's avatar John
Browse files

Update Alakazam

parent 7319eb2f
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -95,7 +95,7 @@ android {
ext {
supportLibVersion = '27.0.1'
retrofitVersion = '2.3.0'
okHttpVersion = '3.9.0'
okHttpVersion = '3.9.1'
butterknifeVersion = '8.8.1'
parcelerVersion = '1.1.9'
reptarVersion = '2.5.1'
Loading
Loading
@@ -103,7 +103,6 @@ ext {
materialDialogsVersion = '0.9.5.0'
leakCanaryVersion = '1.5.3'
addendumVersion = '1.6.0'
alakazamVersion = '1.0.1'
moshiVersion = '1.5.0'
}
 
Loading
Loading
@@ -172,8 +171,7 @@ dependencies {
implementation 'com.github.Commit451:Jounce:1.0.2'
implementation 'com.github.Commit451:ForegroundViews:2.4.0'
implementation 'com.github.Commit451:MorphTransitions:2.0.0'
implementation "com.github.Commit451.Alakazam:alakazam:$alakazamVersion"
implementation "com.github.Commit451.Alakazam:alakazam-kotlin:$alakazamVersion"
implementation "com.github.Commit451:Alakazam:2.0.0"
implementation 'com.github.Commit451:Lift:2.0.1'
implementation 'com.github.Commit451:okyo:3.0.1'
implementation 'com.github.Commit451:OkioProGuardRules:1.11.0.0'
Loading
Loading
@@ -206,7 +204,7 @@ dependencies {
 
implementation 'de.hdodenhof:circleimageview:2.2.0'
 
implementation('com.vdurmont:emoji-java:3.3.0') {
implementation('com.vdurmont:emoji-java:4.0.0') {
exclude group: 'org.json', module: 'json'
}
 
Loading
Loading
@@ -214,7 +212,7 @@ dependencies {
 
implementation 'com.atlassian.commonmark:commonmark:0.10.0'
 
normalImplementation('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
normalImplementation('com.crashlytics.sdk.android:crashlytics:2.7.1@aar') {
transitive = true
}
 
Loading
Loading
Loading
Loading
@@ -20,7 +20,8 @@ import butterknife.ButterKnife
import com.commit451.addendum.parceler.getParcelerParcelableExtra
import com.commit451.addendum.parceler.putParcelerParcelableExtra
import com.commit451.addendum.themeAttrColor
import com.commit451.alakazam.Alakazam
import com.commit451.alakazam.navigationBarColorAnimator
import com.commit451.easel.Easel
import com.commit451.gitlab.App
import com.commit451.gitlab.R
Loading
Loading
@@ -126,7 +127,7 @@ class GroupActivity : BaseActivity() {
val darkerColor = Easel.darkerColor(vibrantColor)
 
if (Build.VERSION.SDK_INT >= 21) {
Alakazam.navigationBarColorAnimator(window, darkerColor)
window.navigationBarColorAnimator(darkerColor)
.setDuration(animationTime.toLong())
.start()
}
Loading
Loading
Loading
Loading
@@ -16,8 +16,8 @@ import butterknife.ButterKnife
import com.commit451.addendum.parceler.getParcelerParcelableExtra
import com.commit451.addendum.parceler.putParcelerParcelableExtra
import com.commit451.addendum.themeAttrColor
import com.commit451.alakazam.Alakazam
import com.commit451.easel.Easel
import com.commit451.alakazam.navigationBarColorAnimator
import com.commit451.gitlab.App
import com.commit451.gitlab.R
import com.commit451.gitlab.extension.feedUrl
Loading
Loading
@@ -96,7 +96,7 @@ class UserActivity : BaseActivity() {
val darkerColor = this.themeAttrColor(vibrantColor)
 
if (Build.VERSION.SDK_INT >= 21) {
Alakazam.navigationBarColorAnimator(window, darkerColor)
window.navigationBarColorAnimator(darkerColor)
.setDuration(animationTime.toLong())
.start()
window.statusBarColor = darkerColor
Loading
Loading
Loading
Loading
@@ -15,8 +15,7 @@ import butterknife.BindView
import butterknife.ButterKnife
import butterknife.OnClick
import com.commit451.addendum.themeAttrColor
import com.commit451.alakazam.HideRunnable
import com.commit451.easel.Easel
import com.commit451.alakazam.fadeOut
import com.commit451.gitlab.App
import com.commit451.gitlab.BuildConfig
import com.commit451.gitlab.R
Loading
Loading
@@ -256,7 +255,7 @@ class LabCoatNavigationView : NavigationView {
listAccounts.animate().alpha(1.0f)
iconArrow.animate().rotation(180.0f)
} else {
listAccounts.animate().alpha(0.0f).withEndAction(HideRunnable(listAccounts))
listAccounts.fadeOut()
iconArrow.animate().rotation(0.0f)
}
}
Loading
Loading
Loading
Loading
@@ -57,7 +57,8 @@ class UserFeedWidgetProvider : AppWidgetProvider() {
//TODO alert the user to this misfortune?
Timber.e("Error getting account or feed url")
} else {
val feedUrl = account.serverUrl + "/${account.username}.atom"
val feedUrl = account.serverUrl + "${account.username}.atom"
Timber.d("Feed url: $feedUrl")
val intent = FeedWidgetService.newIntent(context, widgetId, account, feedUrl)
// When intents are compared, the extras are ignored, so we need to embed the extras
// into the data so that the extras will not be ignored.
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment