Julian/Gitnuro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduced more font sizes

Browse Source 
Reduced font size commit changes header & for commit message box in uncommited changes
This commit is contained in:
Abdelilah El Aissaoui 2021-09-30 03:27:27 +02:00
parent 790845b3ec
commit 265d4647ab
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/kotlin/CommitChanges.kt
View File

@ -54,6 +54,7 @@ fun CommitChanges(commitDiff: Pair<RevCommit, List<DiffEntry>>, onDiffSelected:
Column { Column {
Text( Text(
text = commit.fullMessage, text = commit.fullMessage,
fontSize = 14.sp,
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.height(120.dp) .height(120.dp)
@ -89,11 +90,12 @@ fun CommitChanges(commitDiff: Pair<RevCommit, List<DiffEntry>>, onDiffSelected:
text = commit.authorIdent.name, text = commit.authorIdent.name,
color = MaterialTheme.colors.primaryTextColor, color = MaterialTheme.colors.primaryTextColor,
maxLines = 1, maxLines = 1,
fontSize = 14.sp,
) )
Spacer(modifier = Modifier.weight(1f, fill = true)) Spacer(modifier = Modifier.weight(1f, fill = true))
val date = remember(commit) { val date = remember(commit) {
commit.authorIdent.`when`.toSystemString() commit.authorIdent.`when`.toSmartSystemString()
} }
Text( Text(
@ -101,6 +103,7 @@ fun CommitChanges(commitDiff: Pair<RevCommit, List<DiffEntry>>, onDiffSelected:
color = MaterialTheme.colors.secondaryTextColor, color = MaterialTheme.colors.secondaryTextColor,
maxLines = 1, maxLines = 1,
modifier = Modifier.padding(horizontal = 16.dp), modifier = Modifier.padding(horizontal = 16.dp),
fontSize = 12.sp,
) )
} }
@ -109,6 +112,7 @@ fun CommitChanges(commitDiff: Pair<RevCommit, List<DiffEntry>>, onDiffSelected:
text = commit.authorIdent.emailAddress, text = commit.authorIdent.emailAddress,
color = MaterialTheme.colors.secondaryTextColor, color = MaterialTheme.colors.secondaryTextColor,
maxLines = 1, maxLines = 1,
fontSize = 12.sp,
) )
} }
} }

5
src/main/kotlin/Log.kt
View File

@ -11,11 +11,10 @@ import androidx.compose.runtime.*
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontStyle
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import extensions.toSystemString import extensions.toSmartSystemString
import git.LogStatus import git.LogStatus
import org.eclipse.jgit.revwalk.RevCommit import org.eclipse.jgit.revwalk.RevCommit
import theme.primaryTextColor import theme.primaryTextColor
@ -117,7 +116,7 @@ fun Log(
Spacer(modifier = Modifier.weight(2f)) Spacer(modifier = Modifier.weight(2f))
Text( Text(
text = item.committerIdent.`when`.toSystemString(), text = item.committerIdent.`when`.toSmartSystemString(),
modifier = Modifier.padding(horizontal = 16.dp), modifier = Modifier.padding(horizontal = 16.dp),
fontSize = 12.sp, fontSize = 12.sp,
color = MaterialTheme.colors.secondaryTextColor, color = MaterialTheme.colors.secondaryTextColor,

11
src/main/kotlin/UncommitedChanges.kt
View File

@ -23,6 +23,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.input.pointer.pointerMoveFilter import androidx.compose.ui.input.pointer.pointerMoveFilter
import androidx.compose.ui.platform.ContextMenuItem import androidx.compose.ui.platform.ContextMenuItem
import androidx.compose.ui.platform.ContextMenuState import androidx.compose.ui.platform.ContextMenuState
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
@ -114,8 +115,9 @@ fun UncommitedChanges(
.weight(weight = 1f, fill = true), .weight(weight = 1f, fill = true),
value = commitMessage, value = commitMessage,
onValueChange = { commitMessage = it }, onValueChange = { commitMessage = it },
label = { Text("Write your commit message here") }, label = { Text("Write your commit message here", fontSize = 14.sp) },
colors = TextFieldDefaults.textFieldColors(backgroundColor = MaterialTheme.colors.surface) colors = TextFieldDefaults.textFieldColors(backgroundColor = MaterialTheme.colors.surface),
textStyle = TextStyle.Default.copy(fontSize = 14.sp)
) )
Button( Button(
@ -128,7 +130,10 @@ fun UncommitedChanges(
enabled = commitMessage.isNotEmpty() && staged.isNotEmpty(), enabled = commitMessage.isNotEmpty() && staged.isNotEmpty(),
shape = RectangleShape, shape = RectangleShape,
) { ) {
Text("Commit") Text(
text = "Commit",
fontSize = 14.sp,
)
} }
} }
} }