forked from PratyushSingh07/IssueHive
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix PratyushSingh07#45:Migrate home screen to compose
- Loading branch information
1 parent
886a97c
commit c6c09bf
Showing
6 changed files
with
79 additions
and
99 deletions.
There are no files selected for viewing
18 changes: 9 additions & 9 deletions
18
app/src/main/java/com/example/findissues/models/home/User.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| package com.example.findissues.models.home | ||
|
|
||
| data class User( | ||
| val login: String="", | ||
| val avatar_url: String="", | ||
| val name: String="", | ||
| val bio: String="", | ||
| val company: String="", | ||
| val location: String="", | ||
| val twitter_username: String="", | ||
| val followers: Int=0, | ||
| val following: Int=0 | ||
| val login: String = "", | ||
| val avatar_url: String = "", | ||
| val name: String = "", | ||
| val bio: String = "", | ||
| val company: String = "", | ||
| val location: String = "", | ||
| val twitter_username: String = "", | ||
| val followers: Int = 0, | ||
| val following: Int = 0 | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| package com.example.findissues.ui.theme | ||
|
|
||
| import androidx.compose.ui.graphics.Color | ||
|
|
||
| val GitHub_Bkg = Color(0xFF0d1117) | ||
| val Grey40 = Color(0xFFb7b8ba) |
36 changes: 36 additions & 0 deletions
36
app/src/main/java/com/example/findissues/ui/theme/Theme.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package com.example.findissues.ui.theme | ||
|
|
||
| import androidx.compose.foundation.isSystemInDarkTheme | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.darkColorScheme | ||
| import androidx.compose.material3.lightColorScheme | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.graphics.Color | ||
|
|
||
| private val DarkColorScheme = darkColorScheme( | ||
| primary = GitHub_Bkg, | ||
| secondary = Color.Black, | ||
| tertiary = Grey40 | ||
| ) | ||
|
|
||
| private val LightColorScheme = lightColorScheme( | ||
| primary = GitHub_Bkg, | ||
| secondary = Color.Black, | ||
| tertiary = Grey40 | ||
|
|
||
| ) | ||
|
|
||
| @Composable | ||
| fun FindIssueTheme( | ||
| darkTheme: Boolean = isSystemInDarkTheme(), | ||
| content: @Composable () -> Unit | ||
| ) { | ||
| val colorScheme = when { | ||
| darkTheme -> DarkColorScheme | ||
| else -> LightColorScheme | ||
| } | ||
| MaterialTheme( | ||
| colorScheme = colorScheme, | ||
| content = content | ||
| ) | ||
| } |
19 changes: 3 additions & 16 deletions
19
.../example/findissues/ui/home/HomeAppBar.kt → ...m/example/core/ui/components/AppTopBar.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,24 @@ | ||
| package com.example.findissues.ui.home | ||
| package com.example.core.ui.components | ||
|
|
||
| import androidx.compose.material.TopAppBar | ||
| import androidx.compose.material.icons.Icons | ||
| import androidx.compose.material.icons.filled.Menu | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.IconButton | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.font.FontWeight | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import com.example.findissues.R | ||
|
|
||
| @Composable | ||
| fun HomeAppBar() { | ||
| fun AppTopBar(title: Int) { | ||
| TopAppBar( | ||
| title = { | ||
| Text( | ||
| text = stringResource(id = R.string.home), | ||
| text = stringResource(id = title), | ||
| fontWeight = FontWeight.Medium, | ||
| color = Color.White, | ||
| style = MaterialTheme.typography.headlineSmall | ||
| ) | ||
| }, | ||
| backgroundColor = Color(0xFF0d1117), | ||
|
|
||
| ) | ||
| } | ||
|
|
||
| @Preview( showBackground = true) | ||
| @Composable | ||
| fun HomeAppBarPreview() { | ||
| HomeAppBar() | ||
| } |