Skip to content

Feature/default button style update #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lauriskr merged 2 commits into from
Oct 18, 2023
Merged

Feature/default button style update #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c8972e
Swap button Big style to default style and add a Small style for the …
lauriskr Oct 18, 2023
eb1abad
Update changelog
lauriskr Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

- ..

## 0.0.10 - 2023.10.18

### Changed

- Button .Big styles are now default styles with no extra ending. For example. Widget.Lab.Button.Filled is now the same as Widget.Lab.Button.Filled used to be.
- Added button .Small styles to represent the old default styles.

## 0.0.9 - 2023.10.17

### Added
Expand Down
8 changes: 4 additions & 4 deletions app-demo/src/main/java/mobi/lab/components/demo/presentation/MaterialThemeActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ class MaterialThemeActivity : AppCompatActivity() {
private fun ActivityMaterialThemeBinding.loopButtons(action: LabButton.() -> Unit) {
listOf(
filled, filledIconStart, filledIconEnd,
filledBig, filledBigIconStart, filledBigIconEnd,
filledSmall, filledSmallIconStart, filledSmallIconEnd,
tonal, tonalIconStart, tonalIconEnd,
tonalBig, tonalBigIconStart, tonalBigIconEnd,
tonalSmall, tonalSmallIconStart, tonalSmallIconEnd,
outlined, outlinedIconStart, outlinedIconEnd,
outlinedBig, outlinedBigIconStart, outlinedBigIconEnd,
outlinedSmall, outlinedSmallIconStart, outlinedSmallIconEnd,
text, textIconStart, textIconEnd,
textBig, textBigIconStart, textBigIconEnd,
textSmall, textSmallIconStart, textSmallIconEnd,
).map(action)
}

Expand Down
8 changes: 4 additions & 4 deletions app-demo/src/main/java/mobi/lab/components/demo/presentation/button/ButtonFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ class ButtonFragment : Fragment(), ViewBindingHolder<FragmentButtonBinding> by F
private fun FragmentButtonBinding.loopButtons(action: LabButton.() -> Unit) {
listOf(
filled, filledIconStart, filledIconEnd,
filledBig, filledBigIconStart, filledBigIconEnd,
filledSmall, filledSmallIconStart, filledSmallIconEnd,
tonal, tonalIconStart, tonalIconEnd,
tonalBig, tonalBigIconStart, tonalBigIconEnd,
tonalSmall, tonalSmallIconStart, tonalSmallIconEnd,
outlined, outlinedIconStart, outlinedIconEnd,
outlinedBig, outlinedBigIconStart, outlinedBigIconEnd,
outlinedSmall, outlinedSmallIconStart, outlinedSmallIconEnd,
text, textIconStart, textIconEnd,
textBig, textBigIconStart, textBigIconEnd,
textSmall, textSmallIconStart, textSmallIconEnd,
).map(action)
}
}
80 changes: 40 additions & 40 deletions app-demo/src/main/res/layout/activity_material_theme.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

<mobi.lab.components.button.LabButton
android:id="@+id/filled"
style="@style/Widget.LabComponents.Button.Filled"
style="@style/Widget.Lab.Button.Filled"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_default"
Expand All @@ -60,7 +60,7 @@

<mobi.lab.components.button.LabButton
android:id="@+id/filled_icon_start"
style="@style/Widget.LabComponents.Button.Filled"
style="@style/Widget.LabComponents.Button.Filled.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_default"
Expand All @@ -84,8 +84,8 @@
/>

<mobi.lab.components.button.LabButton
android:id="@+id/filled_big"
style="@style/Widget.LabComponents.Button.Filled.Big"
android:id="@+id/filled_small"
style="@style/Widget.LabComponents.Button.Filled.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_default"
Expand All @@ -94,25 +94,25 @@
android:text="Filled" />

<mobi.lab.components.button.LabButton
android:id="@+id/filled_big_icon_start"
style="@style/Widget.LabComponents.Button.Filled.Big"
android:id="@+id/filled_small_icon_start"
style="@style/Widget.LabComponents.Button.Filled.Small.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_default"
android:layout_marginStart="@dimen/margin_default"
android:layout_marginEnd="@dimen/margin_default"
android:text="Filled Big"
android:text="Filled Small"
app:icon="@drawable/ic_placeholder16" />

<mobi.lab.components.button.LabButton
android:id="@+id/filled_big_icon_end"
style="@style/Widget.LabComponents.Button.Filled.Big"
android:id="@+id/filled_small_icon_end"
style="@style/Widget.LabComponents.Button.Filled.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_default"
android:layout_marginStart="@dimen/margin_default"
android:layout_marginEnd="@dimen/margin_default"
android:text="Filled Big"
android:text="Filled Small"
app:iconGravity="end"
app:icon="@drawable/ic_placeholder16" />

Expand All @@ -133,7 +133,7 @@

<mobi.lab.components.button.LabButton
android:id="@+id/tonal_icon_start"
style="@style/Widget.LabComponents.Button.Tonal"
style="@style/Widget.LabComponents.Button.Tonal.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_default"
Expand All @@ -157,35 +157,35 @@
/>

<mobi.lab.components.button.LabButton
android:id="@+id/tonal_big"
style="@style/Widget.LabComponents.Button.Tonal.Big"
android:id="@+id/tonal_small"
style="@style/Widget.LabComponents.Button.Tonal.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_default"
android:layout_marginStart="@dimen/margin_default"
android:layout_marginEnd="@dimen/margin_default"
android:text="Tonal Big" />
android:text="Tonal Small" />

<mobi.lab.components.button.LabButton
android:id="@+id/tonal_big_icon_start"
style="@style/Widget.LabComponents.Button.Tonal.Big"
android:id="@+id/tonal_small_icon_start"
style="@style/Widget.LabComponents.Button.Tonal.Small.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_default"
android:layout_marginStart="@dimen/margin_default"
android:layout_marginEnd="@dimen/margin_default"
android:text="Tonal Big"
android:text="Tonal Small"
app:icon="@drawable/ic_placeholder16" />

<mobi.lab.components.button.LabButton
android:id="@+id/tonal_big_icon_end"
style="@style/Widget.LabComponents.Button.Tonal.Big"
android:id="@+id/tonal_small_icon_end"
style="@style/Widget.LabComponents.Button.Tonal.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_default"
android:layout_marginStart="@dimen/margin_default"
android:layout_marginEnd="@dimen/margin_default"
android:text="Tonal Big"
android:text="Tonal Small"
app:iconGravity="end"
app:icon="@drawable/ic_placeholder16" />

Expand All @@ -206,7 +206,7 @@

<mobi.lab.components.button.LabButton
android:id="@+id/outlined_icon_start"
style="@style/Widget.LabComponents.Button.Outlined"
style="@style/Widget.LabComponents.Button.Outlined.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_default"
Expand All @@ -229,35 +229,35 @@
app:icon="@drawable/ic_placeholder16" />

<mobi.lab.components.button.LabButton
android:id="@+id/outlined_big"
style="@style/Widget.LabComponents.Button.Outlined.Big"
android:id="@+id/outlined_small"
style="@style/Widget.LabComponents.Button.Outlined.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_default"
android:layout_marginStart="@dimen/margin_default"
android:layout_marginEnd="@dimen/margin_default"
android:text="Outlined Big" />
android:text="Outlined Small" />

<mobi.lab.components.button.LabButton
android:id="@+id/outlined_big_icon_start"
style="@style/Widget.LabComponents.Button.Outlined.Big"
android:id="@+id/outlined_small_icon_start"
style="@style/Widget.LabComponents.Button.Outlined.Small.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_default"
android:layout_marginStart="@dimen/margin_default"
android:layout_marginEnd="@dimen/margin_default"
android:text="Outlined Big"
android:text="Outlined Small"
app:icon="@drawable/ic_placeholder16" />

<mobi.lab.components.button.LabButton
android:id="@+id/outlined_big_icon_end"
style="@style/Widget.LabComponents.Button.Outlined.Big"
android:id="@+id/outlined_small_icon_end"
style="@style/Widget.LabComponents.Button.Outlined.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_default"
android:layout_marginStart="@dimen/margin_default"
android:layout_marginEnd="@dimen/margin_default"
android:text="Outlined Big"
android:text="Outlined Small"
app:iconGravity="end"
app:icon="@drawable/ic_placeholder16" />

Expand All @@ -278,7 +278,7 @@

<mobi.lab.components.button.LabButton
android:id="@+id/text_icon_start"
style="@style/Widget.LabComponents.Button.Text"
style="@style/Widget.LabComponents.Button.Text.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_default"
Expand All @@ -302,35 +302,35 @@
/>

<mobi.lab.components.button.LabButton
android:id="@+id/text_big"
style="@style/Widget.LabComponents.Button.Text.Big"
android:id="@+id/text_small"
style="@style/Widget.LabComponents.Button.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_default"
android:layout_marginStart="@dimen/margin_default"
android:layout_marginEnd="@dimen/margin_default"
android:text="Text Big" />
android:text="Text Small" />

<mobi.lab.components.button.LabButton
android:id="@+id/text_big_icon_start"
style="@style/Widget.LabComponents.Button.Text.Big"
android:id="@+id/text_small_icon_start"
style="@style/Widget.LabComponents.Button.Text.Small.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_default"
android:layout_marginStart="@dimen/margin_default"
android:layout_marginEnd="@dimen/margin_default"
android:text="Text Big"
android:text="Text Small"
app:icon="@drawable/ic_placeholder16" />

<mobi.lab.components.button.LabButton
android:id="@+id/text_big_icon_end"
style="@style/Widget.LabComponents.Button.Text.Big"
android:id="@+id/text_small_icon_end"
style="@style/Widget.LabComponents.Button.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_default"
android:layout_marginStart="@dimen/margin_default"
android:layout_marginEnd="@dimen/margin_default"
android:text="Text Big"
android:text="Text Small"
app:iconGravity="end"
app:icon="@drawable/ic_placeholder16" />
</LinearLayout>
Expand Down
Loading