Skip to content
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.

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

618 - Change illustrations alignment for slider and text field components when in landscape #657

Merged
merged 3 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,7 @@ sealed class Component(
null,
R.string.component_sliders_description,
composableName = OdsComposable.OdsSlider.name,
demoScreen = { _, _ -> ComponentSliders() },
imageAlignment = Alignment.CenterEnd
demoScreen = { _, _ -> ComponentSliders() }
)

object Snackbars : Component(
Expand All @@ -263,8 +262,7 @@ sealed class Component(
R.drawable.il_text_fields_small,
R.string.component_text_fields_description,
listOf(Variant.TextField, Variant.TextFieldPassword),
demoScreen = { variant, _ -> if (variant != null) ComponentTextField(variant = variant) },
imageAlignment = Alignment.CenterEnd
demoScreen = { variant, _ -> if (variant != null) ComponentTextField(variant = variant) }
)

object Tabs : Component(
Expand Down
Binary file modified app/src/main/res/drawable-hdpi/il_text_fields.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-hdpi/il_text_fields_generic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-hdpi/il_text_fields_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-hdpi/il_text_fields_small_generic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-mdpi/il_text_fields.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-mdpi/il_text_fields_generic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-mdpi/il_text_fields_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-mdpi/il_text_fields_small_generic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/il_text_fields.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/il_text_fields_generic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/il_text_fields_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/il_text_fields_small_generic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxhdpi/il_text_fields.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxhdpi/il_text_fields_generic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxhdpi/il_text_fields_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxxhdpi/il_text_fields.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxxhdpi/il_text_fields_generic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxxhdpi/il_text_fields_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44 changes: 20 additions & 24 deletions app/src/main/res/drawable/il_sliders.xml
Original file line number Diff line number Diff line change
@@ -1,28 +1,24 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="1600dp"
android:height="800dp"
android:viewportWidth="1600"
android:viewportHeight="800">
android:width="400dp"
android:height="200dp"
android:viewportWidth="400"
android:viewportHeight="200">
<path
android:pathData="M0,0h1600v800h-1600z"
android:pathData="M0,0h400v200h-400z"
android:strokeWidth="0"
android:fillColor="#1b1b1b"/>
<group>
<clip-path
android:pathData="M0,0h1600v800h-1600z"/>
<path
android:pathData="M157.9,385H5527.9c8.3,0 15,6.7 15,15h0c0,8.3 -6.7,15 -15,15H157.9c-8.3,0 -15,-6.7 -15,-15h0c0,-8.3 6.7,-15 15,-15Z"
android:strokeAlpha="0.2"
android:fillColor="#ff7900"
android:fillAlpha="0.2"/>
<group>
<clip-path
android:pathData="M157.9,390L1012.8,390c8.3,0 15,6.7 15,15h0c0,8.3 -6.7,15 -15,15L157.9,420c-8.3,0 -15,-6.7 -15,-15h0c0,-8.3 6.7,-15 15,-15Z"/>
<path
android:pathData="M-1610.4,390L3759.6,390c8.3,0 15,6.7 15,15h0c0,8.3 -6.7,15 -15,15L-1610.4,420c-8.3,0 -15,-6.7 -15,-15h0c0,-8.3 6.7,-15 15,-15Z"
android:fillColor="#ff7900"/>
</group>
<path
android:pathData="M1080.8,400m-90,0a90,90 0,1 1,180 0a90,90 0,1 1,-180 0"
android:fillColor="#ff7900"/>
</group>
<path
android:pathData="M178,96L348,96A4,4 0,0 1,352 100L352,100A4,4 0,0 1,348 104L178,104A4,4 0,0 1,174 100L174,100A4,4 0,0 1,178 96z"
android:strokeAlpha="0.2"
android:strokeWidth="0"
android:fillColor="#ff7900"
android:fillAlpha="0.2"/>
<path
android:pathData="M52,96L222,96A4,4 0,0 1,226 100L226,100A4,4 0,0 1,222 104L52,104A4,4 0,0 1,48 100L48,100A4,4 0,0 1,52 96z"
android:strokeWidth="0"
android:fillColor="#ff7900"/>
<path
android:pathData="M234,100m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0"
android:strokeWidth="0"
android:fillColor="#ff7900"/>
</vector>
14 changes: 9 additions & 5 deletions app/src/main/res/drawable/il_sliders_generic.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,20 @@
android:viewportHeight="200">
<path
android:pathData="M0,0h400v200h-400z"
android:strokeWidth="0"
android:fillColor="#1b1b1b"/>
<path
android:pathData="M35.5,96.5L235.5,96.5A3.5,3.5 0,0 1,239 100L239,100A3.5,3.5 0,0 1,235.5 103.5L35.5,103.5A3.5,3.5 0,0 1,32 100L32,100A3.5,3.5 0,0 1,35.5 96.5z"
android:fillColor="#949494"/>
<path
android:pathData="M209.5,96.5L409.5,96.5A3.5,3.5 0,0 1,413 100L413,100A3.5,3.5 0,0 1,409.5 103.5L209.5,103.5A3.5,3.5 0,0 1,206 100L206,100A3.5,3.5 0,0 1,209.5 96.5z"
android:pathData="M178,96L348,96A4,4 0,0 1,352 100L352,100A4,4 0,0 1,348 104L178,104A4,4 0,0 1,174 100L174,100A4,4 0,0 1,178 96z"
android:strokeAlpha="0.2"
android:strokeWidth="0"
android:fillColor="#949494"
android:fillAlpha="0.2"/>
<path
android:pathData="M251.06,77.61c14.24,-1.42 26.11,10.45 24.7,24.68 -1.04,10.53 -9.56,19.04 -20.09,20.09 -14.24,1.42 -26.11,-10.45 -24.7,-24.68 1.04,-10.53 9.56,-19.04 20.09,-20.09Z"
android:pathData="M52,96L222,96A4,4 0,0 1,226 100L226,100A4,4 0,0 1,222 104L52,104A4,4 0,0 1,48 100L48,100A4,4 0,0 1,52 96z"
android:strokeWidth="0"
android:fillColor="#949494"/>
<path
android:pathData="M234,100m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0"
android:strokeWidth="0"
android:fillColor="#949494"/>
</vector>
6 changes: 6 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes done in ODS library will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased](https://github.com/Orange-OpenSource/ods-android/compare/0.16.0...develop)

### Fixed

- \[App\] Change illustrations alignment for slider and text field components ([#618](https://github.com/Orange-OpenSource/ods-android/issues/618))

## [0.16.0](https://github.com/Orange-OpenSource/ods-android/compare/0.15.1...0.16.0) - 2023-10-10

### Added
Expand Down