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

Fix build errors after merge

Browse Source
This commit is contained in:
Alibek Omarov 2020-10-05 15:10:16 +03:00
parent 8e7f77429b
commit 2e9b2cf409
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt
View File

@ -119,7 +119,7 @@ interface MastodonApi {
@Query("since_id") sinceId: String?,
@Query("with_muted") withMuted: Boolean?,
@Query("include_types[]") includeTypes: List<String>?
): Call<List<Notification>>
): Single<List<Notification>>
@POST("api/v1/notifications/clear")
fun clearNotifications(): Call<ResponseBody>

6
app/src/main/java/com/keylesspalace/tusky/util/EmojiCompatFont.kt
View File

@ -6,8 +6,8 @@ import android.util.Pair
import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import androidx.annotation.VisibleForTesting
import androidx.emoji.text.EmojiCompat;
import androidx.emoji.bundled.BundledEmojiCompatConfig;
import androidx.emoji.text.EmojiCompat
import androidx.emoji.bundled.BundledEmojiCompatConfig
import com.keylesspalace.tusky.R
import de.c1710.filemojicompat.FileEmojiCompatConfig
import io.reactivex.Observable
@ -67,7 +67,7 @@ class EmojiCompatFont(
}
}
fun getConfig(context: Context): FileEmojiCompatConfig {
fun getConfig(context: Context): EmojiCompat.Config {
if(this === SYSTEM_DEFAULT)
return BundledEmojiCompatConfig(context);
return FileEmojiCompatConfig(context, getLatestFontFile(context))

2
app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt
View File

@ -278,7 +278,7 @@ class StatusViewHelper(private val itemView: View) {
val votes = NumberFormat.getNumberInstance().format(poll.votersCount.toLong())
context.resources.getQuantityString(R.plurals.poll_info_people, poll.votersCount, votes)
}
pollDurationInfo = if (poll.expired) {
val pollDurationInfo = if (poll.expired) {
context.getString(R.string.poll_info_closed)
} else {
if (useAbsoluteTime) {