anyproto/anytype-kotlin
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-kotlin.git synced 2025-06-08 05:47:05 +09:00
Code Activity

DROID-1397 Design | Secondary & warning buttons (#84)

Browse source
This commit is contained in:
Konstantin Ivanov 2023-06-16 19:01:29 +02:00 • committed by GitHub
parent 327e8a67e2
commit e215506f74
Signed by: github
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core-ui/src/main/java/com/anytypeio/anytype/core_ui/views/DesignSystemButtons.kt
View file

@ -158,9 +158,7 @@ fun ButtonSecondary(
val interactionSource = remember { MutableInteractionSource() }
val isPressed = interactionSource.collectIsPressedAsState()
val backgroundColor =
if (isPressed.value) colorResource(id = R.color.shape_transparent) else colorResource(
id = R.color.background_primary
)
if (isPressed.value) colorResource(id = R.color.shape_transparent) else Color.Transparent
val borderColor = if (enabled) colorResource(id = R.color.shape_primary) else colorResource(
id = R.color.shape_secondary
)
@ -175,7 +173,7 @@ fun ButtonSecondary(
colors = ButtonDefaults.buttonColors(
backgroundColor = backgroundColor,
contentColor = colorResource(id = R.color.text_primary),
disabledBackgroundColor = colorResource(id = R.color.background_primary),
disabledBackgroundColor = Color.Transparent,
disabledContentColor = colorResource(id = R.color.text_tertiary)
),
modifier = modifier
@ -216,7 +214,7 @@ fun ButtonWarning(
shape = RoundedCornerShape(size.cornerSize),
border = BorderStroke(width = 1.dp, color = borderColor),
colors = ButtonDefaults.buttonColors(
backgroundColor = colorResource(id = R.color.background_primary),
backgroundColor = Color.Transparent,
contentColor = contentColor
),
modifier = modifier

2
core-ui/src/main/res/drawable/button_secondary_large_selector.xml
View file

@ -4,14 +4,12 @@
<shape android:shape="rectangle">
<stroke android:color="@color/shape_secondary" android:width="1dp"/>
<corners android:radius="@dimen/button_large_corner" />
<solid android:color="@color/background_primary" />
</shape>
</item>
<item android:state_enabled="true" android:state_pressed="false">
<shape android:shape="rectangle">
<stroke android:color="@color/shape_primary" android:width="1dp"/>
<corners android:radius="@dimen/button_large_corner" />
<solid android:color="@color/background_primary" />
</shape>
</item>

2
core-ui/src/main/res/drawable/button_secondary_medium_selector.xml
View file

@ -4,14 +4,12 @@
<shape android:shape="rectangle">
<stroke android:color="@color/shape_secondary" android:width="1dp"/>
<corners android:radius="@dimen/button_medium_corner" />
<solid android:color="@color/background_primary" />
</shape>
</item>
<item android:state_enabled="true" android:state_pressed="false">
<shape android:shape="rectangle">
<stroke android:color="@color/shape_primary" android:width="1dp"/>
<corners android:radius="@dimen/button_medium_corner" />
<solid android:color="@color/background_primary" />
</shape>
</item>

2
core-ui/src/main/res/drawable/button_secondary_small_selector.xml
View file

@ -4,14 +4,12 @@
<shape android:shape="rectangle">
<stroke android:color="@color/shape_secondary" android:width="1dp"/>
<corners android:radius="@dimen/button_small_corner" />
<solid android:color="@color/background_primary" />
</shape>
</item>
<item android:state_enabled="true" android:state_pressed="false">
<shape android:shape="rectangle">
<stroke android:color="@color/shape_primary" android:width="1dp"/>
<corners android:radius="@dimen/button_small_corner" />
<solid android:color="@color/background_primary" />
</shape>
</item>

2
core-ui/src/main/res/drawable/button_secondary_xsmall_selector.xml
View file

@ -4,14 +4,12 @@
<shape android:shape="rectangle">
<stroke android:color="@color/shape_secondary" android:width="1dp"/>
<corners android:radius="@dimen/button_xsmall_corner" />
<solid android:color="@color/background_primary" />
</shape>
</item>
<item android:state_enabled="true" android:state_pressed="false">
<shape android:shape="rectangle">
<stroke android:color="@color/shape_primary" android:width="1dp"/>
<corners android:radius="@dimen/button_xsmall_corner" />
<solid android:color="@color/background_primary" />
</shape>
</item>

1
core-ui/src/main/res/drawable/button_warning_large_selector.xml
View file

@ -4,7 +4,6 @@
<shape android:shape="rectangle">
<stroke android:color="@color/shape_primary" android:width="1dp"/>
<corners android:radius="@dimen/button_large_corner" />
<solid android:color="@color/background_primary" />
</shape>
</item>
</selector>

1
core-ui/src/main/res/drawable/button_warning_medium_selector.xml
View file

@ -4,7 +4,6 @@
<shape android:shape="rectangle">
<stroke android:color="@color/shape_primary" android:width="1dp"/>
<corners android:radius="@dimen/button_medium_corner" />
<solid android:color="@color/background_primary" />
</shape>
</item>
</selector>

1
core-ui/src/main/res/drawable/button_warning_small_selector.xml
View file

@ -4,7 +4,6 @@
<shape android:shape="rectangle">
<stroke android:color="@color/shape_primary" android:width="1dp"/>
<corners android:radius="@dimen/button_small_corner" />
<solid android:color="@color/background_primary" />
</shape>
</item>
</selector>

1
core-ui/src/main/res/drawable/button_warning_xsmall_selector.xml
View file

@ -4,7 +4,6 @@
<shape android:shape="rectangle">
<stroke android:color="@color/shape_primary" android:width="1dp"/>
<corners android:radius="@dimen/button_xsmall_corner" />
<solid android:color="@color/background_primary" />
</shape>
</item>
</selector>

4
sample/src/main/AndroidManifest.xml
View file

@ -36,6 +36,10 @@
<activity android:name=".StyleActivity" />
<activity android:name=".MainActivity" />
<activity android:name=".StyleToolbarActivity"/>
<meta-data
android:name="io.sentry.dsn"
android:value="" />
</application>
</manifest>