Skip to content
This repository was archived by the owner on Nov 21, 2019. It is now read-only.

Commit d24c0b6

Browse files
author
Nagesh Susarla
committed
Address issues uncovered by lint
Change-Id: Idaf486574d5514cf821f24189f55697be1d52c47
1 parent 2222065 commit d24c0b6

12 files changed

Lines changed: 116 additions & 153 deletions

‎app/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ android {
1010
versionCode 1
1111
versionName "1.0"
1212
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
13+
vectorDrawables.useSupportLibrary = true
1314
}
1415
buildTypes {
1516
release {

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
android:layout_marginEnd="16dp"
1515
android:layout_marginStart="16dp"
1616
android:layout_marginTop="40dp"
17-
android:text="@string/constraint_layout_example"
17+
android:text="@string/constraint_layout_examples"
1818
android:textAlignment="center"
1919
android:textSize="30sp"
2020
app:layout_constraintLeft_toLeftOf="parent"
@@ -33,7 +33,7 @@
3333
android:layout_marginStart="16dp"
3434
android:onClick="show"
3535
android:tag="constraint_example_1"
36-
android:text="Basic Use"
36+
android:text="@string/centering_views"
3737
app:layout_constraintBottom_toTopOf="@+id/button2"
3838
app:layout_constraintLeft_toLeftOf="parent"
3939
app:layout_constraintRight_toRightOf="parent"
@@ -48,7 +48,7 @@
4848
android:layout_marginBottom="12dp"
4949
android:onClick="show"
5050
android:tag="constraint_example_2"
51-
android:text="Basic Arange"
51+
android:text="@string/basic_arrange"
5252
app:layout_constraintBottom_toTopOf="@+id/button30"
5353
app:layout_constraintLeft_toLeftOf="@+id/button"
5454
app:layout_constraintRight_toRightOf="@+id/button"
@@ -63,7 +63,7 @@
6363
android:layout_marginBottom="16dp"
6464
android:onClick="show"
6565
android:tag="constraint_example_4"
66-
android:text="Advanced Arangement"
66+
android:text="@string/advanced_arrangement"
6767
app:layout_constraintBottom_toTopOf="@+id/button18"
6868
app:layout_constraintLeft_toLeftOf="@+id/button30"
6969
app:layout_constraintRight_toRightOf="@+id/button30"
@@ -78,7 +78,7 @@
7878
android:layout_marginBottom="8dp"
7979
android:onClick="show"
8080
android:tag="constraint_example_5"
81-
android:text="Aspect Ratio"
81+
android:text="@string/aspect_ratio"
8282
app:layout_constraintBottom_toTopOf="@+id/button19"
8383
app:layout_constraintLeft_toLeftOf="@+id/button15"
8484
app:layout_constraintRight_toRightOf="@+id/button15"
@@ -93,7 +93,7 @@
9393
android:layout_marginBottom="8dp"
9494
android:onClick="show"
9595
android:tag="constraint_example_6"
96-
android:text="Basic Chains"
96+
android:text="@string/basic_chains"
9797
app:layout_constraintBottom_toTopOf="@+id/button20"
9898
app:layout_constraintLeft_toLeftOf="@+id/button18"
9999
app:layout_constraintRight_toRightOf="@+id/button18"
@@ -108,7 +108,7 @@
108108
android:layout_marginBottom="8dp"
109109
android:onClick="show"
110110
android:tag="constraint_example_7"
111-
android:text="ConstraintSet"
111+
android:text="@string/constraintset"
112112
app:layout_constraintBottom_toTopOf="@+id/button21"
113113
app:layout_constraintLeft_toLeftOf="@+id/button19"
114114
app:layout_constraintRight_toRightOf="@+id/button19"
@@ -123,7 +123,7 @@
123123
android:layout_marginBottom="22dp"
124124
android:onClick="show"
125125
android:tag="constraint_example_x1"
126-
android:text="Advanced Chains"
126+
android:text="@string/advanced_chains"
127127
app:layout_constraintBottom_toBottomOf="parent"
128128
app:layout_constraintLeft_toLeftOf="@+id/button20"
129129
app:layout_constraintRight_toRightOf="@+id/button20"
@@ -138,7 +138,7 @@
138138
android:layout_marginBottom="13dp"
139139
android:onClick="show"
140140
android:tag="constraint_example_3"
141-
android:text="Guidelines"
141+
android:text="@string/guidelines"
142142
app:layout_constraintBottom_toTopOf="@+id/button15"
143143
app:layout_constraintLeft_toLeftOf="@+id/button2"
144144
app:layout_constraintRight_toRightOf="@+id/button2"

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
android:id="@+id/button3"
1111
android:layout_width="201dp"
1212
android:layout_height="wrap_content"
13-
android:text="Centered Button"
13+
android:text="@string/centered_button"
1414
app:layout_constraintRight_toRightOf="parent"
1515
app:layout_constraintLeft_toLeftOf="parent"
1616
tools:layout_constraintTop_creator="1"
@@ -23,7 +23,7 @@
2323
android:id="@+id/textView2"
2424
android:layout_width="wrap_content"
2525
android:layout_height="wrap_content"
26-
android:text="Basic Centering"
26+
android:text="@string/centering"
2727
android:textSize="30sp"
2828
tools:layout_constraintTop_creator="1"
2929
tools:layout_constraintRight_creator="1"
@@ -37,7 +37,7 @@
3737
android:id="@+id/button31"
3838
android:layout_width="wrap_content"
3939
android:layout_height="wrap_content"
40-
android:text="Button"
40+
android:text="@string/button"
4141
tools:layout_constraintRight_creator="1"
4242
tools:layout_constraintBottom_creator="1"
4343
app:layout_constraintBottom_toBottomOf="parent"
@@ -50,7 +50,7 @@
5050
android:id="@+id/button32"
5151
android:layout_width="wrap_content"
5252
android:layout_height="wrap_content"
53-
android:text="Button"
53+
android:text="@string/button"
5454
app:layout_constraintRight_toRightOf="@+id/button31"
5555
app:layout_constraintLeft_toLeftOf="@+id/button31"
5656
android:layout_marginBottom="224dp"
@@ -66,7 +66,7 @@
6666
android:id="@+id/button33"
6767
android:layout_width="wrap_content"
6868
android:layout_height="wrap_content"
69-
android:text="Button"
69+
android:text="@string/button"
7070
app:layout_constraintRight_toRightOf="@+id/button3"
7171
app:layout_constraintLeft_toRightOf="@+id/button3"
7272
app:layout_constraintBottom_toTopOf="@+id/button32"
@@ -78,7 +78,7 @@
7878
android:id="@+id/button34"
7979
android:layout_width="wrap_content"
8080
android:layout_height="wrap_content"
81-
android:text="Button"
81+
android:text="@string/button"
8282
android:layout_marginTop="112dp"
8383
android:layout_marginBottom="113dp"
8484
app:layout_constraintRight_toRightOf="@+id/button3"

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
android:id="@+id/button4"
1111
android:layout_width="0dp"
1212
android:layout_height="wrap_content"
13-
android:text="Button 1"
13+
android:text="@string/button_1"
1414
app:layout_constraintDimensionRatio="w,16:9"
1515
tools:layout_constraintRight_creator="1"
1616
tools:layout_constraintBottom_creator="1"
@@ -26,7 +26,7 @@
2626
android:id="@+id/button5"
2727
android:layout_width="0dp"
2828
android:layout_height="wrap_content"
29-
android:text="Button 1234"
29+
android:text="@string/button_text"
3030
tools:layout_constraintRight_creator="1"
3131
tools:layout_constraintBottom_creator="1"
3232
app:layout_constraintBottom_toTopOf="@+id/button6"
@@ -41,7 +41,7 @@
4141
android:id="@+id/button6"
4242
android:layout_width="0dp"
4343
android:layout_height="wrap_content"
44-
android:text="Button 12"
44+
android:text="@string/button_text_12"
4545
tools:layout_constraintRight_creator="1"
4646
tools:layout_constraintBottom_creator="1"
4747
app:layout_constraintBottom_toTopOf="@+id/button7"
@@ -56,7 +56,7 @@
5656
android:id="@+id/textView3"
5757
android:layout_width="wrap_content"
5858
android:layout_height="wrap_content"
59-
android:text="Arange"
59+
android:text="@string/arrange"
6060
android:textSize="30sp"
6161
tools:layout_constraintTop_creator="1"
6262
tools:layout_constraintRight_creator="1"
@@ -70,7 +70,7 @@
7070
android:id="@+id/button7"
7171
android:layout_width="0dp"
7272
android:layout_height="wrap_content"
73-
android:text="Button 1234567"
73+
android:text="@string/button_text"
7474
tools:layout_constraintRight_creator="1"
7575
tools:layout_constraintBottom_creator="1"
7676
app:layout_constraintBottom_toTopOf="@+id/button8"
@@ -83,7 +83,7 @@
8383
android:id="@+id/button8"
8484
android:layout_width="0dp"
8585
android:layout_height="wrap_content"
86-
android:text="BTN"
86+
android:text="@string/button_text"
8787
tools:layout_constraintRight_creator="1"
8888
app:layout_constraintRight_toRightOf="@+id/button7"
8989
tools:layout_constraintLeft_creator="1"
@@ -96,7 +96,7 @@
9696
android:id="@+id/button27"
9797
android:layout_width="wrap_content"
9898
android:layout_height="wrap_content"
99-
android:text="Button"
99+
android:text="@string/button"
100100
app:layout_constraintRight_toLeftOf="@+id/button29"
101101
app:layout_constraintLeft_toRightOf="@+id/button28"
102102
tools:layout_constraintBottom_creator="1"
@@ -107,7 +107,7 @@
107107
android:id="@+id/button28"
108108
android:layout_width="wrap_content"
109109
android:layout_height="wrap_content"
110-
android:text="Button"
110+
android:text="@string/button"
111111
app:layout_constraintRight_toLeftOf="@+id/button27"
112112
app:layout_constraintLeft_toLeftOf="parent"
113113
tools:layout_constraintBottom_creator="1"
@@ -118,7 +118,7 @@
118118
android:id="@+id/button29"
119119
android:layout_width="wrap_content"
120120
android:layout_height="wrap_content"
121-
android:text="Button"
121+
android:text="@string/button"
122122
app:layout_constraintRight_toRightOf="parent"
123123
app:layout_constraintLeft_toRightOf="@+id/button27"
124124
tools:layout_constraintBottom_creator="1"

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
android:id="@+id/button4"
1111
android:layout_width="wrap_content"
1212
android:layout_height="0dp"
13-
android:text="Button"
13+
android:text="@string/button"
1414
tools:layout_constraintTop_creator="1"
1515
android:layout_marginStart="8dp"
1616
android:layout_marginTop="8dp"
@@ -22,7 +22,7 @@
2222
android:id="@+id/button5"
2323
android:layout_width="wrap_content"
2424
android:layout_height="wrap_content"
25-
android:text="Button"
25+
android:text="@string/button"
2626
app:layout_constraintRight_toLeftOf="@+id/guideline2"
2727
tools:layout_constraintRight_creator="1"
2828
tools:layout_constraintBottom_creator="1"
@@ -34,7 +34,7 @@
3434
android:id="@+id/button6"
3535
android:layout_width="wrap_content"
3636
android:layout_height="wrap_content"
37-
android:text="Button"
37+
android:text="@string/button"
3838
app:layout_constraintRight_toLeftOf="@+id/guideline2"
3939
tools:layout_constraintTop_creator="1"
4040
tools:layout_constraintRight_creator="1"
@@ -46,7 +46,7 @@
4646
android:id="@+id/textView3"
4747
android:layout_width="0dp"
4848
android:layout_height="wrap_content"
49-
android:text="Guidelines"
49+
android:text="@string/guidelines"
5050
android:textSize="30sp"
5151
tools:layout_constraintTop_creator="1"
5252
tools:layout_constraintRight_creator="1"
@@ -60,7 +60,7 @@
6060
android:id="@+id/button7"
6161
android:layout_width="wrap_content"
6262
android:layout_height="wrap_content"
63-
android:text="Button"
63+
android:text="@string/button"
6464
tools:layout_constraintTop_creator="1"
6565
android:layout_marginStart="8dp"
6666
app:layout_constraintTop_toBottomOf="@+id/button6"
@@ -71,7 +71,7 @@
7171
android:id="@+id/button8"
7272
android:layout_width="wrap_content"
7373
android:layout_height="wrap_content"
74-
android:text="Button"
74+
android:text="@string/button"
7575
tools:layout_constraintTop_creator="1"
7676
android:layout_marginStart="10dp"
7777
android:layout_marginTop="8dp"

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
android:id="@+id/button4"
1111
android:layout_width="wrap_content"
1212
android:layout_height="wrap_content"
13-
android:text="1"
13+
android:text="@string/one"
1414
app:layout_constraintTop_toBottomOf="@+id/button5"
1515
app:layout_constraintLeft_toLeftOf="parent"
1616
app:layout_constraintRight_toLeftOf="@+id/button11"
@@ -20,7 +20,7 @@
2020
android:id="@+id/button5"
2121
android:layout_width="wrap_content"
2222
android:layout_height="wrap_content"
23-
android:text="4"
23+
android:text="@string/four"
2424
app:layout_constraintTop_toBottomOf="@+id/button7"
2525
app:layout_constraintLeft_toLeftOf="parent"
2626
app:layout_constraintRight_toLeftOf="@+id/button13"
@@ -30,7 +30,7 @@
3030
android:id="@+id/button6"
3131
android:layout_width="wrap_content"
3232
android:layout_height="wrap_content"
33-
android:text="6"
33+
android:text="@string/six"
3434
app:layout_constraintRight_toRightOf="parent"
3535
app:layout_constraintTop_toBottomOf="@+id/button9"
3636
app:layout_constraintLeft_toRightOf="@+id/button13"
@@ -40,7 +40,7 @@
4040
android:id="@+id/textView3"
4141
android:layout_width="wrap_content"
4242
android:layout_height="wrap_content"
43-
android:text="Advanced Arange"
43+
android:text="@string/advanced_arrange"
4444
android:textSize="30sp"
4545
tools:layout_constraintTop_creator="1"
4646
tools:layout_constraintRight_creator="1"
@@ -54,7 +54,7 @@
5454
android:id="@+id/button7"
5555
android:layout_width="wrap_content"
5656
android:layout_height="wrap_content"
57-
android:text="7"
57+
android:text="@string/seven"
5858
app:layout_constraintLeft_toLeftOf="parent"
5959
app:layout_constraintRight_toLeftOf="@+id/button8"
6060
app:layout_constraintBottom_toTopOf="@+id/button5"
@@ -64,7 +64,7 @@
6464
android:id="@+id/button8"
6565
android:layout_width="wrap_content"
6666
android:layout_height="wrap_content"
67-
android:text="8"
67+
android:text="@string/eight"
6868
app:layout_constraintLeft_toRightOf="@+id/button7"
6969
app:layout_constraintRight_toLeftOf="@+id/button9"
7070
app:layout_constraintBottom_toTopOf="@+id/button13"
@@ -74,7 +74,7 @@
7474
android:id="@+id/button9"
7575
android:layout_width="wrap_content"
7676
android:layout_height="wrap_content"
77-
android:text="9"
77+
android:text="@string/nine"
7878
app:layout_constraintLeft_toRightOf="@+id/button8"
7979
app:layout_constraintRight_toRightOf="parent"
8080
app:layout_constraintBottom_toTopOf="@+id/button6"
@@ -84,7 +84,7 @@
8484
android:id="@+id/button10"
8585
android:layout_width="wrap_content"
8686
android:layout_height="wrap_content"
87-
android:text="0"
87+
android:text="@string/zero"
8888
app:layout_constraintRight_toRightOf="parent"
8989
app:layout_constraintTop_toBottomOf="@+id/button11"
9090
app:layout_constraintLeft_toRightOf="@+id/button14"
@@ -94,7 +94,7 @@
9494
android:id="@+id/button11"
9595
android:layout_width="wrap_content"
9696
android:layout_height="wrap_content"
97-
android:text="2"
97+
android:text="@string/two"
9898
app:layout_constraintTop_toBottomOf="@+id/button13"
9999
app:layout_constraintRight_toLeftOf="@+id/button12"
100100
app:layout_constraintLeft_toRightOf="@+id/button4"
@@ -104,7 +104,7 @@
104104
android:id="@+id/button12"
105105
android:layout_width="wrap_content"
106106
android:layout_height="wrap_content"
107-
android:text="3"
107+
android:text="@string/three"
108108
app:layout_constraintRight_toRightOf="parent"
109109
app:layout_constraintTop_toBottomOf="@+id/button6"
110110
app:layout_constraintLeft_toRightOf="@+id/button11"
@@ -114,7 +114,7 @@
114114
android:id="@+id/button13"
115115
android:layout_width="wrap_content"
116116
android:layout_height="wrap_content"
117-
android:text="5"
117+
android:text="@string/five"
118118
app:layout_constraintTop_toBottomOf="@+id/button8"
119119
app:layout_constraintRight_toLeftOf="@+id/button6"
120120
app:layout_constraintLeft_toRightOf="@+id/button5"
@@ -125,7 +125,7 @@
125125
android:layout_width="0dp"
126126
android:layout_height="49dp"
127127
android:background="#AA9"
128-
android:text="0.0"
128+
android:text="@string/zero_point_zero"
129129
android:textSize="30sp"
130130
tools:layout_constraintTop_creator="1"
131131
tools:layout_constraintRight_creator="1"
@@ -144,7 +144,7 @@
144144
android:id="@+id/button14"
145145
android:layout_width="wrap_content"
146146
android:layout_height="wrap_content"
147-
android:text="."
147+
android:text="@string/dot"
148148
app:layout_constraintTop_toBottomOf="@+id/button4"
149149
app:layout_constraintLeft_toLeftOf="parent"
150150
app:layout_constraintRight_toLeftOf="@+id/button10"

0 commit comments

Comments
 (0)