Skip to content

Commit 7e5d271

Browse files
pimterrypimterry
committed
SP should be used for text sizes only, not layout
1 parent 9693b6a commit 7e5d271

File tree

9 files changed

+56
-56
lines changed

9 files changed

+56
-56
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
<vector xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:width="24sp"
4-
android:height="24sp"
3+
android:width="24dp"
4+
android:height="24dp"
55
android:viewportWidth="24"
66
android:viewportHeight="24">
77
<path

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2-
android:width="24sp"
3-
android:height="24sp"
2+
android:width="24dp"
3+
android:height="24dp"
44
android:viewportWidth="576"
55
android:viewportHeight="512">
66
<path

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
66
android:orientation="vertical"
7-
android:paddingStart="16sp"
8-
android:paddingEnd="16sp"
9-
android:paddingBottom="4sp"
7+
android:paddingStart="16dp"
8+
android:paddingEnd="16dp"
9+
android:paddingBottom="4dp"
1010
android:clipToPadding="false">
1111

1212
<TextView
1313
android:id="@+id/connectedTo"
1414
style="@style/ConnectedToText"
1515
android:text=""
16-
android:layout_marginBottom="24sp" />
16+
android:layout_marginBottom="24dp" />
1717

1818
<com.google.android.material.card.MaterialCardView
1919
style="@style/ConnectionStatusCard"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
android:layout_width="match_parent"
44
android:layout_height="match_parent"
55
android:orientation="vertical"
6-
android:paddingStart="16sp"
7-
android:paddingEnd="16sp"
8-
android:paddingBottom="4sp"
6+
android:paddingStart="16dp"
7+
android:paddingEnd="16dp"
8+
android:paddingBottom="4dp"
99
android:clipToPadding="false">
1010

1111
<TextView
1212
android:id="@+id/connectedTo"
1313
style="@style/ConnectedToText"
1414
android:text=""
15-
android:layout_marginBottom="24sp" />
15+
android:layout_marginBottom="24dp" />
1616

1717
<com.google.android.material.card.MaterialCardView
1818
style="@style/ConnectionStatusCard"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
66
android:orientation="vertical"
7-
android:paddingStart="16sp"
8-
android:paddingEnd="16sp"
9-
android:paddingBottom="4sp"
7+
android:paddingStart="16dp"
8+
android:paddingEnd="16dp"
9+
android:paddingBottom="4dp"
1010
android:clipToPadding="false">
1111

1212
<TextView
1313
android:id="@+id/connectedTo"
1414
style="@style/ConnectedToText"
1515
android:text=""
16-
android:layout_marginBottom="24sp" />
16+
android:layout_marginBottom="24dp" />
1717

1818
<com.google.android.material.card.MaterialCardView
1919
style="@style/ConnectionStatusCard"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
66
android:orientation="vertical"
7-
android:paddingStart="16sp"
8-
android:paddingEnd="16sp"
9-
android:paddingBottom="4sp"
7+
android:paddingStart="16dp"
8+
android:paddingEnd="16dp"
9+
android:paddingBottom="4dp"
1010
android:clipToPadding="false">
1111

1212
<TextView
1313
android:id="@+id/connectedTo"
1414
style="@style/ConnectedToText"
1515
android:text=""
16-
android:layout_marginBottom="24sp" />
16+
android:layout_marginBottom="24dp" />
1717

1818
<com.google.android.material.card.MaterialCardView
1919
style="@style/ConnectionStatusCard"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
android:layout_width="match_parent"
44
android:layout_height="match_parent"
55
android:orientation="vertical"
6-
android:paddingStart="16sp"
7-
android:paddingEnd="16sp"
8-
android:paddingBottom="4sp"
6+
android:paddingStart="16dp"
7+
android:paddingEnd="16dp"
8+
android:paddingBottom="4dp"
99
android:clipToPadding="false">
1010

1111
<TextView
1212
android:id="@+id/connectedTo"
1313
style="@style/ConnectedToText"
1414
android:text=""
15-
android:layout_marginBottom="24sp" />
15+
android:layout_marginBottom="24dp" />
1616

1717
<com.google.android.material.card.MaterialCardView
1818
style="@style/ConnectionStatusCard"

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
style="@style/StatusText"
3737
android:layout_width="wrap_content"
3838
android:layout_height="wrap_content"
39-
android:layout_marginStart="8sp"
40-
android:layout_marginEnd="8sp"
39+
android:layout_marginStart="8dp"
40+
android:layout_marginEnd="8dp"
4141
android:text="Not Connected"
4242
app:layout_constraintBottom_toBottomOf="@+id/statusGuideline"
4343
app:layout_constraintTop_toTopOf="@+id/statusGuideline"
@@ -48,8 +48,8 @@
4848
android:id="@+id/statusDetailContainer"
4949
android:layout_width="wrap_content"
5050
android:layout_height="wrap_content"
51-
android:layout_marginStart="16sp"
52-
android:layout_marginEnd="16sp"
51+
android:layout_marginStart="16dp"
52+
android:layout_marginEnd="16dp"
5353
app:layout_constrainedWidth="true"
5454
app:layout_constraintEnd_toEndOf="parent"
5555
app:layout_constraintStart_toStartOf="parent"
@@ -59,8 +59,8 @@
5959
<com.google.android.material.card.MaterialCardView
6060
android:layout_height="wrap_content"
6161
android:layout_width="match_parent"
62-
android:layout_marginStart="16sp"
63-
android:layout_marginEnd="16sp"
62+
android:layout_marginStart="16dp"
63+
android:layout_marginEnd="16dp"
6464
app:layout_constraintBottom_toBottomOf="parent"
6565
app:layout_constraintEnd_toEndOf="parent"
6666
app:layout_constraintStart_toStartOf="parent"
@@ -71,10 +71,10 @@
7171
android:layout_width="match_parent"
7272
android:layout_height="wrap_content"
7373
android:orientation="vertical"
74-
android:paddingStart="16sp"
75-
android:paddingEnd="16sp"
76-
android:paddingTop="12sp"
77-
android:paddingBottom="10sp"
74+
android:paddingStart="16dp"
75+
android:paddingEnd="16dp"
76+
android:paddingTop="12dp"
77+
android:paddingBottom="10dp"
7878
android:clipToPadding="false">
7979
</LinearLayout>
8080
</com.google.android.material.card.MaterialCardView>

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,42 +21,42 @@
2121
<style name="DetailText" parent="@android:style/Widget.TextView">
2222
<item name="android:layout_width">match_parent</item>
2323
<item name="android:layout_height">wrap_content</item>
24-
<item name="android:paddingTop">16sp</item>
25-
<item name="android:paddingStart">16sp</item>
26-
<item name="android:paddingEnd">16sp</item>
24+
<item name="android:paddingTop">16dp</item>
25+
<item name="android:paddingStart">16dp</item>
26+
<item name="android:paddingEnd">16dp</item>
2727
<item name="android:textSize">20sp</item>
2828
<item name="android:gravity">center</item>
2929
</style>
3030

3131
<style name="BaseButtonsCard" parent="@style/Widget.MaterialComponents.CardView">
3232
<item name="android:textSize">20sp</item>
3333
<item name="cardBackgroundColor">@color/mainBackground</item>
34-
<item name="cardElevation">4sp</item>
34+
<item name="cardElevation">4dp</item>
3535
</style>
3636

3737
<style name="PortraitButtonsCard" parent="@style/BaseButtonsCard">
3838
<item name="shapeAppearance">@style/PortraitButtonsCardCorners</item>
3939
</style>
4040

4141
<style name="LandscapeButtonsCard" parent="@style/BaseButtonsCard">
42-
<item name="cardCornerRadius">5sp</item>
42+
<item name="cardCornerRadius">5dp</item>
4343
</style>
4444

4545
<style name="PortraitButtonsCardCorners">
4646
<item name="cornerFamily">rounded</item>
47-
<item name="cornerSizeTopRight">5sp</item>
48-
<item name="cornerSizeTopLeft">5sp</item>
49-
<item name="cornerSizeBottomLeft">0sp</item>
50-
<item name="cornerSizeBottomRight">0sp</item>"
47+
<item name="cornerSizeTopRight">5dp</item>
48+
<item name="cornerSizeTopLeft">5dp</item>
49+
<item name="cornerSizeBottomLeft">0dp</item>
50+
<item name="cornerSizeBottomRight">0dp</item>"
5151
</style>
5252

5353
<style name="PrimaryButton" parent="@style/Widget.MaterialComponents.Button">
54-
<item name="android:radius">10sp</item>
54+
<item name="android:radius">10dp</item>
5555
<item name="android:textColor">@color/primaryInputColor</item>
5656
<item name="android:fontFamily">@font/lato_bold</item>
5757

58-
<item name="android:paddingTop">10sp</item>
59-
<item name="android:paddingBottom">10sp</item>
58+
<item name="android:paddingTop">10dp</item>
59+
<item name="android:paddingBottom">10dp</item>
6060
<item name="android:textSize">20sp</item>
6161
<item name="android:textAllCaps">false</item>
6262
<item name="android:letterSpacing">0</item>
@@ -65,24 +65,24 @@
6565
<style name="SecondaryButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
6666
<item name="android:textColor">@color/textColor</item>
6767

68-
<item name="android:paddingTop">10sp</item>
69-
<item name="android:paddingBottom">10sp</item>
68+
<item name="android:paddingTop">10dp</item>
69+
<item name="android:paddingBottom">10dp</item>
7070
<item name="android:textSize">20sp</item>
7171
<item name="android:textAllCaps">false</item>
7272
<item name="android:letterSpacing">0</item>
7373
</style>
7474

7575
<style name="ConnectionStatusCard" parent="@style/Widget.MaterialComponents.CardView">
76-
<item name="cardElevation">0sp</item>
77-
<item name="contentPadding">10sp</item>
78-
<item name="android:layout_marginBottom">10sp</item>
76+
<item name="cardElevation">0dp</item>
77+
<item name="contentPadding">10dp</item>
78+
<item name="android:layout_marginBottom">10dp</item>
7979
</style>
8080

8181
<style name="ConnectedToText" parent="@android:style/Widget.TextView">
8282
<item name="android:layout_width">match_parent</item>
8383
<item name="android:layout_height">wrap_content</item>
84-
<item name="android:paddingStart">16sp</item>
85-
<item name="android:paddingEnd">16sp</item>
84+
<item name="android:paddingStart">16dp</item>
85+
<item name="android:paddingEnd">16dp</item>
8686
<item name="android:textSize">16sp</item>
8787
<item name="android:gravity">center</item>
8888
</style>
@@ -91,7 +91,7 @@
9191
<item name="android:layout_width">match_parent</item>
9292
<item name="android:layout_height">wrap_content</item>
9393
<item name="android:gravity">center</item>
94-
<item name="android:drawablePadding">10sp</item>
94+
<item name="android:drawablePadding">10dp</item>
9595
<item name="android:textSize">14sp</item>
9696
<item name="android:fontFamily">@font/lato_bold</item>
9797
<item name="android:textAlignment">textStart</item>
@@ -101,8 +101,8 @@
101101

102102
<style name="ConnectionStatusText" parent="@android:style/Widget.TextView">
103103
<item name="android:textSize">16sp</item>
104-
<item name="android:layout_marginStart">34sp</item>
105-
<item name="android:layout_marginTop">5sp</item>
104+
<item name="android:layout_marginStart">34dp</item>
105+
<item name="android:layout_marginTop">5dp</item>
106106
</style>
107107

108108
</resources>

0 commit comments

Comments
 (0)