diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/StyleToolbarWidgetNew.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/StyleToolbarWidgetNew.kt new file mode 100644 index 0000000000..c2c3baca0e --- /dev/null +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/StyleToolbarWidgetNew.kt @@ -0,0 +1,19 @@ +package com.anytypeio.anytype.core_ui.widgets + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.cardview.widget.CardView +import com.anytypeio.anytype.core_ui.R + +class StyleToolbarWidgetNew @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null +) : CardView(context, attrs) { + + init { + LayoutInflater + .from(context) + .inflate(R.layout.widget_styling_toolbar_main, this) + } +} \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_bullet.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_bullet.xml new file mode 100644 index 0000000000..55da47e570 --- /dev/null +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_bullet.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_button_background.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_button_background.xml new file mode 100644 index 0000000000..fe12a9dfca --- /dev/null +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_button_background.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_button_background_active.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_button_background_active.xml new file mode 100644 index 0000000000..054c436164 --- /dev/null +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_button_background_active.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_button_background_selector.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_button_background_selector.xml new file mode 100644 index 0000000000..3c107a3d0f --- /dev/null +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_button_background_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_callout_background.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_callout_background.xml new file mode 100644 index 0000000000..fc7d3477fe --- /dev/null +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_callout_background.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_checkbox.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_checkbox.xml new file mode 100644 index 0000000000..b1b295a713 --- /dev/null +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_checkbox.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_highlight_cursor.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_highlight_cursor.xml new file mode 100644 index 0000000000..cae6f840f9 --- /dev/null +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_highlight_cursor.xml @@ -0,0 +1,9 @@ + + + diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_main_three_dots.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_main_three_dots.xml new file mode 100644 index 0000000000..bcc6b829bf --- /dev/null +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_main_three_dots.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_more.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_more.xml new file mode 100644 index 0000000000..bcc6b829bf --- /dev/null +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_more.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_numbered.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_numbered.xml new file mode 100644 index 0000000000..7288ccc143 --- /dev/null +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_numbered.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_text_style_background_active.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_text_style_background_active.xml new file mode 100644 index 0000000000..054c436164 --- /dev/null +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_text_style_background_active.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_text_style_background_selector.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_text_style_background_selector.xml new file mode 100644 index 0000000000..5b9e6caf48 --- /dev/null +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_text_style_background_selector.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_toogle.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_toogle.xml new file mode 100644 index 0000000000..51245bb77c --- /dev/null +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_toogle.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/core-ui/src/main/res/font/graphik_semibold.ttf b/core-ui/src/main/res/font/graphik_semibold.ttf index 1a9d68be41..028951be11 100644 Binary files a/core-ui/src/main/res/font/graphik_semibold.ttf and b/core-ui/src/main/res/font/graphik_semibold.ttf differ diff --git a/core-ui/src/main/res/layout/widget_styling_toolbar_main.xml b/core-ui/src/main/res/layout/widget_styling_toolbar_main.xml new file mode 100644 index 0000000000..dfea8008b9 --- /dev/null +++ b/core-ui/src/main/res/layout/widget_styling_toolbar_main.xml @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core-ui/src/main/res/values/strings.xml b/core-ui/src/main/res/values/strings.xml index 6482250e30..46cffbd795 100644 --- a/core-ui/src/main/res/values/strings.xml +++ b/core-ui/src/main/res/values/strings.xml @@ -375,5 +375,10 @@ checked not checked Paste or type a URL + Callout + Highlight + Title + Heading + Subheading diff --git a/core-ui/src/main/res/values/styles.xml b/core-ui/src/main/res/values/styles.xml index 7da8b9124c..a9e0839aac 100644 --- a/core-ui/src/main/res/values/styles.xml +++ b/core-ui/src/main/res/values/styles.xml @@ -645,4 +645,12 @@ 1 + + \ No newline at end of file diff --git a/sample/build.gradle b/sample/build.gradle index 18b5455129..46d49c8c1b 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -66,15 +66,15 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation applicationDependencies.fragment - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.core:core-ktx:1.2.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.core:core-ktx:1.3.2' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation applicationDependencies.design implementation applicationDependencies.permissionDisp kapt applicationDependencies.permissionDispCompiler testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' } diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index d44746ceed..43950f8e6d 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -19,15 +19,17 @@ android:theme="@style/AppTheme" android:usesCleartextTraffic="true" tools:ignore="GoogleAppIndexingWarning"> - + + + diff --git a/sample/src/main/java/com/anytypeio/anytype/sample/StyleToolbarActivity.kt b/sample/src/main/java/com/anytypeio/anytype/sample/StyleToolbarActivity.kt new file mode 100644 index 0000000000..9c1fd0876a --- /dev/null +++ b/sample/src/main/java/com/anytypeio/anytype/sample/StyleToolbarActivity.kt @@ -0,0 +1,11 @@ +package com.anytypeio.anytype.sample + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity + +class StyleToolbarActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_style_toolbar) + } +} \ No newline at end of file diff --git a/sample/src/main/res/layout/activity_style_toolbar.xml b/sample/src/main/res/layout/activity_style_toolbar.xml new file mode 100644 index 0000000000..ffa0a66dbb --- /dev/null +++ b/sample/src/main/res/layout/activity_style_toolbar.xml @@ -0,0 +1,21 @@ + + + + + + \ No newline at end of file