Skip to content

Commit 4bc9f0d

Browse files
author
therealbluepandabear
committed
Refactored duplicate styling code in export_project_dialog_layout.xml to exportProjectDialogLayout_radioButton_style.
1 parent abbe5b4 commit 4bc9f0d

3 files changed

Lines changed: 31 additions & 103 deletions

File tree

‎app/src/main/res/layout-land/export_project_dialog_layout.xml‎

Lines changed: 9 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -52,64 +52,34 @@
5252

5353
<RadioButton
5454
android:id="@+id/exportProjectDialogLayout_radioButton_PNG"
55-
android:layout_width="wrap_content"
5655
android:layout_height="wrap_content"
57-
android:width="90dp"
58-
android:background="@drawable/radiobuttonselector"
59-
android:button="@android:color/transparent"
60-
android:checked="true"
6156
android:text="@string/generic_png"
62-
android:textAlignment="center"
63-
android:textColor="@drawable/radiobuttontextselector"
64-
android:textStyle="bold" />
57+
android:checked="true"
58+
style="@style/exportProjectDialogLayout_radioButton_style" />
6559

6660
<RadioButton
6761
android:id="@+id/exportProjectDialogLayout_radioButton_JPG"
68-
android:layout_width="wrap_content"
6962
android:layout_height="wrap_content"
70-
android:width="90dp"
71-
android:background="@drawable/radiobuttonselector"
72-
android:button="@android:color/transparent"
7363
android:text="@string/generic_jpg"
74-
android:textAlignment="center"
75-
android:textColor="@drawable/radiobuttontextselector"
76-
android:textStyle="bold" />
64+
style="@style/exportProjectDialogLayout_radioButton_style" />
7765

7866
<RadioButton
7967
android:id="@+id/exportProjectDialogLayout_radioButton_WEBP"
80-
android:layout_width="wrap_content"
8168
android:layout_height="wrap_content"
82-
android:width="90dp"
83-
android:background="@drawable/radiobuttonselector"
84-
android:button="@android:color/transparent"
8569
android:text="@string/generic_webp"
86-
android:textAlignment="center"
87-
android:textColor="@drawable/radiobuttontextselector"
88-
android:textStyle="bold" />
70+
style="@style/exportProjectDialogLayout_radioButton_style" />
8971

9072
<RadioButton
9173
android:id="@+id/exportProjectDialogLayout_radioButton_TIF"
92-
android:layout_width="wrap_content"
9374
android:layout_height="wrap_content"
94-
android:width="90dp"
95-
android:background="@drawable/radiobuttonselector"
96-
android:button="@android:color/transparent"
9775
android:text="@string/generic_tif"
98-
android:textAlignment="center"
99-
android:textColor="@drawable/radiobuttontextselector"
100-
android:textStyle="bold" />
76+
style="@style/exportProjectDialogLayout_radioButton_style" />
10177

10278
<RadioButton
10379
android:id="@+id/exportProjectDialogLayout_radioButton_BMP"
104-
android:layout_width="wrap_content"
10580
android:layout_height="wrap_content"
106-
android:width="90dp"
107-
android:background="@drawable/radiobuttonselectorlast"
108-
android:button="@android:color/transparent"
10981
android:text="@string/generic_bmp"
110-
android:textAlignment="center"
111-
android:textColor="@drawable/radiobuttontextselector"
112-
android:textStyle="bold" />
82+
style="@style/exportProjectDialogLayout_radioButtonEnd_style" />
11383
</RadioGroup>
11484
</HorizontalScrollView>
11585

@@ -133,28 +103,16 @@
133103

134104
<RadioButton
135105
android:id="@+id/exportProjectDialogLayout_radioButton_Raw"
136-
android:layout_width="wrap_content"
137106
android:layout_height="wrap_content"
138-
android:width="90dp"
139-
android:background="@drawable/radiobuttonselector"
140-
android:button="@android:color/transparent"
141-
android:checked="true"
142107
android:text="@string/exportProjectDialogLayout_raw_str"
143-
android:textAlignment="center"
144-
android:textColor="@drawable/radiobuttontextselector"
145-
android:textStyle="bold" />
108+
android:checked="true"
109+
style="@style/exportProjectDialogLayout_radioButton_style"/>
146110

147111
<RadioButton
148112
android:id="@+id/exportProjectDialogLayout_radioButton_Scaled"
149-
android:layout_width="wrap_content"
150113
android:layout_height="wrap_content"
151-
android:width="90dp"
152-
android:background="@drawable/radiobuttonselectorlast"
153-
android:button="@android:color/transparent"
154114
android:text="@string/exportProjectDialogLayout_scaled_str"
155-
android:textAlignment="center"
156-
android:textColor="@drawable/radiobuttontextselector"
157-
android:textStyle="bold" />
115+
style="@style/exportProjectDialogLayout_radioButtonEnd_style" />
158116
</RadioGroup>
159117

160118
<com.google.android.material.textfield.TextInputLayout

‎app/src/main/res/layout/export_project_dialog_layout.xml‎

Lines changed: 8 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -49,64 +49,34 @@
4949

5050
<RadioButton
5151
android:id="@+id/exportProjectDialogLayout_radioButton_PNG"
52-
android:layout_width="wrap_content"
5352
android:layout_height="wrap_content"
54-
android:width="90dp"
55-
android:background="@drawable/radiobuttonselector"
56-
android:button="@android:color/transparent"
57-
android:textColor="@drawable/radiobuttontextselector"
5853
android:text="@string/generic_png"
5954
android:checked="true"
60-
android:textStyle="bold"
61-
android:textAlignment="center" />
55+
style="@style/exportProjectDialogLayout_radioButton_style"/>
6256

6357
<RadioButton
6458
android:id="@+id/exportProjectDialogLayout_radioButton_JPG"
65-
android:layout_width="wrap_content"
6659
android:layout_height="wrap_content"
67-
android:width="90dp"
68-
android:background="@drawable/radiobuttonselector"
69-
android:textColor="@drawable/radiobuttontextselector"
70-
android:button="@android:color/transparent"
7160
android:text="@string/generic_jpg"
72-
android:textStyle="bold"
73-
android:textAlignment="center" />
61+
style="@style/exportProjectDialogLayout_radioButton_style" />
7462

7563
<RadioButton
7664
android:id="@+id/exportProjectDialogLayout_radioButton_WEBP"
77-
android:layout_width="wrap_content"
7865
android:layout_height="wrap_content"
79-
android:width="90dp"
80-
android:background="@drawable/radiobuttonselector"
81-
android:button="@android:color/transparent"
82-
android:textColor="@drawable/radiobuttontextselector"
8366
android:text="@string/generic_webp"
84-
android:textStyle="bold"
85-
android:textAlignment="center" />
67+
style="@style/exportProjectDialogLayout_radioButton_style" />
8668

8769
<RadioButton
8870
android:id="@+id/exportProjectDialogLayout_radioButton_TIF"
89-
android:layout_width="wrap_content"
9071
android:layout_height="wrap_content"
91-
android:width="90dp"
92-
android:background="@drawable/radiobuttonselector"
93-
android:button="@android:color/transparent"
94-
android:textColor="@drawable/radiobuttontextselector"
9572
android:text="@string/generic_tif"
96-
android:textStyle="bold"
97-
android:textAlignment="center" />
73+
style="@style/exportProjectDialogLayout_radioButton_style" />
9874

9975
<RadioButton
10076
android:id="@+id/exportProjectDialogLayout_radioButton_BMP"
101-
android:layout_width="wrap_content"
10277
android:layout_height="wrap_content"
103-
android:width="90dp"
104-
android:background="@drawable/radiobuttonselectorlast"
105-
android:button="@android:color/transparent"
106-
android:textColor="@drawable/radiobuttontextselector"
10778
android:text="@string/generic_bmp"
108-
android:textStyle="bold"
109-
android:textAlignment="center" />
79+
style="@style/exportProjectDialogLayout_radioButtonEnd_style" />
11080
</RadioGroup>
11181
</HorizontalScrollView>
11282

@@ -130,28 +100,16 @@
130100

131101
<RadioButton
132102
android:id="@+id/exportProjectDialogLayout_radioButton_Raw"
133-
android:layout_width="wrap_content"
134103
android:layout_height="wrap_content"
135-
android:width="90dp"
136-
android:background="@drawable/radiobuttonselector"
137-
android:button="@android:color/transparent"
138-
android:checked="true"
139104
android:text="@string/exportProjectDialogLayout_raw_str"
140-
android:textAlignment="center"
141-
android:textColor="@drawable/radiobuttontextselector"
142-
android:textStyle="bold" />
105+
android:checked="true"
106+
style="@style/exportProjectDialogLayout_radioButton_style" />
143107

144108
<RadioButton
145109
android:id="@+id/exportProjectDialogLayout_radioButton_Scaled"
146-
android:layout_width="wrap_content"
147110
android:layout_height="wrap_content"
148-
android:width="90dp"
149-
android:background="@drawable/radiobuttonselectorlast"
150-
android:button="@android:color/transparent"
151111
android:text="@string/exportProjectDialogLayout_scaled_str"
152-
android:textAlignment="center"
153-
android:textColor="@drawable/radiobuttontextselector"
154-
android:textStyle="bold" />
112+
style="@style/exportProjectDialogLayout_radioButtonEnd_style" />
155113
</RadioGroup>
156114

157115
<com.google.android.material.textfield.TextInputLayout

‎app/src/main/res/values/styles.xml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
43
<style name="MaterialAlertDialog.App.Title.Text" parent="MaterialAlertDialog.Material3.Title.Text">
54
<item name="android:fontFamily">@font/manrope_medium</item>
65
</style>
76

8-
97
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
108
<item name="android:textColorPrimary">@android:color/holo_blue_dark</item>
119
<item name="android:fontFamily">@font/manrope_medium</item>
@@ -149,4 +147,18 @@
149147
<item name="android:background">@color/fragment_background_color_daynight</item>
150148
<item name="android:clickable">true</item>
151149
</style>
150+
151+
<style name="exportProjectDialogLayout_radioButton_style">
152+
<item name="android:width">90dp</item>
153+
<item name="android:background">@drawable/radiobuttonselector</item>
154+
<item name="android:button">@android:color/transparent</item>
155+
<item name="android:textColor">@drawable/radiobuttontextselector</item>
156+
<item name="android:textStyle">bold</item>
157+
<item name="android:textAlignment">center</item>
158+
<item name="android:layout_width">90dp</item>
159+
</style>
160+
161+
<style name="exportProjectDialogLayout_radioButtonEnd_style" parent="exportProjectDialogLayout_radioButton_style">
162+
<item name="android:background">@drawable/radiobuttonselectorlast</item>
163+
</style>
152164
</resources>

0 commit comments

Comments
 (0)