Skip to content

Commit

Permalink
Merge pull request #46 from mende273/create_random_quote_screen
Browse files Browse the repository at this point in the history
create random quote screen
  • Loading branch information
mende273 authored Mar 21, 2023
2 parents a8b9a49 + 2174cf6 commit fb3a3c8
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import com.jumrukovski.quotescompose.ui.screen.categories.details.CategoryItemsV
import com.jumrukovski.quotescompose.ui.screen.detail.QuoteDetailScreen
import com.jumrukovski.quotescompose.ui.screen.favourites.FavouritesScreen
import com.jumrukovski.quotescompose.ui.screen.home.HomeScreen
import com.jumrukovski.quotescompose.ui.screen.random.RandomQuoteScreen

@Composable
fun AppNavigation(
Expand Down Expand Up @@ -62,5 +63,8 @@ fun AppNavigation(
}
}
}
composable(Screen.RandomQuote.route){
RandomQuoteScreen()
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ sealed class Screen(val route: String, @StringRes val resourceId: Int, @Drawable
object Home : Screen("home", R.string.screen_home, R.drawable.baseline_home_24)
object Categories : Screen("categories", R.string.screen_categories, R.drawable.baseline_category_24)
object Favourites : Screen("favourites", R.string.screen_favourites, R.drawable.baseline_favorite_24)
object RandomQuote:Screen("random quote",R.string.screen_random_quote,R.drawable.baseline_random)
}

sealed class ScreenWithArgument(private val originalRoute: String, val argument:String, @StringRes resourceId: Int, @DrawableRes icon: Int?):Screen("$originalRoute{$argument}", resourceId, icon){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import androidx.compose.ui.res.stringResource
import androidx.navigation.compose.rememberNavController
import com.jumrukovski.quotescompose.R
import com.jumrukovski.quotescompose.navigation.AppNavigation
import com.jumrukovski.quotescompose.navigation.Screen
import com.jumrukovski.quotescompose.ui.common.BottomNavigationBar
import com.jumrukovski.quotescompose.ui.common.Toolbar
import com.jumrukovski.quotescompose.ui.theme.QuotesComposeTheme
Expand All @@ -30,7 +31,7 @@ class MainActivity : ComponentActivity() {
MainScreenMenuItem.values().asList()
){
when(it){
MainScreenMenuItem.RANDOM -> ""//todo
MainScreenMenuItem.RANDOM -> navController.navigate(Screen.RandomQuote.route)
}
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.jumrukovski.quotescompose.ui.screen.random

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import com.jumrukovski.quotescompose.ui.theme.PrimaryBackgroundColor

@Composable
fun RandomQuoteScreen(){
Box(
modifier = Modifier
.fillMaxSize()
.background(MaterialTheme.colorScheme.PrimaryBackgroundColor),
contentAlignment = Alignment.Center
) {
Text(text = "Random Quote Screen")
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.jumrukovski.quotescompose.ui.screen.random

import androidx.lifecycle.ViewModel
import com.jumrukovski.quotescompose.data.repository.Repository
import dagger.hilt.android.lifecycle.HiltViewModel
import javax.inject.Inject

@HiltViewModel
class RandomQuoteViewModel@Inject constructor(private val repository: Repository): ViewModel() {
}
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@
<string name="screen_favourites">Favourites</string>
<string name="screen_quote_detail">Quote Detail</string>
<string name="screen_category_detail">Category Detail</string>
<string name="screen_random_quote">Random Quote</string>
</resources>

0 comments on commit fb3a3c8

Please sign in to comment.