-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Initial setup for material 3 utils from library
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
- Loading branch information
1 parent
0308ace
commit 7fedeeb
Showing
9 changed files
with
305 additions
and
82 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
33 changes: 33 additions & 0 deletions
33
app/src/main/java/com/owncloud/android/utils/theme/newm3/MaterialSchemesProvider.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,33 @@ | ||
| /* | ||
| * Nextcloud Android client application | ||
| * | ||
| * @author Álvaro Brey | ||
| * Copyright (C) 2022 Álvaro Brey | ||
| * Copyright (C) 2022 Nextcloud GmbH | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE | ||
| * License as published by the Free Software Foundation; either | ||
| * version 3 of the License, or any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU AFFERO GENERAL PUBLIC LICENSE for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public | ||
| * License along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| package com.owncloud.android.utils.theme.newm3 | ||
|
|
||
| import com.nextcloud.android.common.ui.theme.MaterialSchemes | ||
| import com.nextcloud.client.account.User | ||
| import com.owncloud.android.lib.resources.status.OCCapability | ||
|
|
||
| interface MaterialSchemesProvider { | ||
| fun getMaterialSchemesForUser(user: User): MaterialSchemes | ||
| fun getMaterialSchemesForCapability(capability: OCCapability): MaterialSchemes | ||
| fun getMaterialSchemesForCurrentUser(): MaterialSchemes | ||
| } |
63 changes: 63 additions & 0 deletions
63
app/src/main/java/com/owncloud/android/utils/theme/newm3/MaterialSchemesProviderImpl.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,63 @@ | ||
| /* | ||
| * Nextcloud Android client application | ||
| * | ||
| * @author Álvaro Brey | ||
| * Copyright (C) 2022 Álvaro Brey | ||
| * Copyright (C) 2022 Nextcloud GmbH | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE | ||
| * License as published by the Free Software Foundation; either | ||
| * version 3 of the License, or any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU AFFERO GENERAL PUBLIC LICENSE for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public | ||
| * License along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| package com.owncloud.android.utils.theme.newm3 | ||
|
|
||
| import android.content.Context | ||
| import com.nextcloud.android.common.ui.theme.MaterialSchemes | ||
| import com.nextcloud.client.account.User | ||
| import com.nextcloud.client.account.UserAccountManager | ||
| import com.owncloud.android.lib.resources.status.OCCapability | ||
| import com.owncloud.android.utils.theme.CapabilityUtils | ||
| import java.util.concurrent.ConcurrentHashMap | ||
| import javax.inject.Inject | ||
|
|
||
| // TODO think about assisted inject to pass user instead of fetching it from userAccountManager, thus making it more efficient | ||
| // or cache the user, IDK | ||
| internal class MaterialSchemesProviderImpl @Inject constructor( | ||
| private val context: Context, | ||
| private val userAccountManager: UserAccountManager, | ||
| private val themeFactory: ServerThemeImpl.Factory | ||
| ) : MaterialSchemesProvider { | ||
|
|
||
| private val themeCache: MutableMap<String, MaterialSchemes> = ConcurrentHashMap() | ||
|
|
||
| override fun getMaterialSchemesForUser(user: User): MaterialSchemes { | ||
| val url: String = user.server.uri.toString() | ||
|
|
||
| if (!themeCache.containsKey(url)) { | ||
| val capability = CapabilityUtils.getCapability(user, context) | ||
| themeCache[url] = getMaterialSchemesForCapability(capability) | ||
| } | ||
|
|
||
| return themeCache[url]!! | ||
| } | ||
|
|
||
| override fun getMaterialSchemesForCapability(capability: OCCapability): MaterialSchemes { | ||
| val serverTheme = themeFactory.create(capability) | ||
| return MaterialSchemes.fromServerTheme(serverTheme) | ||
| } | ||
|
|
||
| override fun getMaterialSchemesForCurrentUser(): MaterialSchemes { | ||
| return getMaterialSchemesForUser(userAccountManager.user) | ||
| } | ||
| } |
Oops, something went wrong.