v1.3

Author: codeskraps

README.md

@@ -1 +1,12 @@
 # Weekly-Weather
+
+A quick view of your weekly weather
+
+A quick overview of you weekly weather of your current location or search and save your favourite locations for easy access.
+
+Save a GPS weather location with a custom name.
+
+App translated into 37 languages.
+
+Weather data API -> https://open-meteo.com/
+Open Sourced -> https://github.com/codeskraps/Weekly-Weather

app/build.gradle.kts

@@ -1,3 +1,4 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.org.jetbrains.kotlin.android)
@@ -13,8 +14,8 @@ android {
         applicationId = "com.arklan.weather"
         minSdk = 26
         targetSdk = 34
-        versionCode = 3
-        versionName = "1.2"
+        versionCode = 4
+        versionName = "1.3"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

app/release/app-release.aab

@@ -1,16 +1,17 @@
 package com.trifork.feature.common.data.repository
 
-import android.util.Log
 import com.trifork.feature.common.data.local.GeocodingDB
 import com.trifork.feature.common.data.mappers.toGeoLocationEntity
 import com.trifork.feature.common.data.mappers.toGeocoding
 import com.trifork.feature.common.domain.model.GeoLocation
 import com.trifork.feature.common.domain.repository.LocalGeocodingRepository
+import com.trifork.feature.common.domain.repository.LocalResourceRepository
 import com.trifork.feature.common.util.Resource
 import javax.inject.Inject
 
 class LocalGeocodingRepositoryImpl @Inject constructor(
-    private val geocodingDB: GeocodingDB
+    private val geocodingDB: GeocodingDB,
+    private val localResource: LocalResourceRepository
 ) : LocalGeocodingRepository {
 
     override suspend fun getCachedGeoLocation(): Resource<List<GeoLocation>> {
@@ -20,7 +21,7 @@ class LocalGeocodingRepositoryImpl @Inject constructor(
             )
         } catch (e: Exception) {
             e.printStackTrace()
-            Resource.Error(e.message ?: "An unknown error occurred.")
+            Resource.Error(e.message ?: localResource.getUnknownErrorString())
         }
     }
 
@@ -30,7 +31,7 @@ class LocalGeocodingRepositoryImpl @Inject constructor(
             Resource.Success(Unit)
         } catch (e: Exception) {
             e.printStackTrace()
-            Resource.Error(e.message ?: "An unknown error occurred.")
+            Resource.Error(e.message ?: localResource.getUnknownErrorString())
         }
     }
 
@@ -40,7 +41,7 @@ class LocalGeocodingRepositoryImpl @Inject constructor(
             Resource.Success(Unit)
         } catch (e: Exception) {
             e.printStackTrace()
-            Resource.Error(e.message ?: "An unknown error occurred.")
+            Resource.Error(e.message ?: localResource.getUnknownErrorString())
         }
     }
 
@@ -51,7 +52,7 @@ class LocalGeocodingRepositoryImpl @Inject constructor(
             )
         } catch (e: Exception) {
             e.printStackTrace()
-            Resource.Error(e.message ?: "An unknown error occurred.")
+            Resource.Error(e.message ?: localResource.getUnknownErrorString())
         }
     }
 }

feature/common/src/main/java/com/trifork/feature/common/data/repository/LocalGeocodingRepositoryImpl.kt

@@ -0,0 +1,46 @@
+package com.trifork.feature.common.data.repository
+
+import android.content.res.Resources
+import com.trifork.feature.common.R
+import com.trifork.feature.common.domain.repository.LocalResourceRepository
+import javax.inject.Inject
+
+class LocalResourceRepositoryImpl @Inject constructor(
+    private val resources: Resources
+) : LocalResourceRepository {
+    override suspend fun getUnknownErrorString(): String {
+        return resources.getString(R.string.unknown_error)
+    }
+
+    override suspend fun getCurrentLocationString(): String {
+        return resources.getString(R.string.current_location)
+    }
+
+    override suspend fun getCheckInternetString(): String {
+        return resources.getString(R.string.check_internet_connection)
+    }
+
+    override suspend fun getCheckGPSString(): String {
+        return resources.getString(R.string.check_gps)
+    }
+
+    override suspend fun getLocationCanNotBeBlankString(): String {
+        return resources.getString(R.string.location_can_not_be_blank)
+    }
+
+    override suspend fun getNoResultString(): String {
+        return resources.getString(R.string.no_results)
+    }
+
+    override suspend fun getIssueLoadingCache(): String {
+        return resources.getString(R.string.issue_loading_cache)
+    }
+
+    override suspend fun getIssueSaving(): String {
+        return resources.getString(R.string.issue_saving)
+    }
+
+    override suspend fun getIssueDeleting(): String {
+        return resources.getString(R.string.issue_deleting)
+    }
+}

feature/common/src/main/java/com/trifork/feature/common/data/repository/LocalResourceRepositoryImpl.kt

@@ -1,10 +1,13 @@
 package com.trifork.feature.common.di
 
 import android.app.Application
+import android.content.res.Resources
 import androidx.room.Room
 import com.trifork.feature.common.data.local.GeocodingDB
+import com.trifork.feature.common.data.repository.LocalResourceRepositoryImpl
 import com.trifork.feature.common.dispatcher.DispatcherProvider
 import com.trifork.feature.common.dispatcher.StandardDispatcherProvider
+import com.trifork.feature.common.domain.repository.LocalResourceRepository
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -31,4 +34,12 @@ object FeatureModule {
             GeocodingDB::class.java, "database-name"
         ).build()
     }
+
+    @Provides
+    @Singleton
+    fun providesResources(
+        application: Application
+    ): Resources {
+        return application.resources
+    }
 }

feature/common/src/main/java/com/trifork/feature/common/di/FeatureModule.kt

@@ -1,7 +1,9 @@
 package com.trifork.feature.common.di
 
 import com.trifork.feature.common.data.repository.LocalGeocodingRepositoryImpl
+import com.trifork.feature.common.data.repository.LocalResourceRepositoryImpl
 import com.trifork.feature.common.domain.repository.LocalGeocodingRepository
+import com.trifork.feature.common.domain.repository.LocalResourceRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -15,4 +17,9 @@ abstract class RepositoryModule {
     abstract fun bindsGeocodingRepository(
         localGeocodingRepositoryImpl: LocalGeocodingRepositoryImpl
     ): LocalGeocodingRepository
+
+    @Binds
+    abstract fun bindsLocalResourceRepository(
+        localResourceRepositoryImpl: LocalResourceRepositoryImpl
+    ): LocalResourceRepository
 }

feature/common/src/main/java/com/trifork/feature/common/di/RepositoryModule.kt

@@ -0,0 +1,14 @@
+package com.trifork.feature.common.domain.repository
+
+interface LocalResourceRepository {
+
+    suspend fun getUnknownErrorString(): String
+    suspend fun getCurrentLocationString(): String
+    suspend fun getCheckInternetString(): String
+    suspend fun getCheckGPSString(): String
+    suspend fun getLocationCanNotBeBlankString(): String
+    suspend fun getNoResultString(): String
+    suspend fun getIssueLoadingCache(): String
+    suspend fun getIssueSaving(): String
+    suspend fun getIssueDeleting(): String
+}

feature/common/src/main/java/com/trifork/feature/common/domain/repository/LocalResourceRepository.kt

@@ -0,0 +1,28 @@
+package com.trifork.feature.common.util
+
+import androidx.annotation.StringRes
+import com.trifork.feature.common.R
+
+enum class MonthString(@StringRes val stringResource: Int) {
+    January(R.string.january),
+    February(R.string.february),
+    March(R.string.march),
+    April(R.string.april),
+    May(R.string.may),
+    June(R.string.june),
+    July(R.string.july),
+    August(R.string.august),
+    September(R.string.september),
+    October(R.string.october),
+    November(R.string.november),
+    December(R.string.december),
+    Unknown(R.string.unknown);
+
+    companion object {
+        fun parse(monthOfTheYear: Int): Int {
+            return (if (monthOfTheYear in 1..12) {
+                entries[monthOfTheYear - 1]
+            } else Unknown).stringResource
+        }
+    }
+}

feature/common/src/main/java/com/trifork/feature/common/util/MonthString.kt

@@ -0,0 +1,23 @@
+package com.trifork.feature.common.util
+
+import androidx.annotation.StringRes
+import com.trifork.feature.common.R
+
+enum class WeekString(@StringRes val stringResource: Int) {
+    Monday(R.string.monday),
+    Tuesday(R.string.tuesday),
+    Wednesday(R.string.wednesday),
+    Thursday(R.string.thursday),
+    Friday(R.string.friday),
+    Saturday(R.string.saturday),
+    Sunday(R.string.sunday),
+    Unknown(R.string.unknown);
+
+    companion object {
+        fun parse(dayOfTheWeek: Int): Int {
+            return (if (dayOfTheWeek in 1..7) {
+                WeekString.entries[dayOfTheWeek - 1]
+            } else Unknown).stringResource
+        }
+    }
+}