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-1086 Design | Warning buttons (#3079)

Browse source 
* DROID-1086 create bookmark

* DROID-1086 select template

* DROID-1086 search widget

* DROID-1086 sample app, warning buttons

* DROID-1086 design system, warning buttons

* DROID-1086 warning button, settings

* DROID-1086 design buttons

* DROID-1086 style fix

* DROID-1086 update sample app

* DROID-1086 revert

* DROID-1086 revert
This commit is contained in:
Konstantin Ivanov 2023-04-10 11:54:42 +02:00 • committed by GitHub
parent 0444d54421
commit 0784f48c79
Signed by: github
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 364 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sample/src/main/java/com/anytypeio/anytype/sample/design_system/ButtonsWarningFragment.kt Normal file
View file

@ -0,0 +1,6 @@
package com.anytypeio.anytype.sample.design_system
import androidx.fragment.app.Fragment
import com.anytypeio.anytype.sample.R
class ButtonsWarningFragment : Fragment(R.layout.fragment_buttons_warning)

9
sample/src/main/java/com/anytypeio/anytype/sample/design_system/DesignSystemActivity.kt
View file

@ -55,6 +55,14 @@ class DesignSystemActivity : AppCompatActivity(), Navigate {
.addToBackStack(null)
.commit()
}
override fun toButtonsWarning() {
supportFragmentManager
.beginTransaction()
.replace(R.id.root, ButtonsWarningFragment())
.addToBackStack(null)
.commit()
}
}
interface Navigate {
@ -63,4 +71,5 @@ interface Navigate {
fun toUxStyle()
fun toButtons()
fun toButtonsSecondary()
fun toButtonsWarning()
}

14
sample/src/main/java/com/anytypeio/anytype/sample/design_system/NavigateFragment.kt
View file

@ -4,6 +4,7 @@ import android.os.Bundle
import android.view.View
import android.widget.Button
import android.widget.Switch
import android.widget.TextView
import androidx.appcompat.app.AppCompatDelegate
import androidx.fragment.app.Fragment
import com.anytypeio.anytype.sample.R
@ -12,21 +13,24 @@ class NavigateFragment : Fragment(R.layout.fragment_navigate) {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
view.findViewById<Button>(R.id.button2).setOnClickListener {
view.findViewById<TextView>(R.id.button2).setOnClickListener {
(activity as Navigate).toContentStyle()
}
view.findViewById<Button>(R.id.button3).setOnClickListener {
view.findViewById<TextView>(R.id.button3).setOnClickListener {
(activity as Navigate).toContentStyleMultiline()
}
view.findViewById<Button>(R.id.btnUxStyle).setOnClickListener {
view.findViewById<TextView>(R.id.btnUxStyle).setOnClickListener {
(activity as Navigate).toUxStyle()
}
view.findViewById<Button>(R.id.button7).setOnClickListener {
view.findViewById<TextView>(R.id.button7).setOnClickListener {
(activity as Navigate).toButtons()
}
view.findViewById<Button>(R.id.button12).setOnClickListener {
view.findViewById<TextView>(R.id.button12).setOnClickListener {
(activity as Navigate).toButtonsSecondary()
}
view.findViewById<TextView>(R.id.button20).setOnClickListener {
(activity as Navigate).toButtonsWarning()
}
view.findViewById<Switch>(R.id.switch3).setOnClickListener {
it as Switch
if (it.isChecked) {

32
sample/src/main/res/layout/fragment_buttons.xml
View file

@ -16,27 +16,23 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
<com.anytypeio.anytype.core_ui.views.ButtonPrimaryXSmall
android:id="@+id/button8"
style="?attr/primaryXSButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Button"
android:textAppearance="?attr/primaryXSButtonTextAppearance"
app:layout_constraintEnd_toEndOf="@+id/textView21"
app:layout_constraintStart_toStartOf="@+id/textView21"
app:layout_constraintTop_toBottomOf="@+id/textView21" />
<Button
<com.anytypeio.anytype.core_ui.views.ButtonPrimaryXSmall
android:id="@+id/button13"
style="?attr/primaryXSButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:enabled="false"
android:text="Button"
android:textAppearance="?attr/primaryXSButtonTextAppearance"
app:layout_constraintEnd_toEndOf="@+id/textView21"
app:layout_constraintStart_toStartOf="@+id/textView21"
app:layout_constraintTop_toBottomOf="@+id/button8" />
@ -51,27 +47,23 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button13" />
<Button
<com.anytypeio.anytype.core_ui.views.ButtonPrimarySmall
android:id="@+id/button9"
style="?attr/primarySButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Button"
android:textAppearance="?attr/primarySButtonTextAppearance"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView22" />
<Button
<com.anytypeio.anytype.core_ui.views.ButtonPrimarySmall
android:id="@+id/button17"
style="?attr/primarySButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:enabled="false"
android:text="Button"
android:textAppearance="?attr/primarySButtonTextAppearance"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button9" />
@ -86,27 +78,23 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button17" />
<Button
<com.anytypeio.anytype.core_ui.views.ButtonPrimaryMedium
android:id="@+id/button10"
style="?attr/primaryMediumButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Button"
android:textAppearance="?attr/primaryMediumButtonTextAppearance"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView23" />
<Button
<com.anytypeio.anytype.core_ui.views.ButtonPrimaryMedium
android:id="@+id/button18"
style="?attr/primaryMediumButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:enabled="false"
android:text="Button"
android:textAppearance="?attr/primaryMediumButtonTextAppearance"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button10" />
@ -121,23 +109,20 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button18" />
<Button
<com.anytypeio.anytype.core_ui.views.ButtonPrimaryLarge
android:id="@+id/button11"
style="?attr/primaryLargeButtonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:text="Button"
android:textAppearance="?attr/primaryLargeButtonTextAppearance"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView24" />
<Button
<com.anytypeio.anytype.core_ui.views.ButtonPrimaryLarge
android:id="@+id/button19"
style="?attr/primaryLargeButtonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -145,7 +130,6 @@
android:layout_marginEnd="16dp"
android:enabled="false"
android:text="Button"
android:textAppearance="?attr/primaryLargeButtonTextAppearance"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button11" />

32
sample/src/main/res/layout/fragment_buttons_secondary.xml
View file

@ -16,27 +16,23 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
<com.anytypeio.anytype.core_ui.views.ButtonSecondaryXSmall
android:id="@+id/button8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Button"
style="?attr/secondaryXSButtonStyle"
android:textAppearance="?attr/secondaryXSButtonTextAppearance"
app:layout_constraintEnd_toEndOf="@+id/textView21"
app:layout_constraintStart_toStartOf="@+id/textView21"
app:layout_constraintTop_toBottomOf="@+id/textView21" />
<Button
<com.anytypeio.anytype.core_ui.views.ButtonSecondaryXSmall
android:id="@+id/button30"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Button"
style="?attr/secondaryXSButtonStyle"
android:enabled="false"
android:textAppearance="?attr/secondaryXSButtonTextAppearance"
app:layout_constraintEnd_toEndOf="@+id/textView21"
app:layout_constraintStart_toStartOf="@+id/textView21"
app:layout_constraintTop_toBottomOf="@+id/button8" />
@ -51,27 +47,23 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button30" />
<Button
<com.anytypeio.anytype.core_ui.views.ButtonSecondarySmall
android:id="@+id/button9"
style="?attr/secondarySButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Button"
android:textAppearance="?attr/secondarySButtonTextAppearance"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView22" />
<Button
<com.anytypeio.anytype.core_ui.views.ButtonSecondarySmall
android:id="@+id/button14"
style="?attr/secondarySButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:enabled="false"
android:text="Button"
android:textAppearance="?attr/secondarySButtonTextAppearance"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button9" />
@ -86,27 +78,23 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button14" />
<Button
<com.anytypeio.anytype.core_ui.views.ButtonSecondaryMedium
android:id="@+id/button10"
style="?attr/secondaryMediumButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Button"
android:textAppearance="?attr/secondaryMediumButtonTextAppearance"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView23" />
<Button
<com.anytypeio.anytype.core_ui.views.ButtonSecondaryMedium
android:id="@+id/button15"
style="?attr/secondaryMediumButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:enabled="false"
android:text="Button"
android:textAppearance="?attr/secondaryMediumButtonTextAppearance"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button10" />
@ -121,23 +109,20 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button15" />
<Button
<com.anytypeio.anytype.core_ui.views.ButtonSecondaryLarge
android:id="@+id/button11"
style="?attr/secondaryLargeButtonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:text="Button"
android:textAppearance="?attr/secondaryLargeButtonTextAppearance"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView24" />
<Button
<com.anytypeio.anytype.core_ui.views.ButtonSecondaryLarge
android:id="@+id/button16"
style="?attr/secondaryLargeButtonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -145,7 +130,6 @@
android:layout_marginEnd="16dp"
android:enabled="false"
android:text="Button"
android:textAppearance="?attr/secondaryLargeButtonTextAppearance"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button11" />

91
sample/src/main/res/layout/fragment_buttons_warning.xml Normal file
View file

@ -0,0 +1,91 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".design_system.ButtonsPrimaryFragment">
<TextView
android:id="@+id/textView21"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="XSmall Button Warning"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.anytypeio.anytype.core_ui.views.ButtonWarningXSmall
android:id="@+id/button8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Button"
app:layout_constraintEnd_toEndOf="@+id/textView21"
app:layout_constraintStart_toStartOf="@+id/textView21"
app:layout_constraintTop_toBottomOf="@+id/textView21" />
<TextView
android:id="@+id/textView22"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:text="Small Button Warning"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button8" />
<com.anytypeio.anytype.core_ui.views.ButtonWarningSmall
android:id="@+id/button9"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView22" />
<TextView
android:id="@+id/textView23"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:text="Medium Button Warning"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button9" />
<com.anytypeio.anytype.core_ui.views.ButtonWarningMedium
android:id="@+id/button10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView23" />
<TextView
android:id="@+id/textView24"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:text="Large Button Warning"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button10" />
<com.anytypeio.anytype.core_ui.views.ButtonWarningLarge
android:id="@+id/button11"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:text="Button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView24" />
</androidx.constraintlayout.widget.ConstraintLayout>

31
sample/src/main/res/layout/fragment_navigate.xml
View file

@ -5,50 +5,42 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<Button
<com.anytypeio.anytype.core_ui.views.ButtonPrimaryMedium
android:id="@+id/button2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="64dp"
android:text="Content Style"
style="@style/Button.Primary.Medium"
android:textAppearance="@style/TextView.UXStyle.Buttons.Medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
<com.anytypeio.anytype.core_ui.views.ButtonPrimaryMedium
android:id="@+id/button3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="Content Style Multiline"
style="@style/Button.Primary.Medium"
android:textAppearance="@style/TextView.UXStyle.Buttons.Medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button2" />
<Button
<com.anytypeio.anytype.core_ui.views.ButtonPrimaryMedium
android:id="@+id/btnUxStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="UX Style"
style="@style/Button.Primary.Medium"
android:textAppearance="@style/TextView.UXStyle.Buttons.Medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button3" />
<Button
<com.anytypeio.anytype.core_ui.views.ButtonPrimaryMedium
android:id="@+id/button7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="Buttons Primary"
style="@style/Button.Primary.Medium"
android:textAppearance="@style/TextView.UXStyle.Buttons.Medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/btnUxStyle" />
@ -63,16 +55,25 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
<com.anytypeio.anytype.core_ui.views.ButtonPrimaryMedium
android:id="@+id/button12"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="Buttons Secondary"
style="@style/Button.Primary.Medium"
android:textAppearance="@style/TextView.UXStyle.Buttons.Medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button7" />
<com.anytypeio.anytype.core_ui.views.ButtonPrimaryMedium
android:id="@+id/button20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="Buttons Warning"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.503"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button12" />
</androidx.constraintlayout.widget.ConstraintLayout>

23
sample/src/main/res/values/styles.xml
View file

@ -13,28 +13,21 @@
<!-- <item name="android:alertDialogTheme">?alertDialogTheme</item>-->
<!-- <item name="dialogTheme">?alertDialogTheme</item>-->
<item name="primaryXSButtonTextAppearance">@style/TextView.UXStyle.Captions.1.Medium</item>
<item name="primarySButtonTextAppearance">@style/TextView.UXStyle.Body.Callout.Medium</item>
<item name="primaryMediumButtonTextAppearance">@style/TextView.UXStyle.Buttons.Medium</item>
<item name="primaryLargeButtonTextAppearance">@style/TextView.UXStyle.Buttons.Medium</item>
<item name="primaryLargeNumberButtonTextAppearance">@style/TextView.UXStyle.Buttons.Medium</item>
<item name="secondaryXSButtonTextAppearance">@style/TextView.UXStyle.Captions.1.Medium</item>
<item name="secondarySButtonTextAppearance">@style/TextView.UXStyle.Body.Callout.Medium</item>
<item name="secondaryMediumButtonTextAppearance">@style/TextView.UXStyle.Buttons.Medium</item>
<item name="secondaryLargeButtonTextAppearance">@style/TextView.UXStyle.Buttons.Medium</item>
<item name="primaryXSButtonStyle">@style/Button.Primary.XSmall</item>
<item name="primarySButtonStyle">@style/Button.Primary.Small</item>
<item name="primaryXSmallButtonStyle">@style/Button.Primary.XSmall</item>
<item name="primarySmallButtonStyle">@style/Button.Primary.Small</item>
<item name="primaryMediumButtonStyle">@style/Button.Primary.Medium</item>
<item name="primaryLargeButtonStyle">@style/Button.Primary.Large</item>
<item name="primaryLargeNumberButtonStyle">@style/Button.Primary.Large</item>
<item name="secondaryXSButtonStyle">@style/Button.Secondary.XSmall</item>
<item name="secondarySButtonStyle">@style/Button.Secondary.Small</item>
<item name="secondaryXSmallButtonStyle">@style/Button.Secondary.XSmall</item>
<item name="secondarySmallButtonStyle">@style/Button.Secondary.Small</item>
<item name="secondaryMediumButtonStyle">@style/Button.Secondary.Medium</item>
<item name="secondaryLargeButtonStyle">@style/Button.Secondary.Large</item>
<item name="warningXSmallButtonStyle">@style/Button.Warning.XSmall</item>
<item name="warningSmallButtonStyle">@style/Button.Warning.Small</item>
<item name="warningMediumButtonStyle">@style/Button.Warning.Medium</item>
<item name="warningLargeButtonStyle">@style/Button.Warning.Large</item>
</style>
<!-- define your dialog theme -->