Skip to content

Commit e2d7025

Browse files
maltaisnmaltaisn
committed
Merge remote-tracking branch 'guger/master'
2 parents a3186f6 + 090d1f8 commit e2d7025

File tree

7 files changed

+68
-88
lines changed

7 files changed

+68
-88
lines changed

‎app/build.gradle‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ dependencies {
2424
androidTestImplementation 'androidx.test:runner:1.1.1'
2525
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
2626

27-
implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
28-
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
27+
implementation 'com.google.android.material:material:1.0.0'
28+
29+
implementation 'androidx.appcompat:appcompat:1.0.2'
30+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
2931

3032
implementation project(':calcdialog')
3133
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<resources>
22

33
<!-- Base application theme. -->
4-
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
4+
<style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
55
<!-- Customize your theme here. -->
66
<item name="colorPrimary">@color/colorPrimary</item>
77
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.2.1'
10+
classpath 'com.android.tools.build:gradle:3.3.0'
1111
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
1212
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
1313

‎calcdialog/build.gradle‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,10 @@ dependencies {
5252
androidTestImplementation 'androidx.test:runner:1.1.1'
5353
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
5454

55-
implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
56-
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
55+
implementation 'com.google.android.material:material:1.0.0'
56+
57+
implementation 'androidx.appcompat:appcompat:1.0.2'
58+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
5759
}
5860

5961
apply from: 'maven-install.gradle'

‎calcdialog/src/main/res/layout/dialog_calc.xml‎

Lines changed: 41 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
1+
<?xml version="1.0" encoding="utf-8"?><!--
32
Copyright (c) 2018 Nicolas Maltais
43
54
Licensed to the Apache Software Foundation (ASF) under one
@@ -20,15 +19,13 @@
2019
under the License.
2120
-->
2221

23-
<androidx.constraintlayout.widget.ConstraintLayout
24-
xmlns:android="http://schemas.android.com/apk/res/android"
22+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
2523
xmlns:app="http://schemas.android.com/apk/res-auto"
2624
xmlns:tools="http://schemas.android.com/tools"
2725
android:layout_width="match_parent"
2826
android:layout_height="match_parent"
2927
android:background="?attr/calcBackgroundColor"
30-
tools:theme="@style/CalcDialogStyle"
31-
>
28+
tools:theme="@style/CalcDialogStyle">
3229

3330
<LinearLayout
3431
android:id="@+id/calc_layout_header"
@@ -38,26 +35,23 @@
3835
android:elevation="2dp"
3936
app:layout_constraintEnd_toEndOf="parent"
4037
app:layout_constraintStart_toStartOf="parent"
41-
app:layout_constraintTop_toTopOf="parent"
42-
>
38+
app:layout_constraintTop_toTopOf="parent">
4339

4440
<androidx.appcompat.widget.AppCompatTextView
4541
android:id="@+id/calc_txv_value"
4642
style="?attr/calcValueStyle"
4743
android:layout_width="match_parent"
4844
android:layout_height="?attr/calcHeaderHeight"
4945
android:layout_weight="1"
50-
tools:text="-1,211.52"
51-
/>
46+
tools:text="-1,211.52" />
5247

5348
<com.nmaltais.calcdialog.CalcEraseButton
5449
android:id="@+id/calc_btn_erase"
5550
style="?attr/calcEraseBtnStyle"
5651
android:layout_width="wrap_content"
5752
android:layout_height="match_parent"
5853
android:layout_weight="0"
59-
tools:ignore="ContentDescription"
60-
/>
54+
tools:ignore="ContentDescription" />
6155

6256
</LinearLayout>
6357

@@ -69,7 +63,7 @@
6963
app:layout_constraintBottom_toTopOf="@+id/calc_view_sep_footer"
7064
app:layout_constraintEnd_toStartOf="@+id/calc_guideline_end"
7165
app:layout_constraintStart_toStartOf="parent"
72-
app:layout_constraintTop_toBottomOf="@+id/calc_layout_header"/>
66+
app:layout_constraintTop_toBottomOf="@+id/calc_layout_header" />
7367

7468
<View
7569
android:id="@+id/calc_view_op_bg"
@@ -79,7 +73,7 @@
7973
app:layout_constraintBottom_toTopOf="@+id/calc_view_sep_footer"
8074
app:layout_constraintEnd_toEndOf="parent"
8175
app:layout_constraintStart_toStartOf="@+id/calc_guideline_end"
82-
app:layout_constraintTop_toBottomOf="@+id/calc_layout_header"/>
76+
app:layout_constraintTop_toBottomOf="@+id/calc_layout_header" />
8377

8478
<TextView
8579
android:id="@+id/calc_btn_0"
@@ -91,8 +85,7 @@
9185
app:layout_constraintHorizontal_bias="0.0"
9286
app:layout_constraintStart_toStartOf="@+id/calc_guideline_start"
9387
app:layout_constraintTop_toTopOf="@+id/calc_btn_decimal"
94-
tools:text="0"
95-
/>
88+
tools:text="0" />
9689

9790
<TextView
9891
android:id="@+id/calc_btn_1"
@@ -104,8 +97,7 @@
10497
app:layout_constraintHorizontal_bias="0.5"
10598
app:layout_constraintStart_toStartOf="parent"
10699
app:layout_constraintTop_toBottomOf="@+id/calc_btn_4"
107-
tools:text="1"
108-
/>
100+
tools:text="1" />
109101

110102
<TextView
111103
android:id="@+id/calc_btn_2"
@@ -117,8 +109,7 @@
117109
app:layout_constraintHorizontal_bias="0.0"
118110
app:layout_constraintStart_toStartOf="@+id/calc_guideline_start"
119111
app:layout_constraintTop_toBottomOf="@+id/calc_btn_4"
120-
tools:text="2"
121-
/>
112+
tools:text="2" />
122113

123114
<TextView
124115
android:id="@+id/calc_btn_3"
@@ -130,8 +121,7 @@
130121
app:layout_constraintHorizontal_bias="0.0"
131122
app:layout_constraintStart_toStartOf="@+id/calc_guideline_middle"
132123
app:layout_constraintTop_toBottomOf="@+id/calc_btn_4"
133-
tools:text="3"
134-
/>
124+
tools:text="3" />
135125

136126
<TextView
137127
android:id="@+id/calc_btn_4"
@@ -143,8 +133,7 @@
143133
app:layout_constraintHorizontal_bias="0.5"
144134
app:layout_constraintStart_toStartOf="parent"
145135
app:layout_constraintTop_toBottomOf="@+id/calc_btn_7"
146-
tools:text="4"
147-
/>
136+
tools:text="4" />
148137

149138
<TextView
150139
android:id="@+id/calc_btn_5"
@@ -156,8 +145,7 @@
156145
app:layout_constraintHorizontal_bias="0.0"
157146
app:layout_constraintStart_toStartOf="@+id/calc_guideline_start"
158147
app:layout_constraintTop_toBottomOf="@+id/calc_btn_7"
159-
tools:text="5"
160-
/>
148+
tools:text="5" />
161149

162150
<TextView
163151
android:id="@+id/calc_btn_6"
@@ -169,8 +157,7 @@
169157
app:layout_constraintHorizontal_bias="0.0"
170158
app:layout_constraintStart_toStartOf="@+id/calc_guideline_middle"
171159
app:layout_constraintTop_toBottomOf="@+id/calc_btn_7"
172-
tools:text="6"
173-
/>
160+
tools:text="6" />
174161

175162
<TextView
176163
android:id="@+id/calc_btn_7"
@@ -183,8 +170,7 @@
183170
app:layout_constraintStart_toStartOf="parent"
184171
app:layout_constraintTop_toBottomOf="@+id/calc_layout_header"
185172
app:layout_constraintVertical_chainStyle="spread_inside"
186-
tools:text="7"
187-
/>
173+
tools:text="7" />
188174

189175
<TextView
190176
android:id="@+id/calc_btn_8"
@@ -195,8 +181,7 @@
195181
app:layout_constraintEnd_toStartOf="@+id/calc_guideline_middle"
196182
app:layout_constraintStart_toStartOf="@+id/calc_guideline_start"
197183
app:layout_constraintTop_toTopOf="@+id/calc_btn_7"
198-
tools:text="8"
199-
/>
184+
tools:text="8" />
200185

201186
<TextView
202187
android:id="@+id/calc_btn_9"
@@ -208,8 +193,7 @@
208193
app:layout_constraintHorizontal_bias="0.0"
209194
app:layout_constraintStart_toStartOf="@+id/calc_guideline_middle"
210195
app:layout_constraintTop_toTopOf="@+id/calc_btn_7"
211-
tools:text="9"
212-
/>
196+
tools:text="9" />
213197

214198
<TextView
215199
android:id="@+id/calc_btn_decimal"
@@ -221,8 +205,7 @@
221205
app:layout_constraintHorizontal_bias="0.5"
222206
app:layout_constraintStart_toStartOf="parent"
223207
app:layout_constraintTop_toBottomOf="@+id/calc_btn_1"
224-
tools:text="."
225-
/>
208+
tools:text="." />
226209

227210
<TextView
228211
android:id="@+id/calc_btn_sign"
@@ -233,8 +216,7 @@
233216
app:layout_constraintEnd_toStartOf="@+id/calc_guideline_end"
234217
app:layout_constraintStart_toStartOf="@+id/calc_guideline_middle"
235218
app:layout_constraintTop_toTopOf="@+id/calc_btn_decimal"
236-
tools:text="±"
237-
/>
219+
tools:text="±" />
238220

239221
<TextView
240222
android:id="@+id/calc_btn_div"
@@ -246,8 +228,7 @@
246228
app:layout_constraintHorizontal_bias="0.5"
247229
app:layout_constraintStart_toStartOf="@+id/calc_guideline_end"
248230
app:layout_constraintTop_toTopOf="@+id/calc_btn_7"
249-
tools:text="÷"
250-
/>
231+
tools:text="÷" />
251232

252233
<TextView
253234
android:id="@+id/calc_btn_mult"
@@ -259,8 +240,7 @@
259240
app:layout_constraintHorizontal_bias="0.5"
260241
app:layout_constraintStart_toStartOf="@+id/calc_guideline_end"
261242
app:layout_constraintTop_toBottomOf="@+id/calc_btn_div"
262-
tools:text="×"
263-
/>
243+
tools:text="×" />
264244

265245
<TextView
266246
android:id="@+id/calc_btn_sub"
@@ -272,8 +252,7 @@
272252
app:layout_constraintHorizontal_bias="0.5"
273253
app:layout_constraintStart_toStartOf="@+id/calc_guideline_end"
274254
app:layout_constraintTop_toBottomOf="@+id/calc_btn_mult"
275-
tools:text="-"
276-
/>
255+
tools:text="-" />
277256

278257
<TextView
279258
android:id="@+id/calc_btn_add"
@@ -285,8 +264,7 @@
285264
app:layout_constraintHorizontal_bias="0.5"
286265
app:layout_constraintStart_toStartOf="@+id/calc_guideline_end"
287266
app:layout_constraintTop_toBottomOf="@+id/calc_btn_sub"
288-
tools:text="+"
289-
/>
267+
tools:text="+" />
290268

291269
<TextView
292270
android:id="@+id/calc_btn_equal"
@@ -298,8 +276,7 @@
298276
app:layout_constraintHorizontal_bias="0.5"
299277
app:layout_constraintStart_toStartOf="@+id/calc_guideline_end"
300278
app:layout_constraintTop_toBottomOf="@+id/calc_btn_add"
301-
tools:text="="
302-
/>
279+
tools:text="=" />
303280

304281
<TextView
305282
android:id="@+id/calc_btn_answer"
@@ -311,8 +288,7 @@
311288
app:layout_constraintBottom_toBottomOf="@+id/calc_btn_equal"
312289
app:layout_constraintEnd_toEndOf="@+id/calc_btn_equal"
313290
app:layout_constraintStart_toStartOf="@+id/calc_btn_equal"
314-
app:layout_constraintTop_toTopOf="@+id/calc_btn_equal"
315-
/>
291+
app:layout_constraintTop_toTopOf="@+id/calc_btn_equal" />
316292

317293
<View
318294
android:id="@+id/calc_view_sep_footer"
@@ -323,78 +299,71 @@
323299
app:layout_constraintEnd_toEndOf="parent"
324300
app:layout_constraintHorizontal_bias="0.5"
325301
app:layout_constraintStart_toStartOf="parent"
326-
app:layout_constraintTop_toBottomOf="@+id/calc_btn_decimal"
327-
/>
302+
app:layout_constraintTop_toBottomOf="@+id/calc_btn_decimal" />
328303

329304
<Button
330305
android:id="@+id/calc_btn_clear"
331-
style="@style/CalcDialogButtonStyle"
306+
style="?attr/calcDialogButtonStyle"
332307
android:layout_width="wrap_content"
333308
android:layout_height="wrap_content"
334-
android:layout_marginBottom="5dp"
335309
android:layout_marginStart="5dp"
336310
android:layout_marginLeft="5dp"
337311
android:layout_marginTop="5dp"
312+
android:layout_marginBottom="5dp"
338313
android:text="?attr/calcButtonTextClear"
339314
app:layout_constraintBottom_toBottomOf="parent"
340315
app:layout_constraintStart_toStartOf="parent"
341-
app:layout_constraintTop_toBottomOf="@+id/calc_view_sep_footer"
342-
/>
316+
app:layout_constraintTop_toBottomOf="@+id/calc_view_sep_footer" />
343317

344318
<Button
345319
android:id="@+id/calc_btn_cancel"
346-
style="@style/CalcDialogButtonStyle"
320+
style="?attr/calcDialogButtonStyle"
347321
android:layout_width="wrap_content"
348322
android:layout_height="wrap_content"
349-
android:layout_marginBottom="5dp"
323+
android:layout_marginTop="5dp"
350324
android:layout_marginEnd="5dp"
351325
android:layout_marginRight="5dp"
352-
android:layout_marginTop="5dp"
326+
android:layout_marginBottom="5dp"
353327
android:text="?attr/calcButtonTextCancel"
354328
app:layout_constraintBottom_toBottomOf="parent"
355329
app:layout_constraintEnd_toStartOf="@+id/calc_btn_ok"
356330
app:layout_constraintTop_toBottomOf="@+id/calc_view_sep_footer"
357-
app:layout_constraintVertical_bias="1.0"
358-
/>
331+
app:layout_constraintVertical_bias="1.0" />
359332

360333
<Button
361334
android:id="@+id/calc_btn_ok"
362-
style="@style/CalcDialogButtonStyle"
335+
style="?attr/calcDialogButtonStyle"
363336
android:layout_width="wrap_content"
364337
android:layout_height="wrap_content"
365-
android:layout_marginBottom="5dp"
338+
android:layout_marginTop="5dp"
366339
android:layout_marginEnd="5dp"
367340
android:layout_marginRight="5dp"
368-
android:layout_marginTop="5dp"
341+
android:layout_marginBottom="5dp"
369342
android:text="?attr/calcButtonTextOk"
370343
app:layout_constraintBottom_toBottomOf="parent"
371344
app:layout_constraintEnd_toEndOf="parent"
372345
app:layout_constraintTop_toBottomOf="@+id/calc_view_sep_footer"
373-
app:layout_constraintVertical_bias="0.0"
374-
/>
346+
app:layout_constraintVertical_bias="0.0" />
375347

376348
<androidx.constraintlayout.widget.Guideline
377349
android:id="@+id/calc_guideline_start"
378350
android:layout_width="wrap_content"
379351
android:layout_height="wrap_content"
380352
android:orientation="vertical"
381-
app:layout_constraintGuide_percent="0.27"
382-
/>
353+
app:layout_constraintGuide_percent="0.27" />
383354

384355
<androidx.constraintlayout.widget.Guideline
385356
android:id="@+id/calc_guideline_middle"
386357
android:layout_width="wrap_content"
387358
android:layout_height="wrap_content"
388359
android:orientation="vertical"
389-
app:layout_constraintGuide_percent="0.54"
390-
/>
360+
app:layout_constraintGuide_percent="0.54" />
391361

392362
<androidx.constraintlayout.widget.Guideline
393363
android:id="@+id/calc_guideline_end"
394364
android:layout_width="wrap_content"
395365
android:layout_height="wrap_content"
396366
android:orientation="vertical"
397-
app:layout_constraintGuide_percent="0.8"
398-
/>
367+
app:layout_constraintGuide_percent="0.8" />
399368

400369
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)