chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases Activity

upgrade Android gradle plugin, Kotlin and jetifier (#1468)

Browse source
This commit is contained in:
Konrad Pozniak 2019-09-03 18:35:42 +02:00 committed by GitHub
parent 6f50704b7d
commit d4f80f308d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/keylesspalace/tusky/entity/DeletedStatus.kt
View file

@ -29,6 +29,6 @@ data class DeletedStatus(
@SerializedName("created_at") val createdAt: Date
) {
fun isEmpty(): Boolean {
return text == null && attachments == null;
return text == null && attachments == null
}
}

14
app/src/main/java/com/keylesspalace/tusky/entity/History.kt
View file

@ -1,14 +0,0 @@
package com.keylesspalace.tusky.entity
import com.google.gson.annotations.SerializedName
data class History(
@field:SerializedName("day")
val day: String,
@field:SerializedName("uses")
val uses: Int,
@field:SerializedName("accounts")
val accounts: Int
)

35
app/src/main/java/com/keylesspalace/tusky/util/MultiListing.kt
View file

@ -1,35 +0,0 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.keylesspalace.tusky.util
import androidx.lifecycle.LiveData
import androidx.paging.PagedList
/**
* Data class that is necessary for a UI to show a listing and interact w/ the rest of the system
*/
data class MultiListing(
val pagedLists: List<LiveData<PagedList<Any>>>,
// represents the network request status to show to the user
val networkState: LiveData<NetworkState>,
// represents the refresh status to show to the user. Separate from networkState, this
// value is importantly only when refresh is requested.
val refreshState: LiveData<NetworkState>,
// refreshes the whole data and fetches it from scratch.
val refresh: () -> Unit,
// retries any failed requests.
val retry: () -> Unit)

2
app/src/main/java/com/keylesspalace/tusky/util/NotificationTypeConverter.kt
View file

@ -34,7 +34,7 @@ fun deserialize(data: String?): Set<Notification.Type> {
val ret = HashSet<Notification.Type>()
data?.let {
val array = JSONArray(data)
for (i in 0..(array.length() - 1)) {
for (i in 0 until array.length()) {
val item = array.getString(i)
val type = Notification.Type.byString(item)
if (type != Notification.Type.UNKNOWN)

6
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.41'
ext.kotlin_version = '1.3.50'
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta05'
classpath 'com.android.tools.build:gradle:3.4.2'
classpath 'com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta06'
classpath 'com.android.tools.build:gradle:3.5.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}