-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(#95): allow to override local app settings
- Loading branch information
Showing
69 changed files
with
2,798 additions
and
586 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
Submodule gn_mobile_core
updated
30 files
Submodule gn_mobile_maps
updated
50 files
2 changes: 1 addition & 1 deletion
2
...va/fr/geonature/occtax/features/nomenclature/data/INomenclatureSettingsLocalDataSource.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
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
2 changes: 1 addition & 1 deletion
2
...main/java/fr/geonature/occtax/features/nomenclature/repository/INomenclatureRepository.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
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
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
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
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
2 changes: 1 addition & 1 deletion
2
.../main/java/fr/geonature/occtax/features/record/repository/IObservationRecordRepository.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
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
45 changes: 45 additions & 0 deletions
45
occtax/src/main/java/fr/geonature/occtax/features/settings/AppSettingsModule.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,45 @@ | ||
package fr.geonature.occtax.features.settings | ||
|
||
import android.content.Context | ||
import dagger.Module | ||
import dagger.Provides | ||
import dagger.hilt.InstallIn | ||
import dagger.hilt.android.qualifiers.ApplicationContext | ||
import dagger.hilt.components.SingletonComponent | ||
import fr.geonature.datasync.settings.AppSettingsFilename | ||
import fr.geonature.occtax.features.settings.data.AppSettingsFileLocalDataSourceImpl | ||
import fr.geonature.occtax.features.settings.data.IAppSettingsLocalDataSource | ||
import fr.geonature.occtax.features.settings.domain.AppSettings | ||
import fr.geonature.occtax.features.settings.repository.AppSettingsRepositoryImpl | ||
import fr.geonature.occtax.features.settings.repository.IAppSettingsRepository | ||
import javax.inject.Singleton | ||
|
||
/** | ||
* [AppSettings] module. | ||
* | ||
* @author S. Grimault | ||
*/ | ||
@Module | ||
@InstallIn(SingletonComponent::class) | ||
object AppSettingsModule { | ||
|
||
@Singleton | ||
@Provides | ||
fun provideAppSettingsDataSource( | ||
@ApplicationContext appContext: Context, | ||
@AppSettingsFilename appSettingsFilename: String | ||
): IAppSettingsLocalDataSource { | ||
return AppSettingsFileLocalDataSourceImpl( | ||
appContext, | ||
appSettingsFilename | ||
) | ||
} | ||
|
||
@Singleton | ||
@Provides | ||
fun provideAppSettingsRepository( | ||
appSettingsLocalDataSource: IAppSettingsLocalDataSource | ||
): IAppSettingsRepository { | ||
return AppSettingsRepositoryImpl(appSettingsLocalDataSource) | ||
} | ||
} |
45 changes: 45 additions & 0 deletions
45
...ain/java/fr/geonature/occtax/features/settings/data/AppSettingsFileLocalDataSourceImpl.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,45 @@ | ||
package fr.geonature.occtax.features.settings.data | ||
|
||
import android.content.Context | ||
import fr.geonature.mountpoint.model.MountPoint | ||
import fr.geonature.mountpoint.util.FileUtils.getFile | ||
import fr.geonature.mountpoint.util.FileUtils.getRootFolder | ||
import fr.geonature.occtax.features.settings.domain.AppSettings | ||
import fr.geonature.occtax.features.settings.error.AppSettingsException | ||
import fr.geonature.occtax.features.settings.io.AppSettingsJsonReader | ||
import kotlinx.coroutines.CoroutineDispatcher | ||
import kotlinx.coroutines.Dispatchers | ||
import kotlinx.coroutines.withContext | ||
import org.tinylog.Logger | ||
import java.io.FileReader | ||
|
||
/** | ||
* Loads [AppSettings] from `JSON` file. | ||
* | ||
* @author S. Grimault | ||
*/ | ||
class AppSettingsFileLocalDataSourceImpl( | ||
private val context: Context, | ||
private val appSettingsFilename: String, | ||
private val dispatcher: CoroutineDispatcher = Dispatchers.IO | ||
) : IAppSettingsLocalDataSource { | ||
override suspend fun load(appSettings: AppSettings?): AppSettings = withContext(dispatcher) { | ||
val appSettingsJsonFile = getFile( | ||
getRootFolder( | ||
context, | ||
MountPoint.StorageType.INTERNAL | ||
), | ||
if (appSettings == null) appSettingsFilename else "${appSettingsFilename.substringBeforeLast(".json")}.local.json" | ||
) | ||
|
||
Logger.info { "loading${if (appSettings == null) " " else " additional "}settings from '${appSettingsJsonFile.absolutePath}'..." } | ||
|
||
if (!appSettingsJsonFile.exists()) { | ||
throw AppSettingsException.NoAppSettingsFoundLocallyException(appSettingsJsonFile.absolutePath) | ||
} | ||
|
||
run { | ||
AppSettingsJsonReader(appSettings).read(FileReader(appSettingsJsonFile)) | ||
} | ||
} | ||
} |
20 changes: 20 additions & 0 deletions
20
...x/src/main/java/fr/geonature/occtax/features/settings/data/IAppSettingsLocalDataSource.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,20 @@ | ||
package fr.geonature.occtax.features.settings.data | ||
|
||
import fr.geonature.occtax.features.settings.error.AppSettingsException | ||
import fr.geonature.occtax.features.settings.domain.AppSettings | ||
|
||
/** | ||
* [AppSettings] local data source. | ||
* | ||
* @author S. Grimault | ||
*/ | ||
interface IAppSettingsLocalDataSource { | ||
|
||
/** | ||
* Loads [AppSettings]. | ||
* | ||
* @param appSettings existing [AppSettings] to override. | ||
* @return [AppSettings] or throws [AppSettingsException] if something goes wrong. | ||
*/ | ||
suspend fun load(appSettings: AppSettings? = null): AppSettings | ||
} |
Oops, something went wrong.