KotatsuApp
/
Kotatsu
2
0
Fork 0
Code Issues 124 Pull Requests Packages Projects Releases 163 Wiki Activity

UI fixes

Browse Source
master
Koitharu 1 year ago
parent 93eb6a19a5
commit ccc41314ae
Signed by: Koitharu
GPG Key ID: 676DEE768C17A9D7
7 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File

4
app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AutoFixService.kt
Unescape Escape View File

@ -31,7 +31,7 @@ import org.koitharu.kotatsu.core.util.ext.withPartialWakeLock
import org.koitharu.kotatsu.parsers.model.Manga
import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
import javax.inject.Inject
import com.google.android.material.R as materialR
import androidx.appcompat.R as appcompatR
@AndroidEntryPoint
class AutoFixService : CoroutineIntentService() {
@ -95,7 +95,7 @@ class AutoFixService : CoroutineIntentService() {
.setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
.setCategory(NotificationCompat.CATEGORY_PROGRESS)
.addAction(
materialR.drawable.material_ic_clear_black_24dp,
appcompatR.drawable.abc_ic_clear_material,
applicationContext.getString(android.R.string.cancel),
jobContext.getCancelIntent(),
)

4
app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt
Unescape Escape View File

@ -29,7 +29,7 @@ import org.koitharu.kotatsu.core.nav.AppRouter
import org.koitharu.kotatsu.core.ui.util.ActionModeDelegate
import org.koitharu.kotatsu.core.util.ext.isWebViewUnavailable
import org.koitharu.kotatsu.main.ui.protect.ScreenshotPolicyHelper
import com.google.android.material.R as materialR
import androidx.appcompat.R as appcompatR
abstract class BaseActivity<B : ViewBinding> :
AppCompatActivity(),
@ -103,7 +103,7 @@ abstract class BaseActivity<B : ViewBinding> :
supportActionBar?.run {
setDisplayHomeAsUpEnabled(isEnabled)
if (showUpAsClose) {
setHomeAsUpIndicator(materialR.drawable.ic_clear_black_24)
setHomeAsUpIndicator(appcompatR.drawable.abc_ic_clear_material)
}
}
}

4
app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadNotificationFactory.kt
Unescape Escape View File

@ -36,7 +36,7 @@ import org.koitharu.kotatsu.parsers.model.Manga
import org.koitharu.kotatsu.parsers.util.format
import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
import java.util.UUID
import com.google.android.material.R as materialR
import androidx.appcompat.R as appcompatR
private const val CHANNEL_ID_DEFAULT = "download"
private const val CHANNEL_ID_SILENT = "download_bg"
@ -70,7 +70,7 @@ class DownloadNotificationFactory @AssistedInject constructor(
private val actionCancel by lazy {
NotificationCompat.Action(
materialR.drawable.material_ic_clear_black_24dp,
appcompatR.drawable.abc_ic_clear_material,
context.getString(android.R.string.cancel),
workManager.createCancelPendingIntent(uuid),
)

7
app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt
Unescape Escape View File

@ -72,7 +72,7 @@ import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener
import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionViewModel
import org.koitharu.kotatsu.settings.backup.PeriodicalBackupService
import javax.inject.Inject
import com.google.android.material.R as materialR
import androidx.appcompat.R as appcompatR
private const val TAG_SEARCH = "search"
@ -231,6 +231,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
topMargin = barsInsets.top
bottomMargin = barsInsets.bottom
}
updateContainerBottomMargin()
return insets.consume(v, typeMask, start = viewBinding.navRail != null)
}
@ -429,9 +430,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
supportActionBar?.apply {
setHomeAsUpIndicator(
if (isOpened) {
materialR.drawable.ic_arrow_back_black_24
appcompatR.drawable.abc_ic_ab_back_material
} else {
materialR.drawable.ic_search_black_24
appcompatR.drawable.abc_ic_search_api_material
},
)
setHomeActionContentDescription(

4
app/src/main/kotlin/org/koitharu/kotatsu/settings/backup/RestoreService.kt
Unescape Escape View File

@ -37,7 +37,7 @@ import java.io.File
import java.io.FileNotFoundException
import java.util.EnumSet
import javax.inject.Inject
import com.google.android.material.R as materialR
import androidx.appcompat.R as appcompatR
@AndroidEntryPoint
class RestoreService : CoroutineIntentService() {
@ -219,7 +219,7 @@ class RestoreService : CoroutineIntentService() {
.setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
.setCategory(NotificationCompat.CATEGORY_PROGRESS)
.addAction(
materialR.drawable.material_ic_clear_black_24dp,
appcompatR.drawable.abc_ic_clear_material,
applicationContext.getString(android.R.string.cancel),
getCancelIntent(),
).build()

4
app/src/main/kotlin/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt
Unescape Escape View File

@ -86,7 +86,7 @@ import java.util.concurrent.TimeUnit
import javax.inject.Inject
import kotlin.math.pow
import kotlin.random.Random
import com.google.android.material.R as materialR
import androidx.appcompat.R as appcompatR
@HiltWorker
class SuggestionsWorker @AssistedInject constructor(
@ -137,7 +137,7 @@ class SuggestionsWorker @AssistedInject constructor(
false,
),
).addAction(
materialR.drawable.material_ic_clear_black_24dp,
appcompatR.drawable.abc_ic_clear_material,
applicationContext.getString(android.R.string.cancel),
workManager.createCancelPendingIntent(id),
)

4
app/src/main/kotlin/org/koitharu/kotatsu/tracker/work/TrackWorker.kt
Unescape Escape View File

@ -70,7 +70,7 @@ import java.util.concurrent.TimeUnit
import javax.inject.Inject
import javax.inject.Provider
import kotlin.math.roundToInt
import com.google.android.material.R as materialR
import androidx.appcompat.R as appcompatR
@HiltWorker
class TrackWorker @AssistedInject constructor(
@ -215,7 +215,7 @@ class TrackWorker @AssistedInject constructor(
),
)
addAction(
materialR.drawable.material_ic_clear_black_24dp,
appcompatR.drawable.abc_ic_clear_material,
applicationContext.getString(android.R.string.cancel),
workManager.createCancelPendingIntent(id),
)

Write Preview
Loading…
Cancel
Save