Skip to content

Commit 8e75b73

Browse files
akexorcistakexorcist
committed
Layout refactoring
1 parent 8a174a0 commit 8e75b73

12 files changed

Lines changed: 70 additions & 49 deletions

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
android:gravity="center_horizontal"
88
android:orientation="vertical"
99
android:paddingBottom="@dimen/large_margin"
10-
android:paddingLeft="@dimen/large_margin"
11-
android:paddingRight="@dimen/large_margin"
10+
android:paddingEnd="@dimen/large_margin"
11+
android:paddingStart="@dimen/large_margin"
1212
android:paddingTop="@dimen/large_margin"
1313
tools:context="com.akexorcist.localizationapp.MainActivity">
1414

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
android:layout_height="match_parent"
55
android:orientation="vertical"
66
android:paddingBottom="@dimen/large_margin"
7-
android:paddingLeft="@dimen/large_margin"
8-
android:paddingRight="@dimen/large_margin"
7+
android:paddingEnd="@dimen/large_margin"
8+
android:paddingStart="@dimen/large_margin"
99
android:paddingTop="@dimen/large_margin"
1010
tools:context="com.akexorcist.localizationapp.simplefragment.SimpleFragmentActivity">
1111

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
android:layout_height="match_parent"
55
android:orientation="vertical"
66
android:paddingBottom="@dimen/large_margin"
7-
android:paddingLeft="@dimen/large_margin"
8-
android:paddingRight="@dimen/large_margin"
7+
android:paddingEnd="@dimen/large_margin"
8+
android:paddingStart="@dimen/large_margin"
99
android:paddingTop="@dimen/large_margin"
1010
tools:context="com.akexorcist.localizationapp.simpleactivity.SimpleActivity">
1111

1212
<ScrollView
1313
android:layout_width="match_parent"
1414
android:layout_height="0dp"
15-
android:layout_weight="1"
16-
android:layout_marginBottom="@dimen/large_margin">
15+
android:layout_marginBottom="@dimen/large_margin"
16+
android:layout_weight="1">
1717

1818
<LinearLayout
1919
android:layout_width="match_parent"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
android:layout_height="match_parent"
55
android:orientation="vertical"
66
android:paddingBottom="@dimen/large_margin"
7-
android:paddingLeft="@dimen/large_margin"
8-
android:paddingRight="@dimen/large_margin"
7+
android:paddingStart="@dimen/large_margin"
8+
android:paddingEnd="@dimen/large_margin"
99
android:paddingTop="@dimen/large_margin"
1010
tools:context="com.akexorcist.localizationapp.simpleactivity.SimpleActivity">
1111

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
android:layout_height="match_parent"
55
android:orientation="vertical"
66
android:paddingBottom="@dimen/large_margin"
7-
android:paddingLeft="@dimen/large_margin"
8-
android:paddingRight="@dimen/large_margin"
7+
android:paddingStart="@dimen/large_margin"
8+
android:paddingEnd="@dimen/large_margin"
99
android:paddingTop="@dimen/large_margin"
1010
tools:context="com.akexorcist.localizationapp.simplefragment.SimpleFragmentActivity">
1111

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
android:layout_height="match_parent"
55
android:orientation="vertical"
66
android:paddingBottom="@dimen/large_margin"
7-
android:paddingLeft="@dimen/large_margin"
8-
android:paddingRight="@dimen/large_margin"
7+
android:paddingStart="@dimen/large_margin"
8+
android:paddingEnd="@dimen/large_margin"
99
android:paddingTop="@dimen/large_margin"
1010
tools:context="com.akexorcist.localizationapp.simpleactivity.SimpleActivity">
1111

@@ -36,6 +36,6 @@
3636
android:layout_width="wrap_content"
3737
android:layout_height="wrap_content"
3838
android:layout_gravity="center_horizontal"
39-
android:text="Change Language" />
39+
android:text="@string/change_language" />
4040

4141
</LinearLayout>

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

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
android:gravity="center"
66
android:orientation="vertical"
77
android:paddingBottom="@dimen/large_margin"
8-
android:paddingLeft="@dimen/large_margin"
9-
android:paddingRight="@dimen/large_margin"
8+
android:paddingEnd="@dimen/large_margin"
9+
android:paddingStart="@dimen/large_margin"
1010
android:paddingTop="@dimen/large_margin"
1111
tools:context="com.akexorcist.localizationapp.simpleactivity.SimpleActivity">
1212

@@ -20,26 +20,29 @@
2020
android:id="@+id/btn_america"
2121
android:layout_width="@dimen/btn_language_size"
2222
android:layout_height="@dimen/btn_language_size"
23-
android:layout_marginRight="@dimen/padding"
23+
android:layout_marginEnd="@dimen/padding"
2424
android:background="@color/transparent"
25+
android:contentDescription="@string/america"
2526
android:scaleType="fitCenter"
2627
android:src="@mipmap/country_america" />
2728

2829
<ImageButton
2930
android:id="@+id/btn_china"
3031
android:layout_width="@dimen/btn_language_size"
3132
android:layout_height="@dimen/btn_language_size"
32-
android:layout_marginRight="@dimen/padding"
33+
android:layout_marginEnd="@dimen/padding"
3334
android:background="@color/transparent"
35+
android:contentDescription="@string/china"
3436
android:scaleType="fitCenter"
3537
android:src="@mipmap/country_china" />
3638

3739
<ImageButton
3840
android:id="@+id/btn_italy"
3941
android:layout_width="@dimen/btn_language_size"
4042
android:layout_height="@dimen/btn_language_size"
41-
android:layout_marginRight="@dimen/padding"
43+
android:layout_marginEnd="@dimen/padding"
4244
android:background="@color/transparent"
45+
android:contentDescription="@string/italy"
4346
android:scaleType="fitCenter"
4447
android:src="@mipmap/country_italy" />
4548

@@ -55,35 +58,39 @@
5558
android:id="@+id/btn_japan"
5659
android:layout_width="@dimen/btn_language_size"
5760
android:layout_height="@dimen/btn_language_size"
58-
android:layout_marginRight="@dimen/padding"
61+
android:layout_marginEnd="@dimen/padding"
5962
android:background="@color/transparent"
63+
android:contentDescription="@string/japan"
6064
android:scaleType="fitCenter"
6165
android:src="@mipmap/country_japan" />
6266

6367
<ImageButton
6468
android:id="@+id/btn_korea"
6569
android:layout_width="@dimen/btn_language_size"
6670
android:layout_height="@dimen/btn_language_size"
67-
android:layout_marginRight="@dimen/padding"
71+
android:layout_marginEnd="@dimen/padding"
6872
android:background="@color/transparent"
73+
android:contentDescription="@string/korea"
6974
android:scaleType="fitCenter"
7075
android:src="@mipmap/country_korea" />
7176

7277
<ImageButton
7378
android:id="@+id/btn_portugal"
7479
android:layout_width="@dimen/btn_language_size"
7580
android:layout_height="@dimen/btn_language_size"
76-
android:layout_marginRight="@dimen/padding"
81+
android:layout_marginEnd="@dimen/padding"
7782
android:background="@color/transparent"
83+
android:contentDescription="@string/portugal"
7884
android:scaleType="fitCenter"
7985
android:src="@mipmap/country_portugal" />
8086

8187
<ImageButton
8288
android:id="@+id/btn_thai"
8389
android:layout_width="@dimen/btn_language_size"
8490
android:layout_height="@dimen/btn_language_size"
85-
android:layout_marginRight="@dimen/padding"
91+
android:layout_marginEnd="@dimen/padding"
8692
android:background="@color/transparent"
93+
android:contentDescription="@string/thai"
8794
android:scaleType="fitCenter"
8895
android:src="@mipmap/country_thai" />
8996
</LinearLayout>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
android:layout_height="match_parent"
55
android:orientation="vertical"
66
android:paddingBottom="@dimen/large_margin"
7-
android:paddingLeft="@dimen/large_margin"
8-
android:paddingRight="@dimen/large_margin"
7+
android:paddingEnd="@dimen/large_margin"
8+
android:paddingStart="@dimen/large_margin"
99
android:paddingTop="@dimen/large_margin"
1010
tools:context="com.akexorcist.localizationapp.simplefragment.SimpleFragmentActivity">
1111

@@ -33,7 +33,7 @@
3333
android:id="@+id/btn_prev"
3434
android:layout_width="@dimen/vp_btn_width"
3535
android:layout_height="match_parent"
36-
android:layout_alignParentLeft="true"
36+
android:layout_alignParentStart="true"
3737
android:layout_centerVertical="true"
3838
android:background="@null"
3939
android:gravity="center"
@@ -46,7 +46,7 @@
4646
android:id="@+id/btn_next"
4747
android:layout_width="@dimen/vp_btn_width"
4848
android:layout_height="match_parent"
49-
android:layout_alignParentRight="true"
49+
android:layout_alignParentEnd="true"
5050
android:layout_centerVertical="true"
5151
android:background="@null"
5252
android:gravity="center"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
android:layout_width="match_parent"
3030
android:layout_height="wrap_content"
3131
android:layout_marginBottom="@dimen/margin"
32-
android:layout_marginLeft="@dimen/margin"
33-
android:layout_marginRight="@dimen/margin"
32+
android:layout_marginStart="@dimen/margin"
33+
android:layout_marginEnd="@dimen/margin"
3434
android:text="@string/sample_apple_story"
3535
android:textColor="@color/app_text"
3636
android:textSize="@dimen/text_size" />

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

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@
77
<TextView
88
android:layout_width="wrap_content"
99
android:layout_height="wrap_content"
10-
android:layout_alignParentLeft="true"
11-
android:layout_alignParentTop="true"
12-
android:layout_marginBottom="@dimen/large_margin"
13-
android:layout_marginLeft="@dimen/large_margin"
14-
android:layout_marginTop="@dimen/large_margin"
10+
android:layout_marginBottom="@dimen/margin"
11+
android:layout_marginStart="@dimen/margin"
12+
android:layout_marginTop="@dimen/margin"
1513
android:text="@string/fragment"
1614
android:textColor="@color/app_light_text"
1715
android:textSize="@dimen/text_size" />
@@ -30,19 +28,18 @@
3028
<TextView
3129
android:layout_width="match_parent"
3230
android:layout_height="wrap_content"
33-
android:layout_centerHorizontal="true"
34-
android:layout_centerVertical="true"
35-
android:layout_marginBottom="@dimen/large_margin"
36-
android:layout_marginLeft="@dimen/large_margin"
37-
android:layout_marginRight="@dimen/large_margin"
31+
android:layout_marginBottom="@dimen/margin"
32+
android:layout_marginEnd="@dimen/margin"
33+
android:layout_marginStart="@dimen/margin"
3834
android:text="@string/sample_apple_story"
3935
android:textColor="@color/app_text"
4036
android:textSize="@dimen/text_size" />
4137

4238
<ImageView
4339
android:layout_width="@dimen/iv_apple_size"
4440
android:layout_height="@dimen/iv_apple_size"
45-
android:layout_marginBottom="@dimen/large_margin"
41+
android:layout_marginBottom="@dimen/margin"
42+
android:contentDescription="@null"
4643
android:scaleType="fitCenter"
4744
android:src="@mipmap/apple" />
4845

0 commit comments

Comments
 (0)