etc/VancedManager
0
0
Fork 0
mirror of https://github.com/YTVanced/VancedManager synced 2024-11-25 20:55:12 +00:00
Code Issues Projects Releases Wiki Activity

installer fixes

Browse source
This commit is contained in:
X1nto 2021-07-12 20:33:46 +04:00
parent 95cc22d522
commit c443d0f61e
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/com/vanced/manager/network/model/AppDtoMapper.kt
View file

@ -5,6 +5,11 @@ import com.vanced.manager.domain.datasource.PackageInformationDataSource
import com.vanced.manager.domain.model.App
import com.vanced.manager.domain.model.AppStatus
import com.vanced.manager.domain.util.EntityMapper
import com.vanced.manager.downloader.base.AppDownloader
import com.vanced.manager.downloader.impl.MicrogDownloader
import com.vanced.manager.downloader.impl.MusicDownloader
import com.vanced.manager.downloader.impl.VancedDownloader
import com.vanced.manager.network.util.MICROG_NAME
import com.vanced.manager.network.util.MUSIC_NAME
import com.vanced.manager.network.util.VANCED_NAME
import com.vanced.manager.preferences.CheckboxPreference
@ -16,11 +21,13 @@ import com.vanced.manager.preferences.holder.vancedVersionPref
import com.vanced.manager.ui.widget.screens.home.installation.CheckboxInstallationOption
import com.vanced.manager.ui.widget.screens.home.installation.InstallationOption
import com.vanced.manager.ui.widget.screens.home.installation.RadiobuttonInstallationOption
import org.koin.core.component.KoinComponent
import org.koin.core.component.get
import java.util.*
class AppDtoMapper(
private val packageInformationDataSource: PackageInformationDataSource
) : EntityMapper<AppDto, App> {
) : EntityMapper<AppDto, App>, KoinComponent {
override suspend fun mapToModel(entity: AppDto): App =
with (entity) {
@ -46,6 +53,7 @@ class AppDtoMapper(
versions = versions,
themes = themes,
languages = languages,
downloader = getDownloader(name),
installationOptions = getInstallationOptions(entity)
)
}
@ -109,4 +117,12 @@ class AppDtoMapper(
)
else -> null
}
private fun getDownloader(app: String?): AppDownloader? =
when (app) {
VANCED_NAME -> get<VancedDownloader>()
MUSIC_NAME -> get<MusicDownloader>()
MICROG_NAME -> get<MicrogDownloader>()
else -> null
}
}

10
app/src/main/java/com/vanced/manager/ui/component/progressindicator/ManagerProgressIndicator.kt
View file

@ -15,13 +15,9 @@ import androidx.compose.ui.unit.dp
import com.vanced.manager.ui.component.color.managerAccentColor
private val progressBarModifier = Modifier.composed {
then(
height(5.dp)
).then(
fillMaxWidth()
).then(
clip(MaterialTheme.shapes.medium)
)
then(height(5.dp))
.then(fillMaxWidth())
.then(clip(MaterialTheme.shapes.medium))
}
@Composable