Skip to content
This repository was archived by the owner on Jul 25, 2024. It is now read-only.

Commit 4948409

Browse files
jainkuniyatimabbott
jainkuniya
authored and
timabbott
committed
Grouped styles into style.xml
1 parent dd4ad5d commit 4948409

File tree

4 files changed

+49
-60
lines changed

4 files changed

+49
-60
lines changed

‎app/src/main/res/layout-v21/login.xml

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
android:layout_height="wrap_content"
7979
android:gravity="center"
8080
android:orientation="vertical"
81-
android:padding="16dp"
81+
android:padding="8dp"
8282
android:visibility="gone">
8383

8484
<TextView
@@ -141,44 +141,24 @@
141141

142142
<TextView
143143
android:id="@+id/register"
144-
android:layout_width="wrap_content"
145-
android:layout_height="wrap_content"
146-
android:padding="8dp"
144+
style="@style/links"
147145
android:text="@string/register_button"
148-
android:layout_gravity="center_horizontal"
149-
android:layout_marginTop="16dp"
150-
android:onClick="onClick"
151-
android:textColor="#ff0099cc"
152146
/>
153147

154148
<TextView
155149
android:id="@+id/local_server_button"
156-
android:layout_width="wrap_content"
157-
android:layout_height="wrap_content"
158-
android:onClick="onClick"
159-
android:paddingTop="16dp"
160-
android:text="@string/local_server"
161-
android:textColor="#ff0099cc"
162-
android:visibility="gone" />
150+
style="@style/links.gone"
151+
android:text="@string/local_server" />
163152

164153
<TextView
165154
android:id="@+id/input_another_server"
166-
android:layout_width="wrap_content"
167-
android:layout_height="wrap_content"
168-
android:onClick="onClick"
169-
android:paddingTop="16dp"
170-
android:text="@string/another_server"
171-
android:textColor="#ff0099cc" />
155+
style="@style/links"
156+
android:text="@string/another_server" />
172157
</LinearLayout>
173158

174-
<TextView
175-
android:id="@+id/legal_button"
176-
android:layout_width="wrap_content"
177-
android:layout_height="wrap_content"
178-
android:layout_marginBottom="29dp"
179-
android:onClick="onClick"
180-
android:paddingTop="8dp"
181-
android:text="@string/legal"
182-
android:textColor="#ff0099cc" />
159+
<TextView
160+
android:id="@+id/legal_button"
161+
style="@style/links"
162+
android:text="@string/legal" />
183163
</LinearLayout>
184164
</ScrollView>

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

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
android:layout_height="wrap_content"
6969
android:gravity="center"
7070
android:orientation="vertical"
71-
android:padding="16dp"
72-
android:visibility="gone">
71+
android:visibility="gone"
72+
android:padding="8dp">
7373

7474
<TextView
7575
android:layout_width="wrap_content"
@@ -91,7 +91,6 @@
9191
android:layout_width="match_parent"
9292
android:layout_height="wrap_content"
9393
android:orientation="vertical"
94-
android:paddingBottom="8dp"
9594
android:paddingTop="8dp"
9695
android:visibility="gone">
9796

@@ -132,45 +131,25 @@
132131

133132
<TextView
134133
android:id="@+id/register"
135-
android:layout_width="wrap_content"
136-
android:layout_height="wrap_content"
137-
android:padding="8dp"
134+
style="@style/links"
138135
android:text="@string/register_button"
139-
android:layout_gravity="center_horizontal"
140-
android:layout_marginTop="16dp"
141-
android:onClick="onClick"
142-
android:textColor="#ff0099cc"
143136
/>
144137

145138
<TextView
146139
android:id="@+id/local_server_button"
147-
android:layout_width="wrap_content"
148-
android:layout_height="wrap_content"
149-
android:onClick="onClick"
150-
android:paddingTop="16dp"
151-
android:text="@string/local_server"
152-
android:textColor="#ff0099cc"
153-
android:visibility="gone" />
140+
style="@style/links.gone"
141+
android:text="@string/local_server" />
154142

155143
<TextView
156144
android:id="@+id/input_another_server"
157-
android:layout_width="wrap_content"
158-
android:layout_height="wrap_content"
159-
android:onClick="onClick"
160-
android:paddingTop="16dp"
161-
android:text="@string/another_server"
162-
android:textColor="#ff0099cc" />
145+
style="@style/links"
146+
android:text="@string/another_server" />
163147
</LinearLayout>
164148

165149
<TextView
166150
android:id="@+id/legal_button"
167-
android:layout_width="wrap_content"
168-
android:layout_height="wrap_content"
169-
android:layout_marginBottom="29dp"
170-
android:onClick="onClick"
171-
android:paddingTop="8dp"
172-
android:text="@string/legal"
173-
android:textColor="#ff0099cc" />
151+
style="@style/links"
152+
android:text="@string/legal" />
174153
</LinearLayout>
175154
</ScrollView>
176155

‎app/src/main/res/values-v21/style.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<resources>
3+
<style name="links">
4+
<item name="android:layout_width">wrap_content</item>
5+
<item name="android:layout_height">wrap_content</item>
6+
<item name="android:onClick">onClick</item>
7+
<item name="android:padding">8dp</item>
8+
<item name="android:layout_gravity">center_horizontal</item>
9+
<item name="android:layout_marginTop">8dp</item>
10+
<item name="android:textColor">#ff0099cc</item>
11+
</style>
12+
<style name="links.gone" parent="links">
13+
<item name="android:visibility">gone</item>
14+
</style>
15+
</resources>

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<resources>
3+
<style name="links">
4+
<item name="android:layout_width">wrap_content</item>
5+
<item name="android:layout_height">wrap_content</item>
6+
<item name="android:onClick">onClick</item>
7+
<item name="android:padding">8dp</item>
8+
<item name="android:layout_gravity">center_horizontal</item>
9+
<item name="android:layout_marginTop">8dp</item>
10+
<item name="android:textColor">#ff0099cc</item>
11+
</style>
12+
<style name="links.gone" parent="links">
13+
<item name="android:visibility">gone</item>
14+
</style>
15+
</resources>

0 commit comments

Comments
 (0)