Skip to content

Commit 860ad7e

Browse files
dmtomczykdmtomczyk
committed
Added 2 drawable button files that have a border.
1 parent 3550731 commit 860ad7e

File tree

5 files changed

+72
-56
lines changed

5 files changed

+72
-56
lines changed

‎app/src/main/res/drawable/my_button_bg.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3-
4-
</selector>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:shape="rectangle">
4+
<gradient android:startColor="#aaa"
5+
android:endColor="#aaa"
6+
android:angle="0" />
7+
<corners android:radius="3dp" />
8+
<stroke android:width="5px" android:color="darker_grey" />
9+
</shape>

‎app/src/main/res/drawable/my_orange_button_bg.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:shape="rectangle">
4+
<gradient android:startColor="#FFA000"
5+
android:endColor="#FFA000"
6+
android:angle="0" />
7+
<corners android:radius="3dp" />
8+
<stroke android:width="5px" android:color="darker_grey" />
9+
</shape>

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

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
<Button
2424
android:id="@+id/Multiplication"
2525
android:layout_width="110dp"
26-
android:layout_height="80dp"
27-
android:background="#FFA500"
26+
android:layout_height="82dp"
27+
android:background="@drawable/my_orange_button_bg"
2828
android:text="X"
2929
android:textColor="@android:color/white"
3030
android:textColorLink="@android:color/darker_gray"
@@ -35,8 +35,8 @@
3535
<Button
3636
android:id="@+id/Subtraction"
3737
android:layout_width="110dp"
38-
android:layout_height="80dp"
39-
android:background="#FFA500"
38+
android:layout_height="82dp"
39+
android:background="@drawable/my_orange_button_bg"
4040
android:text="-"
4141
android:textColor="@android:color/white"
4242
android:textColorLink="@android:color/darker_gray"
@@ -47,8 +47,8 @@
4747
<Button
4848
android:id="@+id/Equals"
4949
android:layout_width="110dp"
50-
android:layout_height="80dp"
51-
android:background="#FFA500"
50+
android:layout_height="81dp"
51+
android:background="@drawable/my_orange_button_bg"
5252
android:text="="
5353
android:textColor="@android:color/white"
5454
android:textColorLink="@android:color/darker_gray"
@@ -59,8 +59,8 @@
5959
<Button
6060
android:id="@+id/Addition"
6161
android:layout_width="110dp"
62-
android:layout_height="80dp"
63-
android:background="#FFA500"
62+
android:layout_height="82dp"
63+
android:background="@drawable/my_orange_button_bg"
6464
android:text="+"
6565
android:textColor="@android:color/white"
6666
android:textColorLink="@android:color/darker_gray"
@@ -71,8 +71,8 @@
7171
<Button
7272
android:id="@+id/button13"
7373
android:layout_width="110dp"
74-
android:layout_height="80dp"
75-
android:background="#FFA500"
74+
android:layout_height="82dp"
75+
android:background="@drawable/my_orange_button_bg"
7676
android:text="/"
7777
android:textColor="@android:color/white"
7878
android:textColorLink="@android:color/darker_gray"
@@ -82,11 +82,11 @@
8282

8383
<Button
8484
android:id="@+id/Remainder"
85-
android:layout_width="85dp"
86-
android:layout_height="80dp"
85+
android:layout_width="87dp"
86+
android:layout_height="82dp"
8787
android:layout_marginLeft="170dp"
8888
android:layout_marginTop="113dp"
89-
android:background="@android:color/darker_gray"
89+
android:background="@drawable/my_button_bg"
9090
android:text="%"
9191
android:textColor="@android:color/black"
9292
android:textColorLink="@android:color/darker_gray"
@@ -98,11 +98,11 @@
9898

9999
<Button
100100
android:id="@+id/Summation"
101-
android:layout_width="85dp"
102-
android:layout_height="80dp"
101+
android:layout_width="87dp"
102+
android:layout_height="82dp"
103103
android:layout_marginLeft="85dp"
104104
android:layout_marginTop="113dp"
105-
android:background="@android:color/darker_gray"
105+
android:background="@drawable/my_button_bg"
106106
android:text="+/-"
107107
android:textColor="@android:color/black"
108108
android:textColorLink="@android:color/darker_gray"
@@ -114,11 +114,11 @@
114114

115115
<Button
116116
android:id="@+id/Seven"
117-
android:layout_width="85dp"
118-
android:layout_height="80dp"
117+
android:layout_width="87dp"
118+
android:layout_height="82dp"
119119
android:layout_marginLeft="170dp"
120120
android:layout_marginTop="193dp"
121-
android:background="@android:color/darker_gray"
121+
android:background="@drawable/my_button_bg"
122122
android:text="9"
123123
android:textColor="@android:color/black"
124124
android:textColorLink="@android:color/darker_gray"
@@ -130,11 +130,11 @@
130130

131131
<Button
132132
android:id="@+id/button17"
133-
android:layout_width="85dp"
134-
android:layout_height="80dp"
133+
android:layout_width="87dp"
134+
android:layout_height="82dp"
135135
android:layout_marginLeft="0dp"
136136
android:layout_marginTop="193dp"
137-
android:background="@android:color/darker_gray"
137+
android:background="@drawable/my_button_bg"
138138
android:text="7"
139139
android:textColor="@android:color/black"
140140
android:textColorLink="@android:color/darker_gray"
@@ -146,11 +146,11 @@
146146

147147
<Button
148148
android:id="@+id/button18"
149-
android:layout_width="85dp"
150-
android:layout_height="80dp"
149+
android:layout_width="87dp"
150+
android:layout_height="82dp"
151151
android:layout_marginLeft="0dp"
152152
android:layout_marginTop="273dp"
153-
android:background="@android:color/darker_gray"
153+
android:background="@drawable/my_button_bg"
154154
android:text="4"
155155
android:textColor="@android:color/black"
156156
android:textColorLink="@android:color/darker_gray"
@@ -162,11 +162,11 @@
162162

163163
<Button
164164
android:id="@+id/button19"
165-
android:layout_width="85dp"
166-
android:layout_height="80dp"
165+
android:layout_width="87dp"
166+
android:layout_height="82dp"
167167
android:layout_marginLeft="-8dp"
168168
android:layout_marginTop="353dp"
169-
android:background="@android:color/darker_gray"
169+
android:background="@drawable/my_button_bg"
170170
android:text="1"
171171
android:textColor="@android:color/black"
172172
android:textColorLink="@android:color/darker_gray"
@@ -178,11 +178,11 @@
178178

179179
<Button
180180
android:id="@+id/Decimal"
181-
android:layout_width="85dp"
182-
android:layout_height="80dp"
181+
android:layout_width="87dp"
182+
android:layout_height="82dp"
183183
android:layout_marginLeft="170dp"
184184
android:layout_marginTop="433dp"
185-
android:background="@android:color/darker_gray"
185+
android:background="@drawable/my_button_bg"
186186
android:text="."
187187
android:textColor="@android:color/black"
188188
android:textColorLink="@android:color/darker_gray"
@@ -194,11 +194,11 @@
194194

195195
<Button
196196
android:id="@+id/button30"
197-
android:layout_width="170dp"
198-
android:layout_height="80dp"
197+
android:layout_width="172dp"
198+
android:layout_height="82dp"
199199
android:layout_marginLeft="0dp"
200200
android:layout_marginTop="433dp"
201-
android:background="@android:color/darker_gray"
201+
android:background="@drawable/my_button_bg"
202202
android:text="0"
203203
android:textColor="@android:color/black"
204204
android:textColorLink="@android:color/darker_gray"
@@ -210,11 +210,11 @@
210210

211211
<Button
212212
android:id="@+id/button31"
213-
android:layout_width="85dp"
214-
android:layout_height="80dp"
213+
android:layout_width="87dp"
214+
android:layout_height="82dp"
215215
android:layout_marginLeft="85dp"
216216
android:layout_marginTop="353dp"
217-
android:background="@android:color/darker_gray"
217+
android:background="@drawable/my_button_bg"
218218
android:text="2"
219219
android:textColor="@android:color/black"
220220
android:textColorLink="@android:color/darker_gray"
@@ -226,11 +226,11 @@
226226

227227
<Button
228228
android:id="@+id/button32"
229-
android:layout_width="85dp"
230-
android:layout_height="80dp"
229+
android:layout_width="87dp"
230+
android:layout_height="82dp"
231231
android:layout_marginLeft="85dp"
232232
android:layout_marginTop="273dp"
233-
android:background="@android:color/darker_gray"
233+
android:background="@drawable/my_button_bg"
234234
android:text="5"
235235
android:textColor="@android:color/black"
236236
android:textColorLink="@android:color/darker_gray"
@@ -242,11 +242,11 @@
242242

243243
<Button
244244
android:id="@+id/button33"
245-
android:layout_width="85dp"
246-
android:layout_height="80dp"
245+
android:layout_width="87dp"
246+
android:layout_height="82dp"
247247
android:layout_marginLeft="85dp"
248248
android:layout_marginTop="193dp"
249-
android:background="@android:color/darker_gray"
249+
android:background="@drawable/my_button_bg"
250250
android:text="8"
251251
android:textColor="@android:color/black"
252252
android:textColorLink="@android:color/darker_gray"
@@ -258,11 +258,11 @@
258258

259259
<Button
260260
android:id="@+id/Four"
261-
android:layout_width="85dp"
262-
android:layout_height="80dp"
261+
android:layout_width="87dp"
262+
android:layout_height="82dp"
263263
android:layout_marginLeft="170dp"
264264
android:layout_marginTop="273dp"
265-
android:background="@android:color/darker_gray"
265+
android:background="@drawable/my_button_bg"
266266
android:text="6"
267267
android:textColor="@android:color/black"
268268
android:textColorLink="@android:color/darker_gray"
@@ -274,11 +274,11 @@
274274

275275
<Button
276276
android:id="@+id/One"
277-
android:layout_width="85dp"
278-
android:layout_height="80dp"
277+
android:layout_width="87dp"
278+
android:layout_height="82dp"
279279
android:layout_marginLeft="170dp"
280280
android:layout_marginTop="353dp"
281-
android:background="@android:color/darker_gray"
281+
android:background="@drawable/my_button_bg"
282282
android:text="3"
283283
android:textColor="@android:color/black"
284284
android:textColorLink="@android:color/darker_gray"
@@ -290,11 +290,11 @@
290290

291291
<Button
292292
android:id="@+id/button9"
293-
android:layout_width="85dp"
294-
android:layout_height="80dp"
293+
android:layout_width="87dp"
294+
android:layout_height="82dp"
295295
android:layout_marginLeft="0dp"
296296
android:layout_marginTop="113dp"
297-
android:background="@android:color/darker_gray"
297+
android:background="@drawable/my_button_bg"
298298
android:text="AC"
299299
android:textColor="@android:color/black"
300300
android:textColorLink="@android:color/darker_gray"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
<resources>
22
<string name="app_name">Calculator</string>
3+
<string name="eight">8</string>
4+
<string name="seven">7</string>
35
</resources>

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.3.0'
8+
classpath 'com.android.tools.build:gradle:2.3.1'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

0 commit comments

Comments
 (0)