waltercool/Husky
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

upgrade deps, fix some lint warnings

Browse Source
This commit is contained in:
Conny Duck 2019-02-11 16:59:01 +01:00
parent f4bf446a90
commit dc836bcae8
13 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/build.gradle
View File

@ -74,21 +74,22 @@ android {
}
}
ext.daggerVersion = '2.19'
ext.daggerVersion = '2.21'
// if libraries are changed here, they should also be changed in LicenseActivity
dependencies {
implementation('com.mikepenz:materialdrawer:6.1.1@aar') {
transitive = true
}
implementation 'androidx.core:core:1.0.1'
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.browser:browser:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
implementation 'com.google.android.material:material:1.1.0-alpha02'
implementation 'com.google.android.material:material:1.1.0-alpha03'
implementation 'androidx.exifinterface:exifinterface:1.0.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.preference:preference:1.1.0-alpha02'
implementation 'androidx.preference:preference:1.1.0-alpha03'
implementation 'com.squareup.retrofit2:retrofit:2.5.0'
implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.5.0'
@ -122,7 +123,7 @@ dependencies {
implementation "com.google.dagger:dagger-android-support:$daggerVersion"
kapt "com.google.dagger:dagger-android-processor:$daggerVersion"
testImplementation 'org.robolectric:robolectric:4.1'
testImplementation 'org.mockito:mockito-inline:2.23.4'
testImplementation 'org.mockito:mockito-inline:2.24.0'
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0"
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
exclude group: 'com.android.support', module: 'support-annotations'
@ -130,7 +131,7 @@ dependencies {
androidTestImplementation('android.arch.persistence.room:testing:1.1.1')
androidTestImplementation "androidx.test.ext:junit:1.1.0"
debugImplementation 'im.dino:dbinspector:3.4.1@aar'
implementation 'io.reactivex.rxjava2:rxjava:2.2.4'
implementation 'io.reactivex.rxjava2:rxjava:2.2.6'
implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0'
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.5.0'

6
app/src/main/java/com/keylesspalace/tusky/di/ActivitiesModule.kt
View File

@ -62,13 +62,13 @@ abstract class ActivitiesModule {
@ContributesAndroidInjector(modules = [FragmentBuildersModule::class])
abstract fun contribtutesSearchAvtivity(): SearchActivity
@ContributesAndroidInjector()
@ContributesAndroidInjector
abstract fun contributesAboutActivity(): AboutActivity
@ContributesAndroidInjector()
@ContributesAndroidInjector
abstract fun contributesLoginActivity(): LoginActivity
@ContributesAndroidInjector()
@ContributesAndroidInjector
abstract fun contributesSplashActivity(): SplashActivity
@ContributesAndroidInjector

2
app/src/main/java/com/keylesspalace/tusky/di/NetworkModule.kt
View File

@ -47,7 +47,7 @@ import javax.inject.Singleton
@Module
class NetworkModule {
@Provides
@IntoMap()
@IntoMap
@ClassKey(Spanned::class)
fun providesSpannedTypeAdapter(): JsonDeserializer<*> = SpannedTypeAdapter()

1
app/src/main/java/com/keylesspalace/tusky/view/ComposeOptionsView.kt
View File

@ -16,7 +16,6 @@
package com.keylesspalace.tusky.view
import android.content.Context
import android.os.Build
import android.util.AttributeSet
import android.widget.LinearLayout
import com.keylesspalace.tusky.R

2
app/src/main/java/com/keylesspalace/tusky/view/MediaPreviewImageView.kt
View File

@ -99,7 +99,7 @@ defStyleAttr: Int = 0
* that the custom matrix of this image is initialized if a focus point is set.
*/
override fun onSuccess() {
onSizeChanged(width, height, width, height);
onSizeChanged(width, height, width, height)
}
// We do not handle the error here, instead it will be handled higher up the call chain.

1
app/src/main/res/layout/activity_account.xml
View File

@ -135,7 +135,6 @@
android:id="@+id/accountNoteTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/labelBarrier"
android:lineSpacingMultiplier="1.1"
android:paddingTop="10dp"
android:textColor="?android:textColorTertiary"

11
app/src/main/res/layout/dialog_emojicompat.xml
View File

@ -9,7 +9,8 @@
android:id="@+id/emoji_font_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="vertical"
app:layout_constraintTop_toTopOf="parent">
<include
android:id="@+id/item_blobmoji"
@ -29,14 +30,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lineSpacingMultiplier="1.1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:paddingBottom="8dp"
android:paddingEnd="24dp"
android:paddingStart="24dp"
android:paddingTop="16dp"
android:paddingEnd="24dp"
android:paddingBottom="8dp"
android:text="@string/download_fonts"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/emoji_font_list" />
</androidx.constraintlayout.widget.ConstraintLayout>

3
app/src/main/res/layout/item_account_field.xml
View File

@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="4dp">
<!-- 30% width for the field name, 70% for the value -->
@ -18,6 +17,7 @@
android:textColor="?android:textColorPrimary"
android:textSize="?attr/status_text_medium"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_percent=".3"
tools:text="Field title" />
@ -33,6 +33,7 @@
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/accountFieldName"
app:layout_constraintTop_toTopOf="parent"
tools:text="Field content. This can contain links and custom emojis" />
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/item_status.xml
View File

@ -308,7 +308,9 @@
android:drawablePadding="4dp"
android:gravity="center_vertical"
android:textSize="?attr/status_text_medium"
android:visibility="gone" />
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

5
app/src/main/res/layout/item_status_detailed.xml
View File

@ -72,6 +72,7 @@
android:lineSpacingMultiplier="1.1"
android:textColor="?android:textColorPrimary"
android:textSize="?attr/status_text_large"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/status_avatar"
tools:text="CW this is a long long long long long long long long content warning" />
@ -313,7 +314,9 @@
android:drawablePadding="4dp"
android:gravity="center_vertical"
android:textSize="?attr/status_text_medium"
android:visibility="gone" />
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

9
app/src/main/res/layout/view_account_moved.xml
View File

@ -4,8 +4,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="12dp"
android:paddingTop="12dp">
android:paddingTop="12dp"
android:paddingBottom="12dp">
<androidx.emoji.widget.EmojiTextView
android:id="@+id/accountMovedText"
@ -13,6 +13,8 @@
android:layout_height="wrap_content"
android:drawablePadding="6dp"
android:textSize="?attr/status_text_medium"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Account has moved" />
<com.keylesspalace.tusky.view.RoundedImageView
@ -20,8 +22,9 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_centerVertical="true"
android:layout_marginEnd="24dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="24dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/accountMovedText"
tools:src="@drawable/avatar_default" />

4
app/src/main/res/values-eu/strings.xml
View File

@ -56,7 +56,7 @@
<string name="notification_favourite_format">%s-(e)k zure tuta gogoko du</string>
<string name="notification_follow_format">%s-(e)k jarraitu dizu</string>
<string name="report_username_format">@%s salatu</string>
<string name="report_username_format">\@%s salatu</string>
<string name="report_comment_hint">Informazio gehigarria?</string>
<string name="action_quick_reply">Erantzun azkarra</string>
@ -288,7 +288,7 @@
<string name="follows_you">Jarraitzen zaitu</string>
<string name="pref_title_alway_show_sensitive_media">Eduki mingarria erakutsi</string>
<string name="title_media">Multimedia</string>
<string name="replying_to">@%s-ri erantzuten</string>
<string name="replying_to">\@%s-ri erantzuten</string>
<string name="load_more_placeholder_text">Gehiago erakutsi</string>
<string name="add_account_name">Gehitu kontua</string>

4
build.gradle
View File

@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.3.11'
ext.kotlin_version = '1.3.21'
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta02'
classpath 'com.android.tools.build:gradle:3.3.0'
classpath 'com.android.tools.build:gradle:3.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}