Berufsschule
/
m335-breeze
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linting changes

This commit is contained in:
Lorenz Hohermuth 2025-03-25 11:40:51 +01:00
parent 2f9109d0ae
commit d88bb72378
9 changed files with 451 additions and 512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/androidTest/java/com/module/breeze/ExampleInstrumentedTest.kt
View File

@ -1,24 +0,0 @@
package com.module.breeze
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.Assert.*
/**
* Instrumented test, which will execute on an Android device.
*
* See [testing documentation](http://d.android.com/tools/testing).
*/
@RunWith(AndroidJUnit4::class)
class ExampleInstrumentedTest {
@Test
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("com.module.breeze", appContext.packageName)
}
}

9
app/src/main/java/com/module/breeze/GpsRepository.kt
View File

@ -18,15 +18,16 @@ class GpsRepository(private val context: Context) : LocationListener {
this.onLocationChanged = onLocationChanged
locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
if (ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION)
==
PackageManager.PERMISSION_GRANTED
if (ContextCompat.checkSelfPermission(
context,
Manifest.permission.ACCESS_FINE_LOCATION,
) == PackageManager.PERMISSION_GRANTED
) {
locationManager?.requestLocationUpdates(
LocationManager.GPS_PROVIDER,
1000L,
1f,
this
this,
)
}
}

82
app/src/main/java/com/module/breeze/MainActivity.kt
View File

@ -1,12 +1,17 @@
package com.module.breeze
import android.Manifest
import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
import android.location.Location
import android.os.Build
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.activity.result.contract.ActivityResultContracts
import androidx.annotation.RequiresApi
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
@ -31,6 +36,7 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
@ -45,33 +51,18 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.core.content.ContextCompat
import com.module.breeze.ui.theme.BreezeTheme
import kotlinx.coroutines.runBlocking
import java.text.DecimalFormat
import java.time.LocalDate
import kotlin.math.roundToInt
import android.Manifest
import android.content.pm.PackageManager
import android.location.Location
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.layout.Column
import androidx.compose.material3.Button
import androidx.compose.material3.Text
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.platform.LocalContext
import androidx.core.content.ContextCompat
val fontSizeCurrentTemp = 48.sp
val fontSizeUpper = 16.sp
val fontSizeTitle = 22.sp
val breezeFontWeight = FontWeight.Bold
val iconStyle = Icons.Outlined;
val iconStyle = Icons.Outlined
val textColor = Color(0, 0, 0)
val numberFormat = DecimalFormat("00")
val apiKey = "8a6090c4308455152cd8c677b802883b"
@ -84,7 +75,7 @@ class MainActivity : ComponentActivity() {
BreezeTheme {
Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
WeatherInfo(
modifier = Modifier.padding(innerPadding)
modifier = Modifier.padding(innerPadding),
)
}
}
@ -115,16 +106,10 @@ fun fetchWeather(ctx: Context): ForecastSummary {
var data: ForecastSummary
runBlocking {
val forecastResponse = RetrofitClient.instance.getWeatherForecast("${todayPlz},ch", apiKey)
val forecastResponse = RetrofitClient.instance.getWeatherForecast("$todayPlz,ch", apiKey)
val todaysForecast = getTodaysForecast(forecastResponse)
data = todaysForecast
println("Today's Forecast for ${todayPlz}:")
println("Min Temperature: ${todaysForecast.minTemp}°C")
println("Max Temperature: ${todaysForecast.maxTemp}°C")
println("Rain: ${if (todaysForecast.hasRain) "Yes" else "No"}")
println("Snow: ${if (todaysForecast.hasSnow) "Yes" else "No"}")
println("Strong Winds: ${if (todaysForecast.hasStrongWinds) "Yes" else "No"}")
}
return data
}
@ -137,14 +122,13 @@ fun fetchCurrentTemp(ctx: Context, lat: Double, lon: Double): WeatherResponse {
return data
}
@Composable
fun WeatherInfo(modifier: Modifier = Modifier) {
val ctx = LocalContext.current
var forecast by remember { mutableStateOf(ForecastSummary(0.0, 0.0, false, false, false)) }
var currentTemp by remember {
mutableStateOf(
WeatherResponse(Main(0.0, 0.0, 0.0, 0.0, 0, 0), emptyList(), 0L)
WeatherResponse(Main(0.0, 0.0, 0.0, 0.0, 0, 0), emptyList(), 0L),
)
}
val locationHelper = remember { GpsRepository(ctx) }
@ -152,17 +136,17 @@ fun WeatherInfo(modifier: Modifier = Modifier) {
var location by remember { mutableStateOf<Location?>(null) }
val locationPermission = ContextCompat.checkSelfPermission(
ctx, Manifest.permission.ACCESS_FINE_LOCATION
ctx,
Manifest.permission.ACCESS_FINE_LOCATION,
)
var hasLocationPermission by remember {
mutableStateOf(locationPermission == PackageManager.PERMISSION_GRANTED)
}
val permissionLauncher = rememberLauncherForActivityResult(
ActivityResultContracts.RequestPermission()
ActivityResultContracts.RequestPermission(),
) { isGranted -> hasLocationPermission = isGranted }
DisposableEffect(key1 = locationHelper, key2 = hasLocationPermission) {
if (hasLocationPermission) {
locationHelper.startListening { newLocation ->
@ -179,9 +163,11 @@ fun WeatherInfo(modifier: Modifier = Modifier) {
forecast = fetchWeather(ctx)
}
Navigation(
iconStyle.Settings, "Settings Icon", onClick = { MainActivity.openSettings(ctx) })
iconStyle.Settings,
"Settings Icon",
onClick = { MainActivity.openSettings(ctx) },
)
Column(
modifier = Modifier.fillMaxSize(),
@ -194,41 +180,43 @@ fun WeatherInfo(modifier: Modifier = Modifier) {
contentDescription = "Location Icon",
modifier = Modifier
.padding(end = 16.dp)
.size(32.dp)
.size(32.dp),
)
Icon(
imageVector = iconStyle.WaterDrop,
contentDescription = "Rain Icon",
modifier = Modifier.alpha(if (forecast.hasRain) 1F else 0.2F)
modifier = Modifier.alpha(if (forecast.hasRain) 1F else 0.2F),
)
Icon(
imageVector = iconStyle.AcUnit,
contentDescription = "Snow Icon",
modifier = Modifier.alpha(if (forecast.hasSnow) 1F else 0.2F)
modifier = Modifier.alpha(if (forecast.hasSnow) 1F else 0.2F),
)
Icon(
imageVector = iconStyle.Air,
contentDescription = "Wind Icon",
modifier = Modifier.alpha(if (forecast.hasStrongWinds) 1F else 0.2F)
modifier = Modifier.alpha(if (forecast.hasStrongWinds) 1F else 0.2F),
)
}
Row {
Icon(
imageVector = iconStyle.ArrowDownward, contentDescription = "Arrow down Icon"
imageVector = iconStyle.ArrowDownward,
contentDescription = "Arrow down Icon",
)
Text(
text = numberFormat.format(forecast.minTemp.roundToInt()) + "°",
fontSize = fontSizeUpper,
fontWeight = breezeFontWeight
fontWeight = breezeFontWeight,
)
Icon(
imageVector = iconStyle.ArrowUpward, contentDescription = "Arrow up Icon"
imageVector = iconStyle.ArrowUpward,
contentDescription = "Arrow up Icon",
)
Text(
text = numberFormat.format(forecast.maxTemp.roundToInt()) + "°",
fontSize = fontSizeUpper,
fontWeight = breezeFontWeight
fontWeight = breezeFontWeight,
)
}
if (hasLocationPermission) {
@ -246,7 +234,8 @@ fun WeatherInfo(modifier: Modifier = Modifier) {
permissionLauncher.launch(Manifest.permission.ACCESS_FINE_LOCATION)
},
colors = ButtonDefaults.buttonColors(
containerColor = Color(0, 0, 0, 20), contentColor = textColor
containerColor = Color(0, 0, 0, 20),
contentColor = textColor,
),
) {
Text(
@ -266,25 +255,26 @@ fun GreetingPreview() {
}
}
@Composable
fun Navigation(icon: ImageVector, iconDescription: String, onClick: () -> Unit = {}) {
Row(
horizontalArrangement = Arrangement.End, modifier = Modifier.fillMaxWidth()
horizontalArrangement = Arrangement.End,
modifier = Modifier.fillMaxWidth(),
) {
Button(
onClick = onClick,
colors = ButtonDefaults.buttonColors(
containerColor = Color(255, 0, 0, 0), contentColor = textColor
containerColor = Color(255, 0, 0, 0),
contentColor = textColor,
),
shape = CircleShape,
contentPadding = PaddingValues(0.dp),
modifier = Modifier.padding(0.dp, 40.dp, 28.dp, 0.dp)
modifier = Modifier.padding(0.dp, 40.dp, 28.dp, 0.dp),
) {
Icon(
imageVector = icon,
contentDescription = iconDescription,
modifier = Modifier.size(40.dp)
modifier = Modifier.size(40.dp),
)
}
}

35
app/src/main/java/com/module/breeze/SettingsActivity.kt
View File

@ -1,6 +1,5 @@
package com.module.breeze
import android.content.Context
import android.content.Intent
import android.os.Bundle
@ -54,7 +53,6 @@ var plzArrayStatus: List<String> = listOf(
"Loading...",
)
// ### Start ChatGPT + Fixing
val SHARED_PLZ_KEY = stringPreferencesKey("shared-plz")
val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "settings")
@ -86,7 +84,6 @@ suspend fun setPLZ(index: Int, value: String, ctx: Context) {
setLocations(ctx, arr)
}
class SettingsActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@ -95,7 +92,7 @@ class SettingsActivity : ComponentActivity() {
BreezeTheme {
Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
Settings(
modifier = Modifier.padding(innerPadding)
modifier = Modifier.padding(innerPadding),
)
}
}
@ -107,8 +104,6 @@ class SettingsActivity : ComponentActivity() {
var intent = Intent(ctx, MainActivity::class.java)
ctx.startActivity(intent)
}
}
}
@ -116,29 +111,29 @@ class SettingsActivity : ComponentActivity() {
fun Settings(modifier: Modifier = Modifier) {
val ctx = LocalContext.current
Navigation(iconStyle.Home, "Home Icon", onClick = {
SettingsActivity.openHome(ctx)
})
Navigation(
iconStyle.Home,
"Home Icon",
onClick = { SettingsActivity.openHome(ctx) },
)
Column(
modifier = Modifier.fillMaxSize(),
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally
)
{
horizontalAlignment = Alignment.CenterHorizontally,
) {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.padding(16.dp)
)
{
modifier = Modifier.padding(16.dp),
) {
Icon(
imageVector = iconStyle.Map,
contentDescription = "Configured Locations Icon",
modifier = Modifier.size(40.dp)
modifier = Modifier.size(40.dp),
)
Text(
text = "Configured Locations",
fontWeight = breezeFontWeight,
fontSize = fontSizeTitle
fontSize = fontSizeTitle,
)
}
ConfiguredLocationDay("Monday", 0, ctx)
@ -184,12 +179,12 @@ fun ConfiguredLocationDay(dayName: String = "day", index: Int, ctx: Context) {
} else {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.padding(0.dp, 4.dp)
modifier = Modifier.padding(0.dp, 4.dp),
) {
Text(
text = dayName,
fontWeight = breezeFontWeight,
modifier = Modifier.width(100.dp)
modifier = Modifier.width(100.dp),
)
TextField(
value = plz,
@ -202,7 +197,7 @@ fun ConfiguredLocationDay(dayName: String = "day", index: Int, ctx: Context) {
},
label = { Text("PLZ") },
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
modifier = Modifier.width(110.dp)
modifier = Modifier.width(110.dp),
)
}
}

39
app/src/main/java/com/module/breeze/WheatherRepository.kt
View File

@ -1,11 +1,11 @@
package com.module.breeze
import okhttp3.OkHttpClient
import okhttp3.logging.HttpLoggingInterceptor
import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory
import retrofit2.http.GET
import retrofit2.http.Query
import okhttp3.OkHttpClient
import okhttp3.logging.HttpLoggingInterceptor
import java.util.Date
// Whole File DeepSeek
@ -13,7 +13,7 @@ import java.util.Date
data class WeatherResponse(
val main: Main,
val weather: List<Weather>,
val dt: Long
val dt: Long,
)
data class Main(
@ -22,18 +22,18 @@ data class Main(
val temp_min: Double,
val temp_max: Double,
val pressure: Int,
val humidity: Int
val humidity: Int,
)
data class Weather(
val id: Int,
val main: String,
val description: String,
val icon: String
val icon: String,
)
data class ForecastResponse(
val list: List<Forecast>
val list: List<Forecast>,
)
data class Forecast(
@ -42,20 +42,20 @@ data class Forecast(
val weather: List<Weather>,
val wind: Wind,
val rain: Rain?,
val snow: Snow?
val snow: Snow?,
)
data class Wind(
val speed: Double,
val deg: Int
val deg: Int,
)
data class Rain(
val `3h`: Double?
val `3h`: Double?,
)
data class Snow(
val `3h`: Double?
val `3h`: Double?,
)
// Retrofit API interface
@ -65,14 +65,14 @@ interface WeatherApiService {
@Query("lat") lat: Double,
@Query("lon") lon: Double,
@Query("appid") apiKey: String,
@Query("units") units: String = "metric"
@Query("units") units: String = "metric",
): WeatherResponse
@GET("forecast")
suspend fun getWeatherForecast(
@Query("zip") zip: String,
@Query("appid") apiKey: String,
@Query("units") units: String = "metric"
@Query("units") units: String = "metric",
): ForecastResponse
}
@ -84,16 +84,11 @@ object RetrofitClient {
level = HttpLoggingInterceptor.Level.BODY
}
private val httpClient = OkHttpClient.Builder()
.addInterceptor(logging)
.build()
private val httpClient = OkHttpClient.Builder().addInterceptor(logging).build()
val instance: WeatherApiService by lazy {
Retrofit.Builder()
.baseUrl(BASE_URL)
.client(httpClient)
.addConverterFactory(GsonConverterFactory.create())
.build()
Retrofit.Builder().baseUrl(BASE_URL).client(httpClient)
.addConverterFactory(GsonConverterFactory.create()).build()
.create(WeatherApiService::class.java)
}
}
@ -120,7 +115,7 @@ fun getTodaysForecast(forecastResponse: ForecastResponse): ForecastSummary {
maxTemp = maxTemp,
hasRain = hasRain,
hasSnow = hasSnow,
hasStrongWinds = hasStrongWinds
hasStrongWinds = hasStrongWinds,
)
}
@ -130,5 +125,5 @@ data class ForecastSummary(
val maxTemp: Double,
val hasRain: Boolean,
val hasSnow: Boolean,
val hasStrongWinds: Boolean
val hasStrongWinds: Boolean,
)

9
app/src/main/java/com/module/breeze/ui/theme/Theme.kt
View File

@ -1,6 +1,5 @@
package com.module.breeze.ui.theme
import android.app.Activity
import android.os.Build
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.MaterialTheme
@ -14,13 +13,13 @@ import androidx.compose.ui.platform.LocalContext
private val DarkColorScheme = darkColorScheme(
primary = Purple80,
secondary = PurpleGrey80,
tertiary = Pink80
tertiary = Pink80,
)
private val LightColorScheme = lightColorScheme(
primary = Purple40,
secondary = PurpleGrey40,
tertiary = Pink40
tertiary = Pink40,
/* Other default colors to override
background = Color(0xFFFFFBFE),
@ -38,7 +37,7 @@ fun BreezeTheme(
darkTheme: Boolean = isSystemInDarkTheme(),
// Dynamic color is available on Android 12+
dynamicColor: Boolean = true,
content: @Composable () -> Unit
content: @Composable () -> Unit,
) {
val colorScheme = when {
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
@ -53,6 +52,6 @@ fun BreezeTheme(
MaterialTheme(
colorScheme = colorScheme,
typography = Typography,
content = content
content = content,
)
}

4
app/src/main/java/com/module/breeze/ui/theme/Type.kt
View File

@ -13,8 +13,8 @@ val Typography = Typography(
fontWeight = FontWeight.Normal,
fontSize = 16.sp,
lineHeight = 24.sp,
letterSpacing = 0.5.sp
)
letterSpacing = 0.5.sp,
),
/* Other default text styles to override
titleLarge = TextStyle(
fontFamily = FontFamily.Default,

17
app/src/test/java/com/module/breeze/ExampleUnitTest.kt
View File

@ -1,17 +0,0 @@
package com.module.breeze
import org.junit.Test
import org.junit.Assert.*
/**
* Example local unit test, which will execute on the development machine (host).
*
* See [testing documentation](http://d.android.com/tools/testing).
*/
class ExampleUnitTest {
@Test
fun addition_isCorrect() {
assertEquals(4, 2 + 2)
}
}