mirror of
https://github.com/msfjarvis/compose-lobsters
synced 2025-08-18 04:27:02 +05:30
Merge #97
97: Resolve a couple Lint issues r=msfjarvis a=msfjarvis bors r+ Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
commit
9efc9d53a5
11 changed files with 8 additions and 13 deletions
|
@ -9,7 +9,7 @@
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
android:icon="@mipmap/ic_launcher"
|
android:icon="@mipmap/ic_launcher"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:roundIcon="@mipmap/ic_launcher_round"
|
android:roundIcon="@mipmap/ic_launcher"
|
||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
android:theme="@style/Theme.AppCompat.DayNight">
|
android:theme="@style/Theme.AppCompat.DayNight">
|
||||||
<activity
|
<activity
|
||||||
|
|
|
@ -32,7 +32,7 @@ import dev.msfjarvis.lobsters.ui.posts.HottestPosts
|
||||||
import dev.msfjarvis.lobsters.ui.posts.SavedPosts
|
import dev.msfjarvis.lobsters.ui.posts.SavedPosts
|
||||||
import dev.msfjarvis.lobsters.ui.theme.LobstersTheme
|
import dev.msfjarvis.lobsters.ui.theme.LobstersTheme
|
||||||
import dev.msfjarvis.lobsters.ui.urllauncher.UrlLauncher
|
import dev.msfjarvis.lobsters.ui.urllauncher.UrlLauncher
|
||||||
import dev.msfjarvis.lobsters.ui.urllauncher.UrlLauncherAmbient
|
import dev.msfjarvis.lobsters.ui.urllauncher.AmbientUrlLauncher
|
||||||
import dev.msfjarvis.lobsters.ui.viewmodel.LobstersViewModel
|
import dev.msfjarvis.lobsters.ui.viewmodel.LobstersViewModel
|
||||||
import dev.msfjarvis.lobsters.util.IconResource
|
import dev.msfjarvis.lobsters.util.IconResource
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
@ -46,7 +46,7 @@ class MainActivity : AppCompatActivity() {
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
setContent {
|
setContent {
|
||||||
Providers(UrlLauncherAmbient provides urlLauncher) {
|
Providers(AmbientUrlLauncher provides urlLauncher) {
|
||||||
LobstersTheme {
|
LobstersTheme {
|
||||||
LobstersApp()
|
LobstersApp()
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,7 @@ import androidx.paging.LoadState
|
||||||
import androidx.paging.compose.LazyPagingItems
|
import androidx.paging.compose.LazyPagingItems
|
||||||
import androidx.paging.compose.items
|
import androidx.paging.compose.items
|
||||||
import dev.msfjarvis.lobsters.model.LobstersPost
|
import dev.msfjarvis.lobsters.model.LobstersPost
|
||||||
import dev.msfjarvis.lobsters.ui.urllauncher.UrlLauncherAmbient
|
import dev.msfjarvis.lobsters.ui.urllauncher.AmbientUrlLauncher
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun HottestPosts(
|
fun HottestPosts(
|
||||||
|
@ -17,7 +17,7 @@ fun HottestPosts(
|
||||||
modifier: Modifier = Modifier,
|
modifier: Modifier = Modifier,
|
||||||
saveAction: (LobstersPost) -> Unit,
|
saveAction: (LobstersPost) -> Unit,
|
||||||
) {
|
) {
|
||||||
val urlLauncher = UrlLauncherAmbient.current
|
val urlLauncher = AmbientUrlLauncher.current
|
||||||
|
|
||||||
if (posts.loadState.refresh == LoadState.Loading) {
|
if (posts.loadState.refresh == LoadState.Loading) {
|
||||||
EmptyList(saved = false)
|
EmptyList(saved = false)
|
||||||
|
|
|
@ -5,7 +5,7 @@ import androidx.compose.foundation.lazy.rememberLazyListState
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import dev.msfjarvis.lobsters.model.LobstersPost
|
import dev.msfjarvis.lobsters.model.LobstersPost
|
||||||
import dev.msfjarvis.lobsters.ui.urllauncher.UrlLauncherAmbient
|
import dev.msfjarvis.lobsters.ui.urllauncher.AmbientUrlLauncher
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun SavedPosts(
|
fun SavedPosts(
|
||||||
|
@ -14,7 +14,7 @@ fun SavedPosts(
|
||||||
saveAction: (LobstersPost) -> Unit,
|
saveAction: (LobstersPost) -> Unit,
|
||||||
) {
|
) {
|
||||||
val listState = rememberLazyListState()
|
val listState = rememberLazyListState()
|
||||||
val urlLauncher = UrlLauncherAmbient.current
|
val urlLauncher = AmbientUrlLauncher.current
|
||||||
|
|
||||||
if (posts.isEmpty()) {
|
if (posts.isEmpty()) {
|
||||||
EmptyList(saved = true)
|
EmptyList(saved = true)
|
||||||
|
|
|
@ -2,4 +2,4 @@ package dev.msfjarvis.lobsters.ui.urllauncher
|
||||||
|
|
||||||
import androidx.compose.runtime.staticAmbientOf
|
import androidx.compose.runtime.staticAmbientOf
|
||||||
|
|
||||||
val UrlLauncherAmbient = staticAmbientOf<UrlLauncher> { error("Needs to be provided") }
|
val AmbientUrlLauncher = staticAmbientOf<UrlLauncher> { error("Needs to be provided") }
|
|
@ -1,5 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<background android:drawable="@mipmap/ic_launcher_background" />
|
|
||||||
<foreground android:drawable="@mipmap/ic_launcher_foreground" />
|
|
||||||
</adaptive-icon>
|
|
Binary file not shown.
Before Width: | Height: | Size: 3.5 KiB |
Binary file not shown.
Before Width: | Height: | Size: 2.2 KiB |
Binary file not shown.
Before Width: | Height: | Size: 4.9 KiB |
Binary file not shown.
Before Width: | Height: | Size: 7.5 KiB |
Binary file not shown.
Before Width: | Height: | Size: 11 KiB |
Loading…
Add table
Add a link
Reference in a new issue