-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #43 from techmaved/feature/ui
Redo authentication UX
- Loading branch information
Showing
6 changed files
with
144 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 0 additions & 55 deletions
55
app/src/main/java/de/techmaved/mediabrowserforspotify/components/Authentication.kt
This file was deleted.
Oops, something went wrong.
93 changes: 93 additions & 0 deletions
93
app/src/main/java/de/techmaved/mediabrowserforspotify/components/utilities.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| package de.techmaved.mediabrowserforspotify.components | ||
|
|
||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.material.icons.Icons | ||
| import androidx.compose.material.icons.twotone.AccountCircle | ||
| 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.Surface | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.material3.TopAppBar | ||
| import androidx.compose.material3.TopAppBarDefaults | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.collectAsState | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.input.nestedscroll.nestedScroll | ||
| import androidx.compose.ui.platform.LocalContext | ||
| import androidx.compose.ui.res.stringResource | ||
| import com.adamratzman.spotify.auth.pkce.startSpotifyClientPkceLoginActivity | ||
| import de.techmaved.mediabrowserforspotify.R | ||
| import de.techmaved.mediabrowserforspotify.activities.MainActivity | ||
| import de.techmaved.mediabrowserforspotify.auth.SpotifyPkceLoginActivityImpl | ||
| import de.techmaved.mediabrowserforspotify.auth.pkceClassBackTo | ||
| import de.techmaved.mediabrowserforspotify.utils.Store | ||
|
|
||
| @OptIn(ExperimentalMaterial3Api::class) | ||
| @Composable | ||
| fun AppBarWithContainer( | ||
| activity: MainActivity?, | ||
| isAuthenticated: Boolean, | ||
| content: @Composable () -> Unit | ||
| ) { | ||
| val context = LocalContext.current | ||
| val store = Store(context) | ||
| val userName = store.getUserName.collectAsState(initial = "") | ||
| val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior() | ||
|
|
||
| Surface( | ||
| modifier = Modifier.fillMaxSize(), | ||
| color = MaterialTheme.colorScheme.background | ||
| ) { | ||
| Scaffold( | ||
| modifier = Modifier | ||
| .fillMaxSize() | ||
| .nestedScroll(scrollBehavior.nestedScrollConnection), | ||
| topBar = { | ||
| TopAppBar( | ||
| title = { | ||
| if (!isAuthenticated) { | ||
| Text( | ||
| text = stringResource(id = R.string.app_name) | ||
| ) | ||
|
|
||
| return@TopAppBar | ||
| } | ||
|
|
||
| Text( | ||
| text = "Welcome ${userName.value}" | ||
| ) | ||
| }, | ||
| navigationIcon = { | ||
|
|
||
| }, | ||
| actions = { | ||
| IconButton(onClick = { | ||
| pkceClassBackTo = MainActivity::class.java | ||
| activity?.startSpotifyClientPkceLoginActivity( | ||
| SpotifyPkceLoginActivityImpl::class.java) | ||
| }) { | ||
| Icon( | ||
| imageVector = Icons.TwoTone.AccountCircle, | ||
| contentDescription = "Login with Spotify" | ||
| ) | ||
| } | ||
| }, | ||
| scrollBehavior = scrollBehavior, | ||
| ) | ||
| } | ||
| ) { values -> | ||
| Column( | ||
| modifier = Modifier | ||
| .fillMaxSize() | ||
| .padding(values) | ||
| ) { | ||
| content() | ||
| } | ||
| } | ||
| } | ||
| } |
27 changes: 27 additions & 0 deletions
27
app/src/main/java/de/techmaved/mediabrowserforspotify/utils/Store.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package de.techmaved.mediabrowserforspotify.utils | ||
|
|
||
| import android.content.Context | ||
| import androidx.datastore.core.DataStore | ||
| import androidx.datastore.preferences.core.Preferences | ||
| import androidx.datastore.preferences.core.edit | ||
| import androidx.datastore.preferences.core.stringPreferencesKey | ||
| import androidx.datastore.preferences.preferencesDataStore | ||
| import kotlinx.coroutines.flow.Flow | ||
| import kotlinx.coroutines.flow.map | ||
|
|
||
| class Store(private val context: Context) { | ||
| companion object { | ||
| private val Context.dataStore: DataStore<Preferences> by preferencesDataStore("store") | ||
| private val USER_NAME_KEY = stringPreferencesKey("userName") | ||
| } | ||
|
|
||
| val getUserName: Flow<String> = context.dataStore.data.map { preferences -> | ||
| preferences[USER_NAME_KEY] ?: "" | ||
| } | ||
|
|
||
| suspend fun saveUsername(userName: String) { | ||
| context.dataStore.edit { preferences -> | ||
| preferences[USER_NAME_KEY] = userName | ||
| } | ||
| } | ||
| } |