diff --git a/compose-desktop.pro b/compose-desktop.pro new file mode 100644 index 0000000..66f1160 --- /dev/null +++ b/compose-desktop.pro @@ -0,0 +1,48 @@ +-dontobfuscate +-dontwarn retrofit2.** +-dontwarn org.** +-dontwarn okio.** +-dontwarn okhttp3.** +-dontwarn org.eclipse.** +#-dontwarn kotlin.** +#-dontwarn kotlinx.** +#-dontwarn net.** +#-dontwarn dagger.** +#-dontwarn com.** +#-dontwarn javax.** +#-dontwarn androidx.** +# +# +#-keep class kotlin.** { *; } +#-keep class org.jetbrains.skia.** { *; } +#-keep class org.jetbrains.skiko.** { *; } +# +#-assumenosideeffects public class androidx.compose.runtime.ComposerKt { +# void sourceInformation(androidx.compose.runtime.Composer,java.lang.String); +# void sourceInformationMarkerStart(androidx.compose.runtime.Composer,int,java.lang.String); +# void sourceInformationMarkerEnd(androidx.compose.runtime.Composer); +# boolean isTraceInProgress(); +# void traceEventStart(int, java.lang.String); +# void traceEventEnd(); +#} +# +## Kotlinx Coroutines Rules +## https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-core/jvm/resources/META-INF/proguard/coroutines.pro +# +#-keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {} +#-keepnames class kotlinx.coroutines.CoroutineExceptionHandler {} +#-keepclassmembers class kotlinx.coroutines.** { +# volatile ; +#} +#-keepclassmembers class kotlin.coroutines.SafeContinuation { +# volatile ; +#} +#-dontwarn java.lang.instrument.ClassFileTransformer +#-dontwarn sun.misc.SignalHandler +#-dontwarn java.lang.instrument.Instrumentation +#-dontwarn sun.misc.Signal +#-dontwarn java.lang.ClassValue +#-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement +# +## https://github.com/Kotlin/kotlinx.coroutines/issues/2046 +#-dontwarn android.annotation.SuppressLint \ No newline at end of file diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt index af99334..171045a 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt @@ -10,6 +10,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow @@ -75,52 +76,36 @@ fun CommitChangesView( ) { Column( modifier = Modifier + .padding(end = 8.dp, bottom = 8.dp) .fillMaxSize(), ) { val scroll = rememberScrollState(0) - Column( - modifier = Modifier - .fillMaxWidth() - .padding(end = 8.dp), - ) { - SelectionContainer { - Text( - text = commit.fullMessage, - style = MaterialTheme.typography.body2, - modifier = Modifier - .fillMaxWidth() - .background(MaterialTheme.colors.background) - .height(120.dp) - .padding(8.dp) - .verticalScroll(scroll), - ) - } - Divider(modifier = Modifier.fillMaxWidth()) - - Author(commit.id, commit.authorIdent) - } Column( modifier = Modifier .fillMaxWidth() .weight(1f, fill = true) - .padding(end = 8.dp, top = 8.dp, bottom = 8.dp) .background(MaterialTheme.colors.background) ) { - Text( - modifier = Modifier - .background(MaterialTheme.colors.headerBackground) - .padding(vertical = 8.dp, horizontal = 16.dp) - .fillMaxWidth(), - text = "Files changed", - fontWeight = FontWeight.Normal, - textAlign = TextAlign.Left, - color = MaterialTheme.colors.headerText, - maxLines = 1, - style = MaterialTheme.typography.body2, - ) + Box(modifier = Modifier + .fillMaxWidth() + .height(34.dp) + .background(MaterialTheme.colors.headerBackground), + contentAlignment = Alignment.CenterStart, + ) { + Text( + modifier = Modifier + .padding(vertical = 8.dp, horizontal = 16.dp), + text = "Files changed", + fontWeight = FontWeight.Normal, + textAlign = TextAlign.Left, + color = MaterialTheme.colors.headerText, + maxLines = 1, + style = MaterialTheme.typography.body2, + ) + } CommitLogChanges( @@ -131,6 +116,34 @@ fun CommitChangesView( onHistory = onHistory, ) } + + + Box(modifier = Modifier + .fillMaxWidth() + .height(2.dp) + .background(MaterialTheme.colors.secondaryTextColor.copy(alpha = 0.1f)) + ) + + Column( + modifier = Modifier + .fillMaxWidth() + .background(MaterialTheme.colors.background), + ) { + SelectionContainer { + Text( + text = commit.fullMessage, + style = MaterialTheme.typography.body1, + color = MaterialTheme.colors.onBackground, + modifier = Modifier + .fillMaxWidth() + .height(120.dp) + .padding(8.dp) + .verticalScroll(scroll), + ) + } + + Author(commit.id, commit.authorIdent) + } } } @@ -147,7 +160,7 @@ fun Author( modifier = Modifier .fillMaxWidth() .height(72.dp) - .background(MaterialTheme.colors.background), + .background(MaterialTheme.colors.headerBackground), verticalAlignment = Alignment.CenterVertically ) { AvatarImage(