current stand

This commit is contained in:
Myzel394 2023-10-25 15:44:05 +02:00
parent 8c77376fa6
commit d6a95c4ce1
No known key found for this signature in database
GPG Key ID: 50098FCA22080F0F
3 changed files with 87 additions and 23 deletions

View File

@ -5,12 +5,16 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.filled.OpenInNew
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
@ -24,9 +28,11 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.ColorFilter
import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.navigation.NavController import androidx.navigation.NavController
import app.myzel394.alibi.R import app.myzel394.alibi.R
@ -64,34 +70,79 @@ fun AboutScreen(
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.padding(padding), .padding(padding)
verticalArrangement = Arrangement.spacedBy(16.dp), .padding(horizontal = 32.dp),
verticalArrangement = Arrangement.spacedBy(48.dp),
horizontalAlignment = Alignment.CenterHorizontally, horizontalAlignment = Alignment.CenterHorizontally,
) { ) {
Box( Column(
modifier = Modifier verticalArrangement = Arrangement.spacedBy(16.dp),
.clip(CircleShape) horizontalAlignment = Alignment.CenterHorizontally,
.size(200.dp)
.background(
MaterialTheme.colorScheme.surfaceVariant
),
) { ) {
Image( Box(
painter = painterResource(R.drawable.launcher_foreground), modifier = Modifier
contentDescription = null, .clip(CircleShape)
.size(200.dp)
.background(
MaterialTheme.colorScheme.surfaceVariant
),
) {
Image(
painter = painterResource(R.drawable.launcher_foreground),
contentDescription = null,
)
}
Text(
text = stringResource(R.string.app_name),
style = MaterialTheme.typography.headlineLarge,
)
Text(
text = "Version %s (%s)".format(
BuildConfig.VERSION_NAME,
BuildConfig.VERSION_CODE.toString()
),
style = MaterialTheme.typography.bodyMedium,
) )
} }
Text( Column(
text = stringResource(R.string.app_name), verticalArrangement = Arrangement.spacedBy(24.dp),
style = MaterialTheme.typography.headlineLarge, ) {
) Text(
Text( stringResource(R.string.ui_about_contribute_title),
text = "Version %s (%s)".format( style = MaterialTheme.typography.titleMedium,
BuildConfig.VERSION_NAME, )
BuildConfig.VERSION_CODE.toString() Text(
), stringResource(R.string.ui_about_contribute_message),
style = MaterialTheme.typography.bodyMedium, style = MaterialTheme.typography.titleMedium,
) )
Row(
modifier = Modifier
.fillMaxWidth()
.clip(MaterialTheme.shapes.medium)
.background(
MaterialTheme.colorScheme.surfaceVariant
)
.padding(16.dp),
horizontalArrangement = Arrangement.SpaceEvenly,
verticalAlignment = Alignment.CenterVertically,
) {
Image(
painter = painterResource(R.drawable.ic_github),
colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurfaceVariant),
contentDescription = null,
modifier = Modifier.size(ButtonDefaults.IconSize.times(1.5f))
)
Text(
stringResource(R.string.ui_about_contribute_development),
fontWeight = FontWeight.Bold,
)
Icon(
Icons.Default.OpenInNew,
contentDescription = null,
modifier = Modifier.size(ButtonDefaults.IconSize)
)
}
}
} }
} }
} }

View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="98dp"
android:height="96dp"
android:viewportWidth="98"
android:viewportHeight="96">
<path
android:pathData="M48.854,0C21.839,0 0,22 0,49.217c0,21.756 13.993,40.172 33.405,46.69 2.427,0.49 3.316,-1.059 3.316,-2.362 0,-1.141 -0.08,-5.052 -0.08,-9.127 -13.59,2.934 -16.42,-5.867 -16.42,-5.867 -2.184,-5.704 -5.42,-7.17 -5.42,-7.17 -4.448,-3.015 0.324,-3.015 0.324,-3.015 4.934,0.326 7.523,5.052 7.523,5.052 4.367,7.496 11.404,5.378 14.235,4.074 0.404,-3.178 1.699,-5.378 3.074,-6.6 -10.839,-1.141 -22.243,-5.378 -22.243,-24.283 0,-5.378 1.94,-9.778 5.014,-13.2 -0.485,-1.222 -2.184,-6.275 0.486,-13.038 0,0 4.125,-1.304 13.426,5.052a46.97,46.97 0,0 1,12.214 -1.63c4.125,0 8.33,0.571 12.213,1.63 9.302,-6.356 13.427,-5.052 13.427,-5.052 2.67,6.763 0.97,11.816 0.485,13.038 3.155,3.422 5.015,7.822 5.015,13.2 0,18.905 -11.404,23.06 -22.324,24.283 1.78,1.548 3.316,4.481 3.316,9.126 0,6.6 -0.08,11.897 -0.08,13.526 0,1.304 0.89,2.853 3.316,2.364 19.412,-6.52 33.405,-24.935 33.405,-46.691C97.707,22 75.788,0 48.854,0z"
android:fillColor="#24292f"
android:fillType="evenOdd"/>
</vector>

View File

@ -89,4 +89,7 @@
<string name="ui_settings_customNotifications_save_label">Update notification</string> <string name="ui_settings_customNotifications_save_label">Update notification</string>
<string name="ui_settings_customNotifications_edit_help">This is a preview for your notification. You can edit the title and the message. At the bottom you can find some presets.</string> <string name="ui_settings_customNotifications_edit_help">This is a preview for your notification. You can edit the title and the message. At the bottom you can find some presets.</string>
<string name="ui_about_title">About Alibi</string> <string name="ui_about_title">About Alibi</string>
<string name="ui_about_contribute_title">Support Alibi</string>
<string name="ui_about_contribute_message">In my free time I develop Alibi and other free open source software. It would mean the world to me if you could help me in any way :)</string>
<string name="ui_about_contribute_development">Developing features or fixing bugs</string>
</resources> </resources>