diff options
Diffstat (limited to 'app/src/main/java/app/fedilab/android/mastodon/helper')
4 files changed, 21 insertions, 22 deletions
diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/BlurHashDecoder.kt b/app/src/main/java/app/fedilab/android/mastodon/helper/BlurHashDecoder.kt index 9cc738186..e192239fa 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/helper/BlurHashDecoder.kt +++ b/app/src/main/java/app/fedilab/android/mastodon/helper/BlurHashDecoder.kt @@ -69,20 +69,20 @@ class BlurHashDecoder { val g = (value / 19) % 19 val b = value % 19 return floatArrayOf( - signedPow2((r - 9) / 9.0f) * maxAc, - signedPow2((g - 9) / 9.0f) * maxAc, - signedPow2((b - 9) / 9.0f) * maxAc + signedPow2((r - 9) / 9.0f) * maxAc, + signedPow2((g - 9) / 9.0f) * maxAc, + signedPow2((b - 9) / 9.0f) * maxAc ) } private fun signedPow2(value: Float) = value.pow(2f).withSign(value) private fun composeBitmap( - width: Int, - height: Int, - numCompX: Int, - numCompY: Int, - colors: Array<FloatArray> + width: Int, + height: Int, + numCompX: Int, + numCompY: Int, + colors: Array<FloatArray> ): Bitmap { val imageArray = IntArray(width * height) for (y in 0 until height) { @@ -100,7 +100,7 @@ class BlurHashDecoder { } } imageArray[x + width * y] = - Color.rgb(linearToSrgb(r), linearToSrgb(g), linearToSrgb(b)) + Color.rgb(linearToSrgb(r), linearToSrgb(g), linearToSrgb(b)) } } return Bitmap.createBitmap(imageArray, width, height, Bitmap.Config.ARGB_8888) @@ -116,12 +116,12 @@ class BlurHashDecoder { } private val charMap = listOf( - '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', - 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', - 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', - 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '#', '$', '%', '*', '+', ',', - '-', '.', ':', ';', '=', '?', '@', '[', ']', '^', '_', '{', '|', '}', '~' + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', + 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', + 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', + 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '#', '$', '%', '*', '+', ',', + '-', '.', ':', ';', '=', '?', '@', '[', ']', '^', '_', '{', '|', '}', '~' ) - .mapIndexed { i, c -> c to i } - .toMap() + .mapIndexed { i, c -> c to i } + .toMap() }
\ No newline at end of file diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/CacheDataSourceFactory.java b/app/src/main/java/app/fedilab/android/mastodon/helper/CacheDataSourceFactory.java index ddfceadfd..ed47b62a0 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/helper/CacheDataSourceFactory.java +++ b/app/src/main/java/app/fedilab/android/mastodon/helper/CacheDataSourceFactory.java @@ -19,9 +19,6 @@ import android.content.SharedPreferences; import androidx.annotation.NonNull; import androidx.media3.database.ExoDatabaseProvider; -import androidx.media3.exoplayer.upstream.DefaultBandwidthMeter; -import androidx.preference.PreferenceManager; - import androidx.media3.datasource.DataSource; import androidx.media3.datasource.DefaultDataSourceFactory; import androidx.media3.datasource.DefaultHttpDataSource; @@ -30,6 +27,8 @@ import androidx.media3.datasource.cache.CacheDataSink; import androidx.media3.datasource.cache.CacheDataSource; import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor; import androidx.media3.datasource.cache.SimpleCache; +import androidx.media3.exoplayer.upstream.DefaultBandwidthMeter; +import androidx.preference.PreferenceManager; import java.io.File; diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java index 76128f894..a489c6114 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java +++ b/app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java @@ -909,7 +909,7 @@ public class Helper { if (args != null) fragment.setArguments(args); ft.add(containerViewId, fragment, tag); if (backStackName != null) ft.addToBackStack(backStackName); - if(!fragmentManager.isDestroyed()) { + if (!fragmentManager.isDestroyed()) { ft.commit(); } } diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java index f62284849..b5e9ee521 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java +++ b/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java @@ -306,7 +306,7 @@ public class SpannableHelper { for (Mention mention : mentions) { if (word.compareToIgnoreCase("@" + mention.username) == 0) { - if(!checkRemotely) { + if (!checkRemotely) { targetedMention = mention; } else { acct = mention.acct; @@ -317,7 +317,7 @@ public class SpannableHelper { if (targetedMention != null) { args.putString(Helper.ARG_USER_ID, targetedMention.id); - } else if( acct != null){ + } else if (acct != null) { args.putString(Helper.ARG_MENTION, acct); } else { args.putString(Helper.ARG_MENTION, word); |