Skip to content

Commit 253502f

Browse files
committed
Change colors to adapt light / dark theme
1 parent ad5fc91 commit 253502f

File tree

3 files changed

+24
-31
lines changed

3 files changed

+24
-31
lines changed

app/src/main/res/color/button_text.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

app/src/main/res/layout/activity_main.xml

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27,29 +27,20 @@
2727

2828
<Button
2929
android:id="@+id/buttonReset"
30-
style="@style/Widget.AppCompat.Button.Borderless"
30+
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
3131
android:layout_width="wrap_content"
3232
android:layout_height="wrap_content"
3333
android:text="Reset"
34-
android:textAllCaps="false"
35-
android:textColor="@color/button_text" />
34+
android:textAllCaps="false" />
3635

3736
<Button
3837
android:id="@+id/buttonAuto"
39-
style="@style/Widget.AppCompat.Button.Borderless"
38+
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
4039
android:layout_width="wrap_content"
4140
android:layout_height="wrap_content"
4241
android:layout_weight="0"
4342
android:text="Auto"
44-
android:textAllCaps="false"
45-
android:textColor="@color/button_text" />
46-
47-
<CheckBox
48-
android:id="@+id/checkBoxInpaint"
49-
android:layout_width="wrap_content"
50-
android:layout_height="wrap_content"
51-
android:layout_weight="0"
52-
android:text="Inpaint" />
43+
android:textAllCaps="false"/>
5344

5445
<TextView
5546
android:id="@+id/textView3"
@@ -59,20 +50,32 @@
5950

6051
<Button
6152
android:id="@+id/buttonPreview"
62-
style="@style/Widget.AppCompat.Button.Borderless"
53+
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
6354
android:layout_width="wrap_content"
6455
android:layout_height="wrap_content"
6556
android:layout_weight="0"
6657
android:text="Preview &gt;"
67-
android:textAllCaps="false"
68-
android:textColor="@color/button_text" />
58+
android:textAllCaps="false"/>
59+
</LinearLayout>
60+
61+
<LinearLayout
62+
android:layout_width="match_parent"
63+
android:layout_height="wrap_content"
64+
android:orientation="horizontal">
65+
66+
<CheckBox
67+
android:id="@+id/checkBoxInpaint"
68+
android:layout_width="wrap_content"
69+
android:layout_height="wrap_content"
70+
android:layout_weight="1"
71+
android:text="Inpaint" />
72+
6973
</LinearLayout>
7074

7175
<LinearLayout
7276
android:layout_width="wrap_content"
7377
android:layout_height="wrap_content"
74-
android:layout_gravity="center"
75-
android:gravity="center"
78+
android:gravity="center_vertical"
7679
android:orientation="horizontal">
7780

7881
<TextView
@@ -114,7 +117,6 @@
114117
android:id="@+id/frameLayout"
115118
android:layout_width="match_parent"
116119
android:layout_height="match_parent"
117-
android:background="@color/teal_700"
118120
android:padding="3dp">
119121

120122
<com.dan.perspective.EditPerspectiveImageView
@@ -131,7 +133,6 @@
131133
android:layout_width="match_parent"
132134
android:layout_height="match_parent"
133135
android:alpha="0"
134-
android:background="@color/design_default_color_background"
135136
android:orientation="vertical"
136137
android:scaleX="1.2"
137138
android:scaleY="1.2"
@@ -149,20 +150,18 @@
149150

150151
<Button
151152
android:id="@+id/buttonEdit"
152-
style="@style/Widget.AppCompat.Button.Borderless"
153+
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
153154
android:layout_width="wrap_content"
154155
android:layout_height="wrap_content"
155156
android:text="&lt; Edit"
156-
android:textAllCaps="false"
157-
android:textColor="@color/button_text" />
157+
android:textAllCaps="false"/>
158158

159159
</LinearLayout>
160160

161161
<FrameLayout
162162
android:id="@+id/frameLayout2"
163163
android:layout_width="match_parent"
164164
android:layout_height="match_parent"
165-
android:background="@color/teal_700"
166165
android:padding="3dp">
167166

168167
<com.dan.perspective.TouchImageView

app/src/main/res/layout/busy_dialog.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<LinearLayout
55
android:layout_width="wrap_content"
66
android:layout_height="wrap_content"
7-
android:background="#B3FFFFFF"
7+
android:background="?android:attr/colorBackground"
88
android:gravity="center"
99
android:orientation="vertical"
1010
android:padding="16dp">

0 commit comments

Comments
 (0)