Merge pull request #77 from odaridavid/dd-exclusion

💣 BIG BANG : Migrate Material 2 -> 3 + Design System + Data exclusion logic + Minor tweaks
odaridavid · Mar 12, 2024 · 5069f18 · 5069f18
2 parents afc11c4 + ab09419
commit 5069f18
Show file tree

Hide file tree

Showing 73 changed files with 1,178 additions and 416 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/README.md b/README.md
@@ -126,15 +126,15 @@ Typography:
 Define font styles, sizes, and weights for headers, paragraphs, and other text elements.
 
 Color Palette:
-Establish a color palette with primary, secondary, and accent colors. Specify their usage in 
+Establish a color palette with primary, secondary, and accent colors. Specify their usage in
 different contexts.
 
 Icons:
 Design a set of basic icons that represent common actions or concepts. Ensure consistency in style
 and sizing.
 
 Buttons:
-Create button styles with variations for primary, secondary, and tertiary actions. Include states 
+Create button styles with variations for primary, secondary, and tertiary actions. Include states
 like hover and disabled.
 
 Input Fields:
@@ -146,7 +146,8 @@ Form Elements:
 Combine atoms to create complete form components. Ensure consistency in spacing and alignment.
 
 Cards:
-Combine text, images, and buttons to create card components. Define variations for different use cases.
+Combine text, images, and buttons to create card components. Define variations for different use
+cases.
 
 Badges:
 Assemble icons and text to create badge components for notifications or status indicators.
@@ -163,7 +164,7 @@ Headers and Footers:
 Define headers and footers with appropriate spacing, logos, and navigation links.
 
 Lists:
-Assemble atoms and molecules to create list components, incorporating variations like simple lists, 
+Assemble atoms and molecules to create list components, incorporating variations like simple lists,
 detailed lists, and nested lists.
 
 Modals:
@@ -249,13 +250,15 @@ LeakCanary is also used to monitor for any memory leaks that might occur in debu
 
 # Screenshots 📱
 
-|                      Light Theme                      |                      Dark Theme                       |
-|:-----------------------------------------------------:|:-----------------------------------------------------:|
-| <img src="/docs/screenshots/white.png" width="300px"> | <img src="/docs/screenshots/black.png" width="300px"> |
-
-|                        Error                        |
-|:---------------------------------------------------:|
-| <img src="/docs/screenshots/drk.png" width="300px"> |
+|                              Light Theme                               |                              Dark Theme                               |
+|:----------------------------------------------------------------------:|:---------------------------------------------------------------------:|
+|      <img src="/docs/screenshots/(Light)Main.png" width="250px">       |      <img src="/docs/screenshots/(Dark)Main.png" width="250px">       |
+|    <img src="/docs/screenshots/(Light)Settings.png" width="250px">     |    <img src="/docs/screenshots/(Dark)Settings.png" width="250px">     |
+| <img src="/docs/screenshots/(Light)Settings-Option.png" width="250px"> | <img src="/docs/screenshots/(Dark)Settings-Option.png" width="250px"> |
+|      <img src="/docs/screenshots/(Light)About.png" width="250px">      |      <img src="/docs/screenshots/(Dark)About.png" width="250px">      |
+|      <img src="/docs/screenshots/(Light)About.png" width="250px">      |      <img src="/docs/screenshots/(Dark)About.png" width="250px">      |
+|      <img src="/docs/screenshots/(Light)Error.png" width="250px">      |      <img src="/docs/screenshots/(Dark)Error.png" width="250px">      |
+|    <img src="/docs/screenshots/(Light)Excluded.png" width="250px">     |                                   -                                   |
 
 ![](https://media.giphy.com/media/hWvk9iUU4uBBeyBq0k/giphy.gif)
 

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -69,7 +69,6 @@ fun setupAndroidReporting() {
                 "**/*_MembersInjector.class",
                 "**/*_Factory*.*",
                 "**/*_Provide*Factory*.*",
-                "**/*Extensions*.*",
                 // sealed and data classes
                 "**/*\$Result.*",
                 "**/*\$Result$*.*",
@@ -83,7 +82,9 @@ fun setupAndroidReporting() {
                 "**/designsystem/**",
                 "**/*Screen*.*",
                 "**/*NavGraph*.*",
-                "**/*Destinations*.*"
+                "**/*Destinations*.*",
+                "**/common/**",
+                "**/*Extensions*.*",
             )
 
             val javaTree = fileTree("${project.buildDir}/intermediates/javac/$sourceName/classes") {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <application
         android:name=".WeatherApp"
@@ -19,7 +19,8 @@
         <activity
             android:name=".ui.MainActivity"
             android:exported="true"
-            android:theme="@style/Theme.WeatherApp">
+            android:theme="@style/Theme.WeatherApp"
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -30,6 +31,7 @@
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
+        <!--        TODO Add new activity launcher with different icon for debug stuff-->
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/github/odaridavid/weatherapp/WeatherApp.kt b/app/src/main/java/com/github/odaridavid/weatherapp/WeatherApp.kt
@@ -5,3 +5,4 @@ import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
 class WeatherApp : Application()
+// TODO Add global error handling
diff --git a/app/src/main/java/com/github/odaridavid/weatherapp/core/api/SettingsRepository.kt b/app/src/main/java/com/github/odaridavid/weatherapp/core/api/SettingsRepository.kt
@@ -1,7 +1,7 @@
 package com.github.odaridavid.weatherapp.core.api
 
 import com.github.odaridavid.weatherapp.core.model.DefaultLocation
-import com.github.odaridavid.weatherapp.core.model.TimeFormat
+import com.github.odaridavid.weatherapp.core.model.ExcludedData
 import kotlinx.coroutines.flow.Flow
 
 interface SettingsRepository {
@@ -27,6 +27,9 @@ interface SettingsRepository {
 
     suspend fun setFormat(format: String)
 
-    fun getFormats() : List<String>
+    fun getFormats(): List<String>
 
+    suspend fun getExcludedData(): Flow<String>
+
+    suspend fun setExcludedData(excludedData: List<ExcludedData>)
 }
diff --git a/app/src/main/java/com/github/odaridavid/weatherapp/core/model/ExcludedData.kt b/app/src/main/java/com/github/odaridavid/weatherapp/core/model/ExcludedData.kt
@@ -1,8 +1,10 @@
 package com.github.odaridavid.weatherapp.core.model
-enum class ExcludedData(val value:String){
+
+enum class ExcludedData(val value: String) {
     CURRENT("current"),
     HOURLY("hourly"),
     DAILY("daily"),
     MINUTELY("minutely"),
     ALERTS("alerts"),
+    NONE(""),
 }
diff --git a/app/src/main/java/com/github/odaridavid/weatherapp/core/model/Weather.kt b/app/src/main/java/com/github/odaridavid/weatherapp/core/model/Weather.kt
@@ -1,9 +1,9 @@
 package com.github.odaridavid.weatherapp.core.model
 
 data class Weather(
-    val current: CurrentWeather,
-    val hourly: List<HourlyWeather>,
-    val daily: List<DailyWeather>
+    val current: CurrentWeather?,
+    val hourly: List<HourlyWeather>?,
+    val daily: List<DailyWeather>?
 )
 
 data class CurrentWeather(

diff --git a/...src/main/java/com/github/odaridavid/weatherapp/data/settings/DefaultSettingsRepository.kt b/...src/main/java/com/github/odaridavid/weatherapp/data/settings/DefaultSettingsRepository.kt
@@ -7,6 +7,7 @@ import androidx.datastore.preferences.core.stringPreferencesKey
 import com.github.odaridavid.weatherapp.BuildConfig
 import com.github.odaridavid.weatherapp.core.api.SettingsRepository
 import com.github.odaridavid.weatherapp.core.model.DefaultLocation
+import com.github.odaridavid.weatherapp.core.model.ExcludedData
 import com.github.odaridavid.weatherapp.core.model.SupportedLanguage
 import com.github.odaridavid.weatherapp.core.model.TimeFormat
 import com.github.odaridavid.weatherapp.core.model.Units
@@ -24,6 +25,7 @@ class DefaultSettingsRepository @Inject constructor(
     private val PREF_UNITS by lazy { stringPreferencesKey(KEY_UNITS) }
     private val TIME_FORMAT by lazy { stringPreferencesKey(KEY_TIME_FORMAT) }
     private val PREF_LAT_LNG by lazy { stringPreferencesKey(KEY_LAT_LNG) }
+    private val PREF_EXCLUDED_DATA by lazy { stringPreferencesKey(KEY_EXCLUDED_DATA) }
 
     override suspend fun setLanguage(language: String) {
         set(key = PREF_LANGUAGE, value = language)
@@ -64,13 +66,22 @@ class DefaultSettingsRepository @Inject constructor(
     override suspend fun getFormat(): Flow<String> =
         get(key = TIME_FORMAT, default = TimeFormat.TWENTY_FOUR_HOUR.value)
 
-
     override suspend fun setFormat(format: String) {
         set(key = TIME_FORMAT, value = format)
     }
 
     override fun getFormats(): List<String> {
-       return TimeFormat.values().map { it.value }
+        return TimeFormat.entries.map { it.value }
+    }
+
+    override suspend fun getExcludedData(): Flow<String> = get(
+        key = PREF_EXCLUDED_DATA,
+        default = "${ExcludedData.MINUTELY.value},${ExcludedData.ALERTS.value}"
+    )
+
+    override suspend fun setExcludedData(excludedData: List<ExcludedData>) {
+        val formattedData = excludedData.joinToString(separator = ",") { it.value }
+        set(key = PREF_EXCLUDED_DATA, value = formattedData)
     }
 
     private suspend fun <T> set(key: Preferences.Key<T>, value: T) {
@@ -86,13 +97,14 @@ class DefaultSettingsRepository @Inject constructor(
     }
 
     companion object {
-        //Düsseldorf
+        // Düsseldorf
         const val DEFAULT_LONGITUDE = 6.773456
         const val DEFAULT_LATITUDE = 51.227741
 
         const val KEY_LANGUAGE = "language"
         const val KEY_UNITS = "units"
         const val KEY_LAT_LNG = "lat_lng"
         const val KEY_TIME_FORMAT = "time_formats"
+        const val KEY_EXCLUDED_DATA = "excluded_data"
     }
 }
diff --git a/app/src/main/java/com/github/odaridavid/weatherapp/data/weather/DefaultWeatherRepository.kt b/app/src/main/java/com/github/odaridavid/weatherapp/data/weather/DefaultWeatherRepository.kt
@@ -1,17 +1,15 @@
 package com.github.odaridavid.weatherapp.data.weather
 
 import com.github.odaridavid.weatherapp.core.Result
-import com.github.odaridavid.weatherapp.core.Result.Success
 import com.github.odaridavid.weatherapp.core.Result.Error
 import com.github.odaridavid.weatherapp.core.api.Logger
 import com.github.odaridavid.weatherapp.core.api.SettingsRepository
 import com.github.odaridavid.weatherapp.core.api.WeatherRepository
 import com.github.odaridavid.weatherapp.core.model.DefaultLocation
-import com.github.odaridavid.weatherapp.core.model.TimeFormat
 import com.github.odaridavid.weatherapp.core.model.Weather
 import com.github.odaridavid.weatherapp.data.weather.remote.RemoteWeatherDataSource
 import com.github.odaridavid.weatherapp.data.weather.remote.mapThrowableToErrorType
-import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.first
 import javax.inject.Inject
 
 class DefaultWeatherRepository @Inject constructor(
@@ -23,23 +21,23 @@ class DefaultWeatherRepository @Inject constructor(
     override suspend fun fetchWeatherData(
         defaultLocation: DefaultLocation,
         language: String,
-        units: String
+        units: String,
     ): Result<Weather> =
         try {
-            val format =
-                settingsRepository.getFormat().firstOrNull() ?: TimeFormat.TWENTY_FOUR_HOUR.value
+            val format = settingsRepository.getFormat().first()
+
+            val excludedData = settingsRepository.getExcludedData().first()
 
             remoteWeatherDataSource.fetchWeatherData(
                 defaultLocation = defaultLocation,
                 units = units,
                 language = language,
                 format = format,
+                excludedData = excludedData
             )
         } catch (throwable: Throwable) {
             val errorType = mapThrowableToErrorType(throwable)
             logger.logException(throwable)
             Error(errorType)
         }
-
-
 }
diff --git a/...va/com/github/odaridavid/weatherapp/data/weather/remote/DefaultRemoteWeatherDataSource.kt b/...va/com/github/odaridavid/weatherapp/data/weather/remote/DefaultRemoteWeatherDataSource.kt
@@ -3,7 +3,6 @@ package com.github.odaridavid.weatherapp.data.weather.remote
 import com.github.odaridavid.weatherapp.BuildConfig
 import com.github.odaridavid.weatherapp.core.Result
 import com.github.odaridavid.weatherapp.core.model.DefaultLocation
-import com.github.odaridavid.weatherapp.core.model.ExcludedData
 import com.github.odaridavid.weatherapp.core.model.SupportedLanguage
 import com.github.odaridavid.weatherapp.core.model.Weather
 import javax.inject.Inject
@@ -17,18 +16,17 @@ class DefaultRemoteWeatherDataSource @Inject constructor(
         language: String,
         units: String,
         format: String,
+        excludedData: String,
     ): Result<Weather> =
         try {
 
-            val excludedData = "${ExcludedData.MINUTELY.value},${ExcludedData.ALERTS.value}"
-
             val response = openWeatherService.getWeatherData(
                 longitude = defaultLocation.longitude,
                 latitude = defaultLocation.latitude,
                 excludedInfo = excludedData,
                 units = units,
                 language = getLanguageValue(language),
-                appid = BuildConfig.OPEN_WEATHER_API_KEY
+                appid = BuildConfig.OPEN_WEATHER_API_KEY,
             )
 
             if (response.isSuccessful && response.body() != null) {

diff --git a/app/src/main/java/com/github/odaridavid/weatherapp/data/weather/remote/Mappers.kt b/app/src/main/java/com/github/odaridavid/weatherapp/data/weather/remote/Mappers.kt
@@ -21,9 +21,9 @@ import java.util.Locale
 import kotlin.math.roundToInt
 
 fun WeatherResponse.toCoreModel(unit: String, format: String): Weather = Weather(
-    current = current.toCoreModel(unit = unit),
-    daily = daily.map { it.toCoreModel(unit = unit) },
-    hourly = hourly.map { it.toCoreModel(unit = unit, format = format) }
+    current = current?.toCoreModel(unit = unit),
+    daily = daily?.map { it.toCoreModel(unit = unit) },
+    hourly = hourly?.map { it.toCoreModel(unit = unit, format = format) }
 )
 
 fun CurrentWeatherResponse.toCoreModel(unit: String): CurrentWeather =

diff --git a/...main/java/com/github/odaridavid/weatherapp/data/weather/remote/RemoteWeatherDataSource.kt b/...main/java/com/github/odaridavid/weatherapp/data/weather/remote/RemoteWeatherDataSource.kt
@@ -11,5 +11,6 @@ interface RemoteWeatherDataSource {
         language: String,
         units: String,
         format: String,
+        excludedData: String
     ): Result<Weather>
 }
diff --git a/app/src/main/java/com/github/odaridavid/weatherapp/data/weather/remote/WeatherResponse.kt b/app/src/main/java/com/github/odaridavid/weatherapp/data/weather/remote/WeatherResponse.kt
@@ -5,9 +5,9 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class WeatherResponse(
-    @SerialName("current") val current: CurrentWeatherResponse,
-    @SerialName("hourly") val hourly: List<HourlyWeatherResponse>,
-    @SerialName("daily") val daily: List<DailyWeatherResponse>
+    @SerialName("current") val current: CurrentWeatherResponse? = null,
+    @SerialName("hourly") val hourly: List<HourlyWeatherResponse>? = null,
+    @SerialName("daily") val daily: List<DailyWeatherResponse>? = null,
 )
 
 @Serializable

diff --git a/app/src/main/java/com/github/odaridavid/weatherapp/designsystem/Theme.kt b/app/src/main/java/com/github/odaridavid/weatherapp/designsystem/Theme.kt
@@ -1,36 +1,18 @@
 package com.github.odaridavid.weatherapp.designsystem
 
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.darkColors
-import androidx.compose.material.lightColors
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
+import com.github.odaridavid.weatherapp.designsystem.atom.DarkColorPalette
 import com.github.odaridavid.weatherapp.designsystem.atom.Dimensions
+import com.github.odaridavid.weatherapp.designsystem.atom.LightColorPalette
 import com.github.odaridavid.weatherapp.designsystem.atom.LocalDimens
 import com.github.odaridavid.weatherapp.designsystem.atom.LocalWeight
 import com.github.odaridavid.weatherapp.designsystem.atom.Weight
-import com.github.odaridavid.weatherapp.designsystem.atom.pink200
-import com.github.odaridavid.weatherapp.designsystem.atom.pink500
-import com.github.odaridavid.weatherapp.designsystem.atom.pink600
-import com.github.odaridavid.weatherapp.designsystem.atom.pinkDarkPrimary
 import com.github.odaridavid.weatherapp.designsystem.atom.shapes
 import com.github.odaridavid.weatherapp.designsystem.atom.typography
 
-private val LightColorPalette = lightColors(
-    primary = pink500,
-    secondary = pink500,
-    primaryVariant = pink600,
-    onPrimary = Color.Black,
-    onSecondary = Color.Black
-)
-
-private val DarkColorPalette = darkColors(
-    primary = pink200,
-    secondary = pink200,
-    surface = pinkDarkPrimary
-)
-
+// TODO Debug menu or app to preview design system components
 @Composable
 fun WeatherAppTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) {
     val colors = if (darkTheme) {
@@ -40,7 +22,7 @@ fun WeatherAppTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Compos
     }
 
     MaterialTheme(
-        colors = colors,
+        colorScheme = colors,
         typography = typography,
         shapes = shapes,
         content = content
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@ import dagger.hilt.android.HiltAndroidApp

		@HiltAndroidApp
		class WeatherApp : Application()
		// TODO Add global error handling