From 39256716b28d94ab8ec4ce54dcba8bc2002f45f6 Mon Sep 17 00:00:00 2001 From: rushiiMachine <33725716+rushiiMachine@users.noreply.github.com> Date: Fri, 12 Jan 2024 16:27:09 -0800 Subject: [PATCH] style: reformat project --- .editorconfig | 8 +++++++- .../main/kotlin/com/aliucord/manager/MainActivity.kt | 6 ++++-- .../manager/domain/manager/DownloadManager.kt | 12 +++++------- .../manager/domain/manager/PreferencesManager.kt | 1 - .../domain/repository/AliucordMavenRepository.kt | 6 ++---- .../manager/installer/util/PackageInstaller.kt | 2 -- .../com/aliucord/manager/installer/util/Signer.kt | 3 ++- .../manager/network/service/GithubService.kt | 3 ++- .../aliucord/manager/network/service/HttpService.kt | 10 +++++----- .../aliucord/manager/network/service/MavenService.kt | 2 +- .../aliucord/manager/network/utils/ApiResponse.kt | 2 +- .../com/aliucord/manager/ui/component/LoadFailure.kt | 8 ++------ .../aliucord/manager/ui/component/home/CommitList.kt | 7 +++++++ .../manager/ui/component/plugins/PluginCard.kt | 5 ++--- .../aliucord/manager/ui/navigation/AppDestination.kt | 5 ----- .../com/aliucord/manager/ui/screen/HomeScreen.kt | 4 +--- .../com/aliucord/manager/ui/screen/InstallScreen.kt | 3 ++- .../com/aliucord/manager/ui/screen/SettingsScreen.kt | 2 -- .../kotlin/com/aliucord/manager/ui/util/Utils.kt | 4 ++-- .../aliucord/manager/ui/viewmodel/AboutViewModel.kt | 5 +---- .../manager/ui/viewmodel/UpdaterViewModel.kt | 7 ++----- .../kotlin/com/aliucord/manager/util/Throttling.kt | 5 +---- app/src/main/res/drawable/ic_back.xml | 2 +- app/src/main/res/drawable/ic_extension_outlined.xml | 2 +- app/src/main/res/drawable/ic_home.xml | 4 ++-- app/src/main/res/drawable/ic_launcher_monochrome.xml | 8 ++++---- app/src/main/res/drawable/ic_settings.xml | 2 +- app/src/main/res/drawable/ic_settings_outlined.xml | 2 +- app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 6 +++--- .../main/res/mipmap-anydpi-v26/ic_launcher_round.xml | 6 +++--- app/src/main/res/values/themes.xml | 1 + 31 files changed, 66 insertions(+), 77 deletions(-) diff --git a/.editorconfig b/.editorconfig index 0402c9a..4368a69 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,7 +10,6 @@ max_line_length = 150 trim_trailing_whitespace = true insert_final_newline = true indent_size = 4 -# these are Intellij specific so they will only work in Android Studio / IDEA ij_continuation_indent_size = 4 [*.java] @@ -33,6 +32,13 @@ ij_kotlin_name_count_to_use_star_import_for_members = 3 ij_kotlin_keep_first_column_comment = false ij_kotlin_line_comment_add_space = true ij_kotlin_line_comment_at_first_column = false +ij_kotlin_allow_trailing_comma = true [*.{xml,yml}] indent_size = 2 + +[*.properties] +ij_properties_align_group_field_declarations = false +ij_properties_keep_blank_lines = true +ij_properties_key_value_delimiter = equals +ij_properties_spaces_around_key_value_delimiter = false diff --git a/app/src/main/kotlin/com/aliucord/manager/MainActivity.kt b/app/src/main/kotlin/com/aliucord/manager/MainActivity.kt index 4755f70..740715d 100644 --- a/app/src/main/kotlin/com/aliucord/manager/MainActivity.kt +++ b/app/src/main/kotlin/com/aliucord/manager/MainActivity.kt @@ -5,12 +5,12 @@ package com.aliucord.manager -import android.os.* +import android.os.Bundle +import android.os.Environment import androidx.activity.ComponentActivity import androidx.activity.compose.BackHandler import androidx.activity.compose.setContent import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.foundation.layout.* import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import com.aliucord.manager.domain.manager.PreferencesManager import com.aliucord.manager.ui.dialog.StoragePermissionsDialog @@ -70,10 +70,12 @@ class MainActivity : ComponentActivity() { navController.navigate(AppDestination.Install(data)) } ) + is AppDestination.Plugins -> PluginsScreen() is AppDestination.Settings -> SettingsScreen() } } + is AppDestination.Install -> InstallerScreen( installData = dest.installData, onBackClick = { navController.back() } diff --git a/app/src/main/kotlin/com/aliucord/manager/domain/manager/DownloadManager.kt b/app/src/main/kotlin/com/aliucord/manager/domain/manager/DownloadManager.kt index 77a98d3..8cb790d 100644 --- a/app/src/main/kotlin/com/aliucord/manager/domain/manager/DownloadManager.kt +++ b/app/src/main/kotlin/com/aliucord/manager/domain/manager/DownloadManager.kt @@ -2,19 +2,14 @@ package com.aliucord.manager.domain.manager import android.app.Application import android.app.DownloadManager -import android.content.BroadcastReceiver -import android.content.Context -import android.content.Intent -import android.content.IntentFilter +import android.content.* import androidx.core.content.getSystemService import androidx.core.net.toUri import com.aliucord.manager.BuildConfig import com.aliucord.manager.domain.repository.AliucordMavenRepository import com.aliucord.manager.network.service.AliucordGithubService import java.io.File -import kotlin.coroutines.resume -import kotlin.coroutines.resumeWithException -import kotlin.coroutines.suspendCoroutine +import kotlin.coroutines.* class DownloadManager( private val application: Application @@ -69,14 +64,17 @@ class DownloadManager( context.unregisterReceiver(this) continuation.resumeWithException(Error("Download was cancelled manually")) } + DownloadManager.STATUS_SUCCESSFUL -> { context.unregisterReceiver(this) continuation.resume(out) } + DownloadManager.STATUS_FAILED -> { context.unregisterReceiver(this) continuation.resumeWithException(Error("Failed to download $url because of: ${reasonToString(reason)}")) } + else -> {} } } diff --git a/app/src/main/kotlin/com/aliucord/manager/domain/manager/PreferencesManager.kt b/app/src/main/kotlin/com/aliucord/manager/domain/manager/PreferencesManager.kt index 5a957e7..cf19323 100644 --- a/app/src/main/kotlin/com/aliucord/manager/domain/manager/PreferencesManager.kt +++ b/app/src/main/kotlin/com/aliucord/manager/domain/manager/PreferencesManager.kt @@ -1,7 +1,6 @@ package com.aliucord.manager.domain.manager import android.content.SharedPreferences -import com.aliucord.manager.aliucordDir import com.aliucord.manager.domain.manager.base.BasePreferenceManager import com.aliucord.manager.ui.theme.Theme diff --git a/app/src/main/kotlin/com/aliucord/manager/domain/repository/AliucordMavenRepository.kt b/app/src/main/kotlin/com/aliucord/manager/domain/repository/AliucordMavenRepository.kt index 2b4d75e..27a293b 100644 --- a/app/src/main/kotlin/com/aliucord/manager/domain/repository/AliucordMavenRepository.kt +++ b/app/src/main/kotlin/com/aliucord/manager/domain/repository/AliucordMavenRepository.kt @@ -1,10 +1,8 @@ package com.aliucord.manager.domain.repository import com.aliucord.manager.network.service.MavenService -import com.aliucord.manager.network.utils.ApiError -import com.aliucord.manager.network.utils.ApiResponse -import com.aliucord.manager.network.utils.transform -import io.ktor.http.* +import com.aliucord.manager.network.utils.* +import io.ktor.http.HttpStatusCode class AliucordMavenRepository( private val maven: MavenService diff --git a/app/src/main/kotlin/com/aliucord/manager/installer/util/PackageInstaller.kt b/app/src/main/kotlin/com/aliucord/manager/installer/util/PackageInstaller.kt index c7c8a8c..d679a57 100644 --- a/app/src/main/kotlin/com/aliucord/manager/installer/util/PackageInstaller.kt +++ b/app/src/main/kotlin/com/aliucord/manager/installer/util/PackageInstaller.kt @@ -5,13 +5,11 @@ import android.app.Application import android.app.PendingIntent import android.content.Context import android.content.Intent -import android.content.pm.PackageInstaller import android.content.pm.PackageInstaller.SessionParams import android.content.pm.PackageManager import android.net.Uri import android.os.Build import com.aliucord.manager.installer.service.InstallService -import kotlinx.coroutines.delay import java.io.File fun Application.installApks(silent: Boolean = false, vararg apks: File) { diff --git a/app/src/main/kotlin/com/aliucord/manager/installer/util/Signer.kt b/app/src/main/kotlin/com/aliucord/manager/installer/util/Signer.kt index d2ea66d..070d71e 100644 --- a/app/src/main/kotlin/com/aliucord/manager/installer/util/Signer.kt +++ b/app/src/main/kotlin/com/aliucord/manager/installer/util/Signer.kt @@ -17,7 +17,8 @@ import java.math.BigInteger import java.security.* import java.security.cert.Certificate import java.security.cert.X509Certificate -import java.util.* +import java.util.Date +import java.util.Locale object Signer { private val password = "password".toCharArray() diff --git a/app/src/main/kotlin/com/aliucord/manager/network/service/GithubService.kt b/app/src/main/kotlin/com/aliucord/manager/network/service/GithubService.kt index 8d1a4cb..ccbb0d6 100644 --- a/app/src/main/kotlin/com/aliucord/manager/network/service/GithubService.kt +++ b/app/src/main/kotlin/com/aliucord/manager/network/service/GithubService.kt @@ -2,7 +2,8 @@ package com.aliucord.manager.network.service import com.aliucord.manager.network.dto.* import com.aliucord.manager.network.utils.ApiResponse -import io.ktor.client.request.* +import io.ktor.client.request.parameter +import io.ktor.client.request.url import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/app/src/main/kotlin/com/aliucord/manager/network/service/HttpService.kt b/app/src/main/kotlin/com/aliucord/manager/network/service/HttpService.kt index 4cab7c1..312a4a2 100644 --- a/app/src/main/kotlin/com/aliucord/manager/network/service/HttpService.kt +++ b/app/src/main/kotlin/com/aliucord/manager/network/service/HttpService.kt @@ -3,11 +3,11 @@ package com.aliucord.manager.network.service import android.util.Log import com.aliucord.manager.BuildConfig import com.aliucord.manager.network.utils.* -import io.ktor.client.* -import io.ktor.client.request.* -import io.ktor.client.statement.* -import io.ktor.http.* -import kotlinx.serialization.decodeFromString +import io.ktor.client.HttpClient +import io.ktor.client.request.HttpRequestBuilder +import io.ktor.client.request.request +import io.ktor.client.statement.bodyAsText +import io.ktor.http.isSuccess import kotlinx.serialization.json.Json class HttpService( diff --git a/app/src/main/kotlin/com/aliucord/manager/network/service/MavenService.kt b/app/src/main/kotlin/com/aliucord/manager/network/service/MavenService.kt index 78b03ee..6ed3714 100644 --- a/app/src/main/kotlin/com/aliucord/manager/network/service/MavenService.kt +++ b/app/src/main/kotlin/com/aliucord/manager/network/service/MavenService.kt @@ -1,7 +1,7 @@ package com.aliucord.manager.network.service import com.aliucord.manager.network.utils.ApiResponse -import io.ktor.client.request.* +import io.ktor.client.request.url import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/app/src/main/kotlin/com/aliucord/manager/network/utils/ApiResponse.kt b/app/src/main/kotlin/com/aliucord/manager/network/utils/ApiResponse.kt index 77d8923..6e301bc 100644 --- a/app/src/main/kotlin/com/aliucord/manager/network/utils/ApiResponse.kt +++ b/app/src/main/kotlin/com/aliucord/manager/network/utils/ApiResponse.kt @@ -2,7 +2,7 @@ package com.aliucord.manager.network.utils -import io.ktor.http.* +import io.ktor.http.HttpStatusCode sealed interface ApiResponse { data class Success(val data: T) : ApiResponse diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/component/LoadFailure.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/LoadFailure.kt index f4a9622..296be5c 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/component/LoadFailure.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/LoadFailure.kt @@ -1,11 +1,7 @@ package com.aliucord.manager.ui.component -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.material3.Button -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text +import androidx.compose.foundation.layout.* +import androidx.compose.material3.* import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/component/home/CommitList.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/home/CommitList.kt index 43c5f60..f07832c 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/component/home/CommitList.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/home/CommitList.kt @@ -64,6 +64,7 @@ fun CommitList( .wrapContentWidth(Alignment.CenterHorizontally) ) } + is LoadState.Error -> item { Box( modifier = Modifier @@ -77,6 +78,7 @@ fun CommitList( }) } } + is LoadState.NotLoading -> { items(lazyPagingItems) { commit -> if (commit != null) { @@ -95,11 +97,13 @@ fun CommitList( .wrapContentWidth(Alignment.CenterHorizontally) ) } + is LoadState.Error -> item { LoadFailure(onRetry = { lazyPagingItems.retry() }) } + else -> {} } } @@ -153,13 +157,16 @@ fun CommitItem( fontWeight = FontWeight.Bold, color = MaterialTheme.colorScheme.onSurface ) + "middle" -> SpanStyle( color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f) ) + "commit" -> SpanStyle( fontWeight = FontWeight.Bold, color = MaterialTheme.colorScheme.primary ) + else -> null } }, diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/PluginCard.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/PluginCard.kt index 12fafa2..9da39ee 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/PluginCard.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/PluginCard.kt @@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.* import androidx.compose.foundation.text.ClickableText import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Delete -import androidx.compose.material.icons.filled.History import androidx.compose.material3.* import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -108,7 +107,7 @@ fun PluginCard( ) } - Divider( + HorizontalDivider( modifier = Modifier .alpha(0.3f) .padding(horizontal = 16.dp) @@ -148,8 +147,8 @@ fun PluginCard( IconButton(modifier = Modifier.size(25.dp), onClick = onClickShowChangelog) { Icon( painter = painterResource(R.drawable.ic_history), + contentDescription = stringResource(R.string.plugins_view_changelog, plugin.manifest.name), modifier = Modifier.fillMaxSize(), - contentDescription = stringResource(R.string.plugins_view_changelog, plugin.manifest.name) ) } } diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/navigation/AppDestination.kt b/app/src/main/kotlin/com/aliucord/manager/ui/navigation/AppDestination.kt index 93c93f2..938ff4a 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/navigation/AppDestination.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/navigation/AppDestination.kt @@ -4,15 +4,10 @@ import android.app.Activity import android.os.Parcelable import androidx.annotation.DrawableRes import androidx.annotation.StringRes -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.* -import androidx.compose.material.icons.outlined.* -import androidx.compose.ui.graphics.vector.ImageVector import com.aliucord.manager.R import com.aliucord.manager.ui.screen.InstallData import dev.olshevski.navigation.reimagined.* import kotlinx.parcelize.Parcelize -import kotlinx.parcelize.RawValue @Parcelize sealed class BaseScreenDestination( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screen/HomeScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screen/HomeScreen.kt index 23217b6..2041abd 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screen/HomeScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screen/HomeScreen.kt @@ -6,9 +6,7 @@ package com.aliucord.manager.ui.screen -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.* import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screen/InstallScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screen/InstallScreen.kt index 4115cd5..0716330 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screen/InstallScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screen/InstallScreen.kt @@ -21,7 +21,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.dp import com.aliucord.manager.R -import com.aliucord.manager.ui.component.installer.* +import com.aliucord.manager.ui.component.installer.InstallGroup +import com.aliucord.manager.ui.component.installer.InstallStatus import com.aliucord.manager.ui.dialog.DownloadMethod import com.aliucord.manager.ui.viewmodel.InstallViewModel import com.aliucord.manager.ui.viewmodel.InstallViewModel.InstallStepGroup diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt index 122015a..8513e36 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt @@ -8,8 +8,6 @@ package com.aliucord.manager.ui.screen import androidx.compose.animation.* import androidx.compose.foundation.* import androidx.compose.foundation.layout.* -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.* import androidx.compose.material3.* import androidx.compose.runtime.* import androidx.compose.runtime.saveable.rememberSaveable diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/util/Utils.kt b/app/src/main/kotlin/com/aliucord/manager/ui/util/Utils.kt index 38844ef..092b6a7 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/util/Utils.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/util/Utils.kt @@ -1,13 +1,13 @@ package com.aliucord.manager.ui.util import androidx.annotation.StringRes -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.* import kotlinx.collections.immutable.ImmutableList context(AnnotatedString.Builder) - inline fun Iterable.joinToAnnotatedString( +inline fun Iterable.joinToAnnotatedString( separator: AnnotatedString.Builder.() -> Unit = { append(", ") }, prefix: AnnotatedString.Builder.() -> Unit = {}, postfix: AnnotatedString.Builder.() -> Unit = {}, diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/AboutViewModel.kt b/app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/AboutViewModel.kt index 8231286..1c5d784 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/AboutViewModel.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/AboutViewModel.kt @@ -1,9 +1,6 @@ package com.aliucord.manager.ui.viewmodel -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateListOf -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.setValue +import androidx.compose.runtime.* import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.aliucord.manager.domain.repository.GithubRepository diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/UpdaterViewModel.kt b/app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/UpdaterViewModel.kt index f11800d..72d92c2 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/UpdaterViewModel.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/UpdaterViewModel.kt @@ -1,9 +1,7 @@ package com.aliucord.manager.ui.viewmodel import android.app.Application -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.setValue +import androidx.compose.runtime.* import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.aliucord.manager.BuildConfig @@ -13,13 +11,12 @@ import com.aliucord.manager.installer.util.installApks import com.aliucord.manager.network.utils.SemVer import com.aliucord.manager.network.utils.getOrNull import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.delay import kotlinx.coroutines.launch class UpdaterViewModel( private val github: GithubRepository, private val downloadManager: DownloadManager, - private val application: Application + private val application: Application, ) : ViewModel() { var showDialog by mutableStateOf(false) private set diff --git a/app/src/main/kotlin/com/aliucord/manager/util/Throttling.kt b/app/src/main/kotlin/com/aliucord/manager/util/Throttling.kt index a7dabb7..387d440 100644 --- a/app/src/main/kotlin/com/aliucord/manager/util/Throttling.kt +++ b/app/src/main/kotlin/com/aliucord/manager/util/Throttling.kt @@ -1,9 +1,6 @@ package com.aliucord.manager.util -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Job -import kotlinx.coroutines.delay -import kotlinx.coroutines.launch +import kotlinx.coroutines.* /** * Constructs a function that executes [destinationFunction] only once per [skipMs]. diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml index b75d1df..b2ca2b6 100644 --- a/app/src/main/res/drawable/ic_back.xml +++ b/app/src/main/res/drawable/ic_back.xml @@ -5,5 +5,5 @@ android:viewportHeight="960"> + android:pathData="m313,520 l196,196q12,12 11.5,28T508,772q-12,11 -28,11.5T452,772L188,508q-6,-6 -8.5,-13t-2.5,-15q0,-8 2.5,-15t8.5,-13l264,-264q11,-11 27.5,-11t28.5,11q12,12 12,28.5T508,245L313,440h447q17,0 28.5,11.5T800,480q0,17 -11.5,28.5T760,520L313,520Z" /> diff --git a/app/src/main/res/drawable/ic_extension_outlined.xml b/app/src/main/res/drawable/ic_extension_outlined.xml index e50482d..7b4d6f2 100644 --- a/app/src/main/res/drawable/ic_extension_outlined.xml +++ b/app/src/main/res/drawable/ic_extension_outlined.xml @@ -5,5 +5,5 @@ android:viewportHeight="960"> + android:pathData="M355.08,820L200,820q-24.92,0 -42.46,-17.54 -17.54,-17.54 -17.54,-42.46v-155.08q41.08,-5 70.54,-34.15Q240,541.61 240,500q0,-41.62 -29.46,-70.77 -29.46,-29.15 -70.54,-34.15L140,240q0,-24.92 17.54,-42.46 17.54,-17.54 42.46,-17.54h160q5.39,-38.15 33.42,-62.92Q421.46,92.31 460,92.31t66.58,24.77q28.04,24.77 33.42,62.92h160q24.92,0 42.46,17.54 17.54,17.54 17.54,42.46v160q38.15,5.39 62.92,33.42Q867.69,461.46 867.69,500t-24.77,66.58Q818.15,594.61 780,600v160q0,24.92 -17.54,42.46 -17.54,17.54 -42.46,17.54L564.92,820q-5.39,-43.08 -35.15,-71.54Q500,720 460,720q-40,0 -69.77,28.46 -29.77,28.46 -35.15,71.54ZM200,760h108.46q20.54,-52.92 64.88,-76.46 44.35,-23.54 86.65,-23.54 42.31,0 86.65,23.54 44.35,23.54 64.88,76.46L720,760v-217.69h49.23q18.39,-2.31 28.42,-14.85 10.04,-12.54 10.04,-27.46 0,-14.92 -10.04,-27.46 -10.04,-12.54 -28.42,-14.85L720,457.69L720,240L502.31,240v-49.23q-2.31,-18.39 -14.85,-28.42 -12.54,-10.04 -27.46,-10.04 -14.92,0 -27.46,10.04 -12.54,10.04 -14.85,28.42L417.69,240L200,240v109.54q45.54,18.85 72.77,59.88 27.23,41.04 27.23,90.58 0,48.92 -27.23,89.96 -27.23,41.04 -72.77,60.5L200,760ZM460,500Z" /> diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 4bc216e..af916e4 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> + android:fillColor="#FFFFFFFF" + android:pathData="M10,19v-5h4v5c0,0.55 0.45,1 1,1h3c0.55,0 1,-0.45 1,-1v-7h1.7c0.46,0 0.68,-0.57 0.33,-0.87L12.67,3.6c-0.38,-0.34 -0.96,-0.34 -1.34,0l-8.36,7.53c-0.34,0.3 -0.13,0.87 0.33,0.87H5v7c0,0.55 0.45,1 1,1h3c0.55,0 1,-0.45 1,-1z" /> diff --git a/app/src/main/res/drawable/ic_launcher_monochrome.xml b/app/src/main/res/drawable/ic_launcher_monochrome.xml index 7ca5310..7de18ee 100644 --- a/app/src/main/res/drawable/ic_launcher_monochrome.xml +++ b/app/src/main/res/drawable/ic_launcher_monochrome.xml @@ -4,17 +4,17 @@ android:viewportWidth="108" android:viewportHeight="108"> + android:strokeLineCap="butt" + android:strokeLineJoin="miter" /> diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index 6bde5ee..2876b71 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -5,5 +5,5 @@ android:viewportHeight="960"> + android:pathData="M419.23,860q-13.46,0 -23.31,-9.04 -9.85,-9.04 -11.85,-22.5l-11.61,-90.31q-16.08,-5.39 -32.96,-15.08 -16.89,-9.69 -30.19,-20.77l-83.54,35.23q-12.85,5.61 -25.5,1.31 -12.65,-4.31 -19.89,-16.15l-60.15,-104.77q-6.85,-11.85 -4.23,-25.31 2.62,-13.46 13.46,-21.69l72.31,-54.69q-1.38,-8.92 -1.96,-17.92 -0.58,-9 -0.58,-17.92 0,-8.54 0.58,-17.35 0.58,-8.81 1.96,-19.27l-72.31,-54.69q-10.85,-8.23 -13.65,-21.69 -2.81,-13.46 4.42,-25.31l60.15,-104q7.23,-11.85 19.69,-16.15 12.46,-4.31 25.31,1.31l83.54,34.85q14.46,-11.46 30.89,-20.96 16.42,-9.5 32.27,-15.27l12,-90.31q2,-13.46 11.85,-22.5 9.85,-9.04 23.31,-9.04h121.15q13.46,0 23.5,9.04 10.04,9.04 12.04,22.5l11.61,90.69q18,6.54 32.58,15.27 14.58,8.73 29.42,20.58l85.08,-34.85q12.85,-5.62 25.31,-1.5 12.46,4.11 19.69,15.96l60.15,104.38q7.23,11.85 4.42,25.31 -2.81,13.46 -13.65,21.69l-73.85,55.85q2.15,9.69 2.35,18.12 0.19,8.42 0.19,16.96 0,8.15 -0.38,16.58 -0.38,8.42 -2.77,19.27l73.08,55.08q10.85,8.23 13.65,21.69 2.81,13.46 -4.42,25.31L778.23,722.08q-7.23,11.85 -20.19,16.27 -12.96,4.42 -25.81,-1.19l-82.69,-35.23q-14.85,11.85 -30.31,20.96 -15.46,9.12 -31.69,14.89l-11.61,90.69q-2,13.46 -12.04,22.5 -10.04,9.04 -23.5,9.04L419.23,860ZM480.46,600q49.92,0 84.96,-35.04Q600.46,529.92 600.46,480t-35.04,-84.96q-35.04,-35.04 -84.96,-35.04 -50.54,0 -85.27,35.04 -34.73,35.04 -34.73,84.96t34.73,84.96q34.73,35.04 85.27,35.04Z" /> diff --git a/app/src/main/res/drawable/ic_settings_outlined.xml b/app/src/main/res/drawable/ic_settings_outlined.xml index bd49332..a727172 100644 --- a/app/src/main/res/drawable/ic_settings_outlined.xml +++ b/app/src/main/res/drawable/ic_settings_outlined.xml @@ -5,5 +5,5 @@ android:viewportHeight="960"> + android:pathData="M419.23,860q-13.46,0 -23.31,-9.04 -9.85,-9.04 -11.85,-22.5l-11.61,-90.31q-16.08,-5.39 -32.96,-15.08 -16.89,-9.69 -30.19,-20.77l-83.54,35.23q-12.85,5.61 -25.5,1.31 -12.65,-4.31 -19.89,-16.15l-60.15,-104.77q-6.85,-11.85 -4.23,-25.31 2.62,-13.46 13.46,-21.69l72.31,-54.69q-1.38,-8.92 -1.96,-17.92 -0.58,-9 -0.58,-17.92 0,-8.54 0.58,-17.35 0.58,-8.81 1.96,-19.27l-72.31,-54.69q-10.85,-8.23 -13.65,-21.69 -2.81,-13.46 4.42,-25.31l60.15,-104q7.23,-11.85 19.69,-16.15 12.46,-4.31 25.31,1.31l83.54,34.85q14.46,-11.46 30.89,-20.96 16.42,-9.5 32.27,-15.27l12,-90.31q2,-13.46 11.85,-22.5 9.85,-9.04 23.31,-9.04h121.15q13.46,0 23.5,9.04 10.04,9.04 12.04,22.5l11.61,90.69q18,6.54 32.58,15.27 14.58,8.73 29.42,20.58l85.08,-34.85q12.85,-5.62 25.31,-1.5 12.46,4.11 19.69,15.96l60.15,104.38q7.23,11.85 4.42,25.31 -2.81,13.46 -13.65,21.69l-73.85,55.85q2.15,9.69 2.35,18.12 0.19,8.42 0.19,16.96 0,8.15 -0.38,16.58 -0.38,8.42 -2.77,19.27l73.08,55.08q10.85,8.23 13.65,21.69 2.81,13.46 -4.42,25.31L778.23,722.08q-7.23,11.85 -20.19,16.27 -12.96,4.42 -25.81,-1.19l-82.69,-35.23q-14.85,11.85 -30.31,20.96 -15.46,9.12 -31.69,14.89l-11.61,90.69q-2,13.46 -12.04,22.5 -10.04,9.04 -23.5,9.04L419.23,860ZM440,800h78.61L533,692.85q30.61,-8 55.96,-22.73 25.35,-14.73 48.88,-37.88L737.23,674l39.38,-68 -86.77,-65.39q5,-15.54 6.81,-30.46 1.81,-14.92 1.81,-30.15 0,-15.61 -1.81,-30.15 -1.81,-14.54 -6.81,-29.69L777.39,354 738,286l-100.54,42.38q-20.08,-21.46 -48.12,-37.92 -28.04,-16.46 -56.73,-23.31L520,160h-79.39l-13.23,106.77q-30.62,7.23 -56.54,22.15 -25.92,14.92 -49.46,38.46L222,286l-39.38,68L269,418.39q-5,14.23 -7,29.61 -2,15.39 -2,32.38Q260,496 262,511q2,15 6.61,29.61l-86,65.39L222,674l99,-42q22.77,23.39 48.69,38.31 25.92,14.92 57.31,22.92L440,800ZM480.46,600q49.92,0 84.96,-35.04Q600.46,529.92 600.46,480t-35.04,-84.96q-35.04,-35.04 -84.96,-35.04 -50.54,0 -85.27,35.04 -34.73,35.04 -34.73,84.96t34.73,84.96q34.73,35.04 85.27,35.04ZM480,480Z" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 10bc7a5..fbf44be 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,6 @@ - - - + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 10bc7a5..fbf44be 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,6 @@ - - - + + + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index b2d4a46..5d4a7ea 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,5 +1,6 @@ +