diff --git a/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt index 7458392b6..40cf6b845 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt @@ -1,18 +1,19 @@ package com.hippo.ehviewer.ui.login -import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Cookie import androidx.compose.material.icons.filled.Info import androidx.compose.material3.AlertDialog import androidx.compose.material3.Button @@ -33,10 +34,10 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.res.dimensionResource -import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.buildAnnotatedString @@ -45,7 +46,6 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.hippo.ehviewer.EhApplication import com.hippo.ehviewer.R import com.hippo.ehviewer.client.EhCookieStore import com.hippo.ehviewer.client.EhEngine @@ -195,10 +195,13 @@ fun CookieSignInScene() { .verticalScroll(rememberScrollState()), horizontalAlignment = Alignment.CenterHorizontally ) { - Image( - painter = painterResource(id = R.drawable.v_cookie_brown_x48), + Icon( + imageVector = Icons.Default.Cookie, contentDescription = null, - modifier = Modifier.padding(dimensionResource(id = R.dimen.keyline_margin)) + modifier = Modifier + .padding(dimensionResource(id = R.dimen.keyline_margin)) + .size(48.dp), + tint = Color(0xff795548) ) Text( text = stringResource(id = R.string.cookie_explain), diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryComposeScreenFragmentBridge.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryComposeScreenFragmentBridge.kt deleted file mode 100644 index 6cafd9a47..000000000 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryComposeScreenFragmentBridge.kt +++ /dev/null @@ -1,42 +0,0 @@ -package com.hippo.ehviewer.ui.scene - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.annotation.MainThread -import androidx.compose.ui.platform.ComposeView -import androidx.core.view.GravityCompat -import com.google.accompanist.themeadapter.material3.Mdc3Theme -import com.hippo.ehviewer.R -import com.hippo.ehviewer.client.data.GalleryInfo -import com.hippo.ehviewer.ui.scene.history.HistoryScreen - -class HistoryComposeScreenFragmentBridge : BaseScene() { - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View { - return ComposeView(requireContext()).apply { - setContent { - Mdc3Theme { - HistoryScreen(this@HistoryComposeScreenFragmentBridge) - } - } - } - } - - @MainThread - fun toggleNavigationDrawer() { - toggleDrawer(GravityCompat.START) - } - - @MainThread - fun navToDetail(gi: GalleryInfo) { - val args = Bundle() - args.putString(GalleryDetailScene.KEY_ACTION, GalleryDetailScene.ACTION_GALLERY_INFO) - args.putParcelable(GalleryDetailScene.KEY_GALLERY_INFO, gi) - navigate(R.id.galleryDetailScene, args) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/history/HistoryScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/history/HistoryScreen.kt deleted file mode 100644 index 94c794616..000000000 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/history/HistoryScreen.kt +++ /dev/null @@ -1,223 +0,0 @@ -package com.hippo.ehviewer.ui.scene.history - -import androidx.compose.animation.animateColorAsState -import androidx.compose.foundation.ExperimentalFoundationApi -import androidx.compose.foundation.Image -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Menu -import androidx.compose.material3.AlertDialog -// import androidx.compose.material3.DismissDirection -// import androidx.compose.material3.DismissValue -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Scaffold -// import androidx.compose.material3.SwipeToDismiss -import androidx.compose.material3.Text -import androidx.compose.material3.TextButton -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults -// import androidx.compose.material3.rememberDismissState -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.rememberCoroutineScope -import androidx.compose.runtime.setValue -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.input.nestedscroll.nestedScroll -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.unit.dp -import androidx.paging.Pager -import androidx.paging.PagingConfig -import androidx.paging.compose.collectAsLazyPagingItems -import androidx.paging.compose.items -import com.hippo.ehviewer.EhDB -import com.hippo.ehviewer.R -import com.hippo.ehviewer.client.data.GalleryInfo -import com.hippo.ehviewer.ui.scene.BaseScene -import com.hippo.ehviewer.ui.scene.HistoryComposeScreenFragmentBridge -import com.hippo.ehviewer.ui.widget.GalleryListLongClickDialog -import com.hippo.ehviewer.ui.widget.ListInfoCard -import eu.kanade.tachiyomi.util.lang.launchIO - -@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class) -@Composable -fun HistoryScreen(hostFragment: HistoryComposeScreenFragmentBridge) { - val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior() - val coroutineScope = rememberCoroutineScope() - val historyData = remember { - Pager( - PagingConfig(20) - ) { - EhDB.historyLazyList - }.flow - }.collectAsLazyPagingItems() - - var dialogStatus by remember { mutableStateOf(HistoryScreenDialogStatus.NONE) } - var selectedGalleryInfo by remember { mutableStateOf(null) } - - Scaffold( - modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), - topBar = { - TopAppBar( - title = { - Text(text = stringResource(id = R.string.history)) - }, - navigationIcon = { - IconButton(onClick = { hostFragment.toggleNavigationDrawer() }) { - Icon(imageVector = Icons.Default.Menu, contentDescription = "") - } - }, - actions = { - IconButton(onClick = { dialogStatus = HistoryScreenDialogStatus.CLEAR_ALL }) { - Icon( - painter = painterResource(id = R.drawable.v_clear_all_dark_x24), - contentDescription = "" - ) - } - }, - scrollBehavior = scrollBehavior - ) - } - ) { paddingValues -> - LazyColumn( - contentPadding = paddingValues - ) { - items( - items = historyData, - key = { item -> item.gid } - ) { info -> - info?.let { - /* - val dismissState = rememberDismissState( - confirmValueChange = { - if (it == DismissValue.DismissedToStart) - coroutineScope.launchIO { - EhDB.deleteHistoryInfo(info) - } - true - } - ) - - SwipeToDismiss( - state = dismissState, - background = { - val color by animateColorAsState( - when (dismissState.targetValue) { - DismissValue.Default -> Color.Transparent - DismissValue.DismissedToEnd -> Color.Green - DismissValue.DismissedToStart -> Color.Red - } - ) - Box( - Modifier - .fillMaxSize() - .background(color) - ) - }, - dismissContent = { - // TODO: item delete & add animation - // Bug tracker: https://issuetracker.google.com/issues/150812265 - ListInfoCard( - { hostFragment.navToDetail(it) }, - { - selectedGalleryInfo = it - dialogStatus = HistoryScreenDialogStatus.SELECT_ITEM - }, - info = it, - modifier = Modifier.animateItemPlacement() - ) - }, - directions = setOf(DismissDirection.EndToStart) - ) - - */ - } - } - } - - if (historyData.itemCount == 0) { - NoHistory() - } - } - - if (dialogStatus == HistoryScreenDialogStatus.CLEAR_ALL) { - AlertDialog( - onDismissRequest = { dialogStatus = HistoryScreenDialogStatus.NONE }, - title = { - Text(text = stringResource(id = R.string.clear_all)) - }, - text = { - Text(text = stringResource(id = R.string.clear_all_history)) - }, - confirmButton = { - TextButton( - onClick = { - coroutineScope.launchIO { - EhDB.clearHistoryInfo() - dialogStatus = HistoryScreenDialogStatus.NONE - } - } - ) { - Text(stringResource(id = R.string.clear_all)) - } - }, - dismissButton = { - TextButton( - onClick = { - dialogStatus = HistoryScreenDialogStatus.NONE - } - ) { - Text(stringResource(id = android.R.string.cancel)) - } - } - ) - } - - if (dialogStatus == HistoryScreenDialogStatus.SELECT_ITEM) { - selectedGalleryInfo?.let { info -> - GalleryListLongClickDialog( - info = info, - { dialogStatus = HistoryScreenDialogStatus.NONE }, - { hostFragment.showTip(it, BaseScene.LENGTH_LONG) } - ) - } - } -} - -@Composable -private fun NoHistory() { - Column( - modifier = Modifier.fillMaxSize(), - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally - ) { - Image( - painter = painterResource(id = R.drawable.big_history), - contentDescription = null, - Modifier.padding(16.dp), - ) - Text( - text = stringResource(id = R.string.no_history), - style = MaterialTheme.typography.headlineMedium - ) - } -} - -enum class HistoryScreenDialogStatus { - NONE, - CLEAR_ALL, - SELECT_ITEM -} diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryDetailWidgets.kt b/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryDetailWidgets.kt index 9dafd84f2..432ce6710 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryDetailWidgets.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryDetailWidgets.kt @@ -6,6 +6,9 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Label +import androidx.compose.material.icons.filled.PersonAdd import androidx.compose.material3.AssistChip import androidx.compose.material3.Card import androidx.compose.material3.ElevatedCard @@ -17,7 +20,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.res.dimensionResource -import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.intl.Locale @@ -156,7 +158,7 @@ fun GalleryDetailHeaderCard( modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.keyline_margin)), leadingIcon = { Icon( - painter = painterResource(id = R.drawable.ic_baseline_label_24), + imageVector = Icons.Default.Label, contentDescription = null ) }) @@ -168,7 +170,7 @@ fun GalleryDetailHeaderCard( modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.keyline_margin)), leadingIcon = { Icon( - painter = painterResource(id = R.drawable.file_upload_black_24dp), + imageVector = Icons.Default.PersonAdd, contentDescription = null ) }) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt b/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt index 38ee5d582..cf8eb093c 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryInfoCard.kt @@ -9,6 +9,10 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Download +import androidx.compose.material.icons.filled.Favorite import androidx.compose.material3.Card import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -19,11 +23,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.ContentScale -import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.hippo.ehviewer.R import com.hippo.ehviewer.client.EhUtils import com.hippo.ehviewer.client.data.GalleryInfo import com.hippo.ehviewer.download.DownloadManager @@ -89,14 +91,16 @@ fun ListInfoCard( Row(verticalAlignment = Alignment.CenterVertically) { if (DownloadManager.containDownloadInfo(info.gid)) { Icon( - painterResource(id = R.drawable.v_download_x16), - contentDescription = null + Icons.Default.Download, + contentDescription = null, + modifier = Modifier.size(16.dp) ) } if (info.favoriteSlot != -2) { Icon( - painterResource(id = R.drawable.v_heart_x16), - contentDescription = null + Icons.Default.Favorite, + contentDescription = null, + modifier = Modifier.size(16.dp) ) } Text( diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryListOperation.kt b/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryListOperation.kt deleted file mode 100644 index 226e12f97..000000000 --- a/app/src/main/java/com/hippo/ehviewer/ui/widget/GalleryListOperation.kt +++ /dev/null @@ -1,292 +0,0 @@ -package com.hippo.ehviewer.ui.widget - -import android.content.Intent -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.material3.AlertDialog -import androidx.compose.material3.Checkbox -import androidx.compose.material3.Icon -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text -import androidx.compose.material3.TextButton -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.painter.Painter -import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.unit.dp -import androidx.core.content.ContextCompat.startActivity -import com.hippo.ehviewer.EhDB -import com.hippo.ehviewer.R -import com.hippo.ehviewer.Settings -import com.hippo.ehviewer.client.EhEngine -import com.hippo.ehviewer.client.EhUtils -import com.hippo.ehviewer.client.data.GalleryInfo -import com.hippo.ehviewer.download.DownloadManager -import eu.kanade.tachiyomi.ui.reader.ReaderActivity -import eu.kanade.tachiyomi.util.lang.launchIO -import kotlinx.coroutines.DelicateCoroutinesApi - -private val downloadManager = DownloadManager - -@Composable -private fun DialogSelectorItem( - onClick: () -> Unit, - icon: Painter, - text: String -) { - Row( - modifier = Modifier - .fillMaxWidth() - .clickable(onClick = onClick), - verticalAlignment = Alignment.CenterVertically - ) { - Icon( - painter = icon, - contentDescription = null, - modifier = Modifier.padding(16.dp) - ) - Text( - text = text, - style = MaterialTheme.typography.titleMedium - ) - } -} - -@OptIn(DelicateCoroutinesApi::class) -@Composable -fun GalleryListLongClickDialog( - info: T, - onDismissRequest: () -> Unit, - showTip: (String) -> Unit -) { - var dialogStatus by remember { mutableStateOf(DialogStatus.PRIMARY) } - val context = LocalContext.current - - val removeFromFavouriteSuccess = stringResource(id = R.string.remove_from_favorite_success) - val removeFromFavouriteFailure = stringResource(id = R.string.remove_from_favorite_failure) - val localFavName = stringResource(id = R.string.local_favorites) - val addToFavSuccess = stringResource(id = R.string.add_to_favorite_success) - val addToFavFailed = stringResource(id = R.string.add_to_favorite_failure) - - suspend fun addToFav(slot: Int) { - val favNameList = Settings.favCat.toMutableList().apply { add(0, localFavName) } - runCatching { - if (slot == -1) { - EhDB.putLocalFavorites(info) - } else { - EhEngine.addFavorites( - info.gid, - info.token, - slot, - "" - ) - info.favoriteSlot = slot - info.favoriteName = favNameList[slot + 1] - EhDB.putHistoryInfoNonRefresh(info) - } - }.onSuccess { - showTip(addToFavSuccess) - }.onFailure { - showTip(addToFavFailed) - } - onDismissRequest() - dialogStatus = DialogStatus.PRIMARY - } - - when (dialogStatus) { - DialogStatus.PRIMARY -> { - AlertDialog( - onDismissRequest = { - dialogStatus = DialogStatus.PRIMARY - onDismissRequest() - }, - title = { - Text( - text = EhUtils.getSuitableTitle(info), - maxLines = 2, - style = MaterialTheme.typography.titleMedium - ) - }, - text = { - Column { - DialogSelectorItem( - onClick = { - val intent = Intent(context, ReaderActivity::class.java) - intent.action = ReaderActivity.ACTION_EH - intent.putExtra(ReaderActivity.KEY_GALLERY_INFO, info) - startActivity(context, intent, null) - onDismissRequest() - dialogStatus = DialogStatus.PRIMARY - }, - icon = painterResource(id = R.drawable.v_book_open_x24), - text = stringResource(id = R.string.read) - ) - if (remember { downloadManager.containDownloadInfo(info.gid) }) { - DialogSelectorItem( - onClick = { - dialogStatus = DialogStatus.CONFIRM_REMOVE_DOWNLOAD - }, - icon = painterResource(id = R.drawable.v_delete_x24), - text = stringResource(id = R.string.delete_downloads) - ) - } else { - DialogSelectorItem( - onClick = { - dialogStatus = DialogStatus.PRIMARY - }, - icon = painterResource(id = R.drawable.v_download_x24), - text = stringResource(id = R.string.download) - ) - } - if (info.favoriteSlot == -2) { - DialogSelectorItem( - onClick = { - val defaultFav = Settings.defaultFavSlot - if (defaultFav in -1..9) { - launchIO { - addToFav(defaultFav) - } - } else { - dialogStatus = DialogStatus.SELECT_FAVOURITE - } - }, - icon = painterResource(id = R.drawable.v_heart_x24), - text = stringResource(id = R.string.add_to_favourites) - ) - } else { - DialogSelectorItem( - onClick = { - onDismissRequest() - dialogStatus = DialogStatus.PRIMARY - launchIO { - runCatching { - EhDB.removeLocalFavorites(info.gid) - EhEngine.addFavorites(info.gid, info.token, -1, "") - info.favoriteSlot = -2 - info.favoriteName = null - EhDB.putHistoryInfoNonRefresh(info) - showTip(removeFromFavouriteSuccess) - }.onFailure { - showTip(removeFromFavouriteFailure) - } - } - }, - icon = painterResource(id = R.drawable.v_heart_broken_x24), - text = stringResource(id = R.string.remove_from_favourites) - ) - } - if (remember { downloadManager.containDownloadInfo(info.gid) }) { - DialogSelectorItem( - onClick = { - dialogStatus = DialogStatus.PRIMARY - }, - icon = painterResource(id = R.drawable.v_folder_move_x24), - text = stringResource(id = R.string.download_move_dialog_title) - ) - } - } - }, - confirmButton = {} - ) - } - - DialogStatus.CONFIRM_REMOVE_DOWNLOAD -> { - AlertDialog( - onDismissRequest = { - onDismissRequest() - dialogStatus = DialogStatus.PRIMARY - }, - title = { - Text(text = stringResource(id = R.string.download_remove_dialog_title)) - }, - text = { - Text( - text = stringResource( - id = R.string.download_remove_dialog_message, - info.title.orEmpty() - ) - ) - }, - confirmButton = { - TextButton(onClick = { - onDismissRequest() - dialogStatus = DialogStatus.PRIMARY - downloadManager.deleteDownload(info.gid) - }) { - Text(text = stringResource(id = android.R.string.ok)) - } - } - ) - } - - DialogStatus.SELECT_FAVOURITE -> { - SelectFavouriteDialog( - onFolderSelected = { - launchIO { - addToFav(it) - } - }, - onDismissRequest = { - onDismissRequest() - dialogStatus = DialogStatus.PRIMARY - } - ) - } - } -} - -@Composable -fun SelectFavouriteDialog( - onFolderSelected: (Int) -> Unit, - onDismissRequest: () -> Unit -) { - var rememberFavSlot by remember { mutableStateOf(false) } - AlertDialog( - onDismissRequest = onDismissRequest, - confirmButton = { - Row( - Modifier.fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically - ) { - Checkbox(checked = rememberFavSlot, onCheckedChange = { rememberFavSlot = it }) - Text(text = stringResource(id = R.string.remember_favorite_collection)) - } - }, - title = { Text(text = stringResource(id = R.string.add_favorites_dialog_title)) }, - text = { - val localFavName = stringResource(id = R.string.local_favorites) - Column { - remember { - Settings.favCat.toMutableList().apply { add(0, localFavName) } - }.forEachIndexed { index, s -> - TextButton( - onClick = { - onDismissRequest() - Settings.putDefaultFavSlot(if (rememberFavSlot) index - 1 else Settings.INVALID_DEFAULT_FAV_SLOT) - onFolderSelected(index - 1) - }, - Modifier.fillMaxWidth() - ) { - Text(text = s) - } - } - } - } - ) -} - -private enum class DialogStatus { - PRIMARY, - CONFIRM_REMOVE_DOWNLOAD, - SELECT_FAVOURITE -} diff --git a/app/src/main/res/drawable/file_upload_black_24dp.xml b/app/src/main/res/drawable/file_upload_black_24dp.xml deleted file mode 100644 index 964239c8e..000000000 --- a/app/src/main/res/drawable/file_upload_black_24dp.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/v_cookie_brown_x48.xml b/app/src/main/res/drawable/v_cookie_brown_x48.xml deleted file mode 100644 index 3089d4f70..000000000 --- a/app/src/main/res/drawable/v_cookie_brown_x48.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 75c2bdee0..49dcfa765 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -16,7 +16,6 @@ #fff9a825 - #ff795548 #20000000 #20ffffff diff --git a/app/src/main/res/values/pathdata.xml b/app/src/main/res/values/pathdata.xml index ff5ec4ee7..49a4415fc 100644 --- a/app/src/main/res/values/pathdata.xml +++ b/app/src/main/res/values/pathdata.xml @@ -40,7 +40,6 @@ M13,9H11V7H13M13,17H11V11H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z M5,3H19A2,2 0 0,1 21,5V19A2,2 0 0,1 19,21H5A2,2 0 0,1 3,19V5A2,2 0 0,1 5,3M12,17L12.72,16.34C15.3,14 17,12.46 17,10.57C17,9.03 15.79,7.82 14.25,7.82C13.38,7.82 12.55,8.23 12,8.87C11.45,8.23 10.62,7.82 9.75,7.82C8.21,7.82 7,9.03 7,10.57C7,12.46 8.7,14 11.28,16.34L12,17Z M19,3H5C3.9,3,3,3.9,3,5V19C3,20.1,3.9,21,5,21H19C20.1,21,21,20.1,21,19V5C21,3.9,20.1,3,19,3ZM12,17L7,12H10V8H14V12H17L12,17Z - M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A9,9 0 0,0 21,12C21,11.5 20.96,11 20.87,10.5C20.6,10 20,10 20,10H18V9C18,8 17,8 17,8H15V7C15,6 14,6 14,6H13V4C13,3 12,3 12,3M9.5,6A1.5,1.5 0 0,1 11,7.5A1.5,1.5 0 0,1 9.5,9A1.5,1.5 0 0,1 8,7.5A1.5,1.5 0 0,1 9.5,6M6.5,10A1.5,1.5 0 0,1 8,11.5A1.5,1.5 0 0,1 6.5,13A1.5,1.5 0 0,1 5,11.5A1.5,1.5 0 0,1 6.5,10M11.5,11A1.5,1.5 0 0,1 13,12.5A1.5,1.5 0 0,1 11.5,14A1.5,1.5 0 0,1 10,12.5A1.5,1.5 0 0,1 11.5,11M16.5,13A1.5,1.5 0 0,1 18,14.5A1.5,1.5 0 0,1 16.5,16H16.5A1.5,1.5 0 0,1 15,14.5H15A1.5,1.5 0 0,1 16.5,13M11,16A1.5,1.5 0 0,1 12.5,17.5A1.5,1.5 0 0,1 11,19A1.5,1.5 0 0,1 9.5,17.5A1.5,1.5 0 0,1 11,16Z M15,9A1,1 0 0,1 14,8A1,1 0 0,1 15,7A1,1 0 0,1 16,8A1,1 0 0,1 15,9M9,9A1,1 0 0,1 8,8A1,1 0 0,1 9,7A1,1 0 0,1 10,8A1,1 0 0,1 9,9M16.12,4.37L18.22,2.27L17.4,1.44L15.09,3.75C14.16,3.28 13.11,3 12,3C10.88,3 9.84,3.28 8.91,3.75L6.6,1.44L5.78,2.27L7.88,4.37C6.14,5.64 5,7.68 5,10V11H19V10C19,7.68 17.86,5.64 16.12,4.37M5,16C5,19.86 8.13,23 12,23A7,7 0 0,0 19,16V12H5V16Z M11,9H13V7H11M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M11,17H13V11H11V17Z M5,13H19V11H5M3,17H17V15H3M7,7V9H21V7