Madeorsk/SpotiFlyer
1
0
Fork 0
mirror of https://github.com/Shabinder/SpotiFlyer.git synced 2024-11-22 09:04:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Analytics Row and Toggle Added

Browse Source
This commit is contained in:
Shabinder Singh 2021-05-29 18:32:38 +05:30
parent f52a0b9ab9
commit 6252a5b18c
8 changed files with 96 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/src/main/java/com/shabinder/spotiflyer/MainActivity.kt
View File

@ -125,7 +125,7 @@ class MainActivity : ComponentActivity() {
AnalyticsDialog(
askForAnalyticsPermission,
enableAnalytics = {
dir.enableAnalytics()
dir.toggleAnalytics(true)
dir.firstLaunchDone()
},
dismissDialog = {

31
android/src/main/java/com/shabinder/spotiflyer/ui/AnalyticsDialog.kt
View File

@ -12,7 +12,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material.AlertDialog
import androidx.compose.material.ButtonDefaults
import androidx.compose.material.Icon
import androidx.compose.material.OutlinedButton
import androidx.compose.material.Text
import androidx.compose.material.TextButton
import androidx.compose.material.icons.Icons
@ -42,31 +44,38 @@ fun AnalyticsDialog(
AlertDialog(
onDismissRequest = dismissDialog,
title = {
Row(verticalAlignment = Alignment.CenterVertically,horizontalArrangement = Arrangement.SpaceBetween) {
Icon(Icons.Rounded.Insights,"Analytics", Modifier.size(32.dp))
Row(verticalAlignment = Alignment.CenterVertically,horizontalArrangement = Arrangement.SpaceEvenly) {
Icon(Icons.Rounded.Insights,"Analytics", Modifier.size(42.dp))
Spacer(Modifier.padding(horizontal = 8.dp))
Text("Grant Analytics",style = SpotiFlyerTypography.h5,textAlign = TextAlign.Center)
Spacer(Modifier.padding(horizontal = 8.dp))
Column {
Icon(Icons.Rounded.Close,"Decline Analytics", Modifier.size(24.dp).clickable {
dismissDialog()
})
Spacer(Modifier.padding(vertical = 8.dp))
}
}
},
backgroundColor = Color.DarkGray,
buttons = {
Column {
OutlinedButton(
onClick = dismissDialog,
Modifier.padding(horizontal = 8.dp).fillMaxWidth()
.background(Color.DarkGray, shape = SpotiFlyerShapes.medium)
.padding(horizontal = 8.dp),
shape = SpotiFlyerShapes.medium,
colors = ButtonDefaults.buttonColors(backgroundColor = Color(0xFF303030))
) {
Text("Nope",color = colorPrimary,fontSize = 18.sp,textAlign = TextAlign.Center)
}
Spacer(Modifier.padding(vertical = 4.dp))
TextButton(
{
onClick = {
dismissDialog()
enableAnalytics()
},
Modifier.padding(bottom = 16.dp, start = 16.dp, end = 16.dp).fillMaxWidth()
.background(colorPrimary, shape = SpotiFlyerShapes.medium)
.padding(horizontal = 8.dp),
shape = SpotiFlyerShapes.medium
) {
Text("Sure!",color = Color.Black,fontSize = 18.sp,textAlign = TextAlign.Center)
Text("Sure",color = Color.Black,fontSize = 18.sp,textAlign = TextAlign.Center)
}
}
},
text = {

42
common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/SpotiFlyerMainUi.kt
View File

@ -46,6 +46,8 @@ import androidx.compose.material.Card
import androidx.compose.material.Icon
import androidx.compose.material.MaterialTheme
import androidx.compose.material.OutlinedButton
import androidx.compose.material.Switch
import androidx.compose.material.SwitchDefaults
import androidx.compose.material.Tab
import androidx.compose.material.TabPosition
import androidx.compose.material.TabRow
@ -59,6 +61,7 @@ import androidx.compose.material.icons.outlined.Info
import androidx.compose.material.icons.rounded.CardGiftcard
import androidx.compose.material.icons.rounded.Edit
import androidx.compose.material.icons.rounded.Flag
import androidx.compose.material.icons.rounded.Insights
import androidx.compose.material.icons.rounded.Share
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
@ -102,7 +105,11 @@ fun SpotiFlyerMainContent(component: SpotiFlyerMain) {
)
when (model.selectedCategory) {
HomeCategory.About -> AboutColumn { component.analytics.donationDialogVisit() }
HomeCategory.About -> AboutColumn(
analyticsEnabled = model.isAnalyticsEnabled,
donationDialogOpenEvent = { component.analytics.donationDialogVisit() },
toggleAnalytics = component::toggleAnalytics
)
HomeCategory.History -> HistoryColumn(
model.records.sortedByDescending { it.id },
component::loadImage,
@ -223,7 +230,9 @@ fun SearchPanel(
@Composable
fun AboutColumn(
modifier: Modifier = Modifier,
donationDialogOpenEvent: () -> Unit
analyticsEnabled:Boolean,
donationDialogOpenEvent: () -> Unit,
toggleAnalytics: (enabled: Boolean) -> Unit
) {
Box {
@ -398,6 +407,35 @@ fun AboutColumn(
)
}
}
Row(
modifier = modifier.fillMaxWidth().padding(vertical = 6.dp)
.clickable(
onClick = {
toggleAnalytics(!analyticsEnabled)
}
),
verticalAlignment = Alignment.CenterVertically
) {
Icon(Icons.Rounded.Insights, "Analytics Status", Modifier.size(32.dp))
Spacer(modifier = Modifier.padding(start = 16.dp))
Column(
Modifier.weight(1f)
) {
Text(
text = "Analytics",
style = SpotiFlyerTypography.h6
)
Text(
text = "Your Data is Anonymized and never shared with 3rd party service",
style = SpotiFlyerTypography.subtitle2
)
}
Switch(
checked = analyticsEnabled,
onCheckedChange = null,
colors = SwitchDefaults.colors(uncheckedThumbColor = colorOffWhite)
)
}
}
}
}

2
common/dependency-injection/src/commonMain/kotlin/com/shabinder/common/di/Dir.kt
View File

@ -57,7 +57,7 @@ expect class Dir(
}
val Dir.isAnalyticsEnabled get() = settings.getBooleanOrNull(AnalyticsKey) ?: false
fun Dir.enableAnalytics() = settings.putBoolean(AnalyticsKey, true)
fun Dir.toggleAnalytics(enabled: Boolean) = settings.putBoolean(AnalyticsKey, enabled)
fun Dir.setDownloadDirectory(newBasePath: String) = settings.putString(DirKey, newBasePath)

8
common/main/src/commonMain/kotlin/com/shabinder/common/main/SpotiFlyerMain.kt
View File

@ -48,6 +48,11 @@ interface SpotiFlyerMain {
* */
fun selectCategory(category: HomeCategory)
/*
* change TabBar Selected Category
* */
fun toggleAnalytics(enabled: Boolean)
/*
* Load Image from cache/Internet and cache it
* */
@ -72,7 +77,8 @@ interface SpotiFlyerMain {
data class State(
val records: List<DownloadRecord> = emptyList(),
val link: String = "",
val selectedCategory: HomeCategory = HomeCategory.About
val selectedCategory: HomeCategory = HomeCategory.About,
val isAnalyticsEnabled: Boolean = false
)
enum class HomeCategory {

7
common/main/src/commonMain/kotlin/com/shabinder/common/main/integration/SpotiFlyerMainImpl.kt
View File

@ -45,7 +45,8 @@ internal class SpotiFlyerMainImpl(
instanceKeeper.getStore {
SpotiFlyerMainStoreProvider(
storeFactory = storeFactory,
database = database
database = database,
dir = dir
).provide()
}
@ -71,6 +72,10 @@ internal class SpotiFlyerMainImpl(
store.accept(Intent.SelectCategory(category))
}
override fun toggleAnalytics(enabled: Boolean) {
store.accept(Intent.ToggleAnalytics(enabled))
}
override suspend fun loadImage(url: String): Picture {
return cache.get(url) {
dir.loadImage(url, 150, 150)

1
common/main/src/commonMain/kotlin/com/shabinder/common/main/store/SpotiFlyerMainStore.kt
View File

@ -25,6 +25,7 @@ internal interface SpotiFlyerMainStore : Store<Intent, SpotiFlyerMain.State, Not
data class OpenPlatform(val platformID: String, val platformLink: String) : Intent()
data class SetLink(val link: String) : Intent()
data class SelectCategory(val category: SpotiFlyerMain.HomeCategory) : Intent()
data class ToggleAnalytics(val enabled: Boolean) : Intent()
object GiveDonation : Intent()
object ShareApp : Intent()
}

13
common/main/src/commonMain/kotlin/com/shabinder/common/main/store/SpotiFlyerMainStoreProvider.kt
View File

@ -21,6 +21,9 @@ import com.arkivanov.mvikotlin.core.store.SimpleBootstrapper
import com.arkivanov.mvikotlin.core.store.Store
import com.arkivanov.mvikotlin.core.store.StoreFactory
import com.arkivanov.mvikotlin.extensions.coroutines.SuspendExecutor
import com.shabinder.common.di.Dir
import com.shabinder.common.di.isAnalyticsEnabled
import com.shabinder.common.di.toggleAnalytics
import com.shabinder.common.main.SpotiFlyerMain
import com.shabinder.common.main.SpotiFlyerMain.State
import com.shabinder.common.main.store.SpotiFlyerMainStore.Intent
@ -36,7 +39,8 @@ import kotlinx.coroutines.flow.map
internal class SpotiFlyerMainStoreProvider(
private val storeFactory: StoreFactory,
private val database: Database?
private val dir: Dir,
database: Database?
) {
fun provide(): SpotiFlyerMainStore =
@ -67,10 +71,12 @@ internal class SpotiFlyerMainStoreProvider(
data class ItemsLoaded(val items: List<DownloadRecord>) : Result()
data class CategoryChanged(val category: SpotiFlyerMain.HomeCategory) : Result()
data class LinkChanged(val link: String) : Result()
data class ToggleAnalytics(val isEnabled: Boolean) : Result()
}
private inner class ExecutorImpl : SuspendExecutor<Intent, Unit, State, Result, Nothing>() {
override suspend fun executeAction(action: Unit, getState: () -> State) {
dispatch(Result.ToggleAnalytics(dir.isAnalyticsEnabled))
updates?.collect {
dispatch(Result.ItemsLoaded(it))
}
@ -83,6 +89,10 @@ internal class SpotiFlyerMainStoreProvider(
is Intent.ShareApp -> methods.value.shareApp()
is Intent.SetLink -> dispatch(Result.LinkChanged(link = intent.link))
is Intent.SelectCategory -> dispatch(Result.CategoryChanged(intent.category))
is Intent.ToggleAnalytics -> {
dispatch(Result.ToggleAnalytics(intent.enabled))
dir.toggleAnalytics(intent.enabled)
}
}
}
}
@ -93,6 +103,7 @@ internal class SpotiFlyerMainStoreProvider(
is Result.ItemsLoaded -> copy(records = result.items)
is Result.LinkChanged -> copy(link = result.link)
is Result.CategoryChanged -> copy(selectedCategory = result.category)
is Result.ToggleAnalytics -> copy(isAnalyticsEnabled = result.isEnabled)
}
}
}