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.

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

Style Change: New styles for the Oppia Deprecation Dialog Design #4997

Merged
merged 7 commits into from
Jun 22, 2023
Merged

Style Change: New styles for the Oppia Deprecation Dialog Design #4997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7216c73
style: Add new styles for the oppia deprecation dialog design
kkmurerwa May 24, 2023
0795344
Merge branch 'develop' into new-oppia-dialog-design
kkmurerwa May 29, 2023
2f2b244
feat: Make minor naming and color choices
kkmurerwa May 30, 2023
d4f5480
style: Modified padding space and colors on the dialog theme and style
kkmurerwa Jun 1, 2023
d8fff45
Merge branch 'develop' into new-oppia-dialog-design
kkmurerwa Jun 1, 2023
d5733aa
Merge branch 'develop' into new-oppia-dialog-design
kkmurerwa Jun 2, 2023
cff8638
Merge branch 'develop' into new-oppia-dialog-design
kkmurerwa Jun 22, 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
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/dialog_positive_rounded_button_solid_color_primary_background.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/component_color_shared_primary_button_background_color" />
<corners android:radius="4dp" />
<size
android:width="32dp"
android:height="32dp" />
</shape>
12 changes: 12 additions & 0 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,4 +468,16 @@
<item name="cornerSize">50%</item>
<item name="cornerFamily">rounded</item>
</style>

<!-- Deprecation AlertDialog Button -->
<style name="DeprecationAlertDialogPositiveButton">
<item name="android:background">@drawable/dialog_positive_rounded_button_solid_color_primary_background</item>
<item name="android:textColor">@color/component_color_shared_secondary_4_text_color</item>
<item name="android:layout_marginStart">24dp</item>
<item name="android:layout_marginEnd">10dp</item>
<item name="android:paddingEnd">20dp</item>
<item name="android:paddingStart">20dp</item>
<item name="android:paddingTop">4dp</item>
<item name="android:paddingBottom">4dp</item>
</style>
</resources>
8 changes: 7 additions & 1 deletion app/src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">

<style name="OppiaTheme" parent="Theme.MaterialComponents.Light.DarkActionBar.Bridge">
<item name="colorPrimary">@color/color_palette_primary_color</item>
Expand Down Expand Up @@ -52,6 +52,12 @@
<item name="android:textColorPrimary">@color/component_color_shared_primary_dark_text_color</item>
</style>

<style name="DeprecationAlertDialogTheme" parent="OppiaAlertDialogTheme">
<item name="android:paddingBottom">4dp</item>
<item name="android:color">@color/component_color_shared_secondary_2_text_color</item>
<item name="buttonBarPositiveButtonStyle">@style/DeprecationAlertDialogPositiveButton</item>
</style>

<style name="OppiaActionBarTheme" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar" >
<item name="android:background">@color/component_color_shared_activity_action_bar_color</item>
</style>
Expand Down