-
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.
Merge branch 'refs/heads/master' into development
# Conflicts: # app/src/main/java/com/jk/gogit/components/Page.kt # app/src/main/java/com/jk/gogit/navigation/AppScreens.kt # app/src/main/java/com/jk/gogit/repositorydetails/RepoDetailScreen.kt # app/src/main/java/com/jk/gogit/repositorydetails/commits/CommitListScreen.kt
- Loading branch information
Showing
105 changed files
with
1,361 additions
and
4,357 deletions.
There are no files selected for viewing
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
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,45 @@ | ||
| package com.jk.gogit.components | ||
|
|
||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.material3.FilterChip | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.mutableStateOf | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.unit.dp | ||
| import com.hoppers.type.SearchType | ||
|
|
||
| @Composable | ||
| fun Chip( | ||
| modifier: Modifier = Modifier, | ||
| types: List<SearchType>, | ||
| onTypeSelected: (SearchType) -> Unit = {}, | ||
| ) { | ||
| val selectedType = remember { mutableStateOf(types.first()) } | ||
|
|
||
| Row( | ||
| modifier = modifier | ||
| .fillMaxWidth() | ||
| .padding(vertical = 16.dp), | ||
| horizontalArrangement = Arrangement.SpaceEvenly | ||
| ) { | ||
| types.forEach { type -> | ||
| val isSelected = selectedType.value == type | ||
| FilterChip(label = { | ||
| Text( | ||
| text = type.name, | ||
| modifier = Modifier.padding(8.dp) | ||
| ) | ||
| }, selected = isSelected, | ||
| onClick = { | ||
| selectedType.value = type | ||
| onTypeSelected(type) | ||
| } | ||
| ) | ||
| } | ||
| } | ||
| } |
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
57 changes: 57 additions & 0 deletions
57
app/src/main/java/com/jk/gogit/components/HyperLinkText.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,57 @@ | ||
| package com.jk.gogit.components | ||
|
|
||
| import androidx.compose.foundation.text.ClickableText | ||
| import androidx.compose.material3.LocalContentColor | ||
| import androidx.compose.material3.LocalTextStyle | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.text.SpanStyle | ||
| import androidx.compose.ui.text.TextStyle | ||
| import androidx.compose.ui.text.buildAnnotatedString | ||
| import androidx.compose.ui.text.font.FontWeight | ||
| import androidx.compose.ui.text.withStyle | ||
|
|
||
| @Composable | ||
| fun HyperLinkText( | ||
| hyperLink: String, | ||
| modifier: Modifier, | ||
| localString: String, | ||
| startIndex: Int, | ||
| endIndex: Int, | ||
| hyperLinkStyle: SpanStyle = SpanStyle(), | ||
| localStringStyle: TextStyle = LocalTextStyle.current, | ||
| action: (String) -> Unit | ||
| ) { | ||
|
|
||
| val annotatedString = buildAnnotatedString { | ||
| withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) { | ||
| append(hyperLink) | ||
| } | ||
| append(localString) | ||
| addStyle( | ||
| end = endIndex, | ||
| start = startIndex, | ||
| style = hyperLinkStyle | ||
| ) | ||
| addStringAnnotation( | ||
| annotation = hyperLink, | ||
| end = endIndex, | ||
| start = startIndex, | ||
| tag = "URL" | ||
| ) | ||
| } | ||
|
|
||
| ClickableText( | ||
| modifier = modifier, | ||
| style = localStringStyle.copy(color = LocalContentColor.current), | ||
| text = annotatedString, | ||
| onClick = { | ||
| annotatedString | ||
| .getStringAnnotations("URL", it, it) | ||
| .firstOrNull()?.let { stringAnnotation -> | ||
| action(stringAnnotation.item) | ||
| } | ||
| }, | ||
|
|
||
| ) | ||
| } |
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,31 @@ | ||
| package com.jk.gogit.components | ||
|
|
||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.unit.dp | ||
|
|
||
| @Composable | ||
| fun IconWithText(text: String, res: Int, tint: Color = Color.Black) { | ||
| Row(horizontalArrangement = Arrangement.spacedBy(1.dp)) { | ||
|
|
||
| Icon( | ||
| painter = painterResource(id = res), | ||
| contentDescription = null, | ||
| tint = tint, | ||
| modifier = Modifier.size(16.dp) | ||
| ) | ||
| Text( | ||
| text = text, | ||
| style = MaterialTheme.typography.bodySmall, | ||
| // fontFamily = FontFamily(Font(R.font.bebasneue_light)), | ||
| ) | ||
| } | ||
| } |
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,40 @@ | ||
| package com.jk.gogit.components | ||
|
|
||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.OutlinedButton | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import com.jk.gogit.R | ||
|
|
||
| @Composable | ||
| @Preview | ||
| fun OfflineError( | ||
| modifier: Modifier = Modifier, | ||
| retryHandler: () -> Unit = {}, | ||
| title: String = "You're offline", | ||
| message: String = "Check your connection" | ||
| ) { | ||
|
|
||
| Column( | ||
| modifier = modifier, | ||
| verticalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterVertically), | ||
| horizontalAlignment = Alignment.CenterHorizontally | ||
| ) { | ||
| Icon(painterResource(id = R.drawable.wifi_off_48dp), contentDescription = "Error") | ||
| Text(text = title, style = MaterialTheme.typography.headlineSmall) | ||
| Text(text = message, style = MaterialTheme.typography.bodyLarge) | ||
|
|
||
| OutlinedButton(onClick = retryHandler) { | ||
| Text(text = "Try again") | ||
| } | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.