Skip to content

Commit bd9fd68

Browse files
gabriel-TheCodegabriel-TheCode
committed
Update layouts
1 parent 33b9979 commit bd9fd68

File tree

13 files changed

+297
-284
lines changed

13 files changed

+297
-284
lines changed

‎.idea/deploymentTargetSelector.xml

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/androidTest/java/com/thecode/onboardingviewagerexamples/ExampleInstrumentedTest.kt

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
package com.thecode.onboardingviewagerexamples
22

3-
import androidx.test.platform.app.InstrumentationRegistry
43
import androidx.test.ext.junit.runners.AndroidJUnit4
5-
6-
import org.junit.jupiter.api.Test
4+
import androidx.test.platform.app.InstrumentationRegistry
5+
import org.junit.Assert.assertEquals
76
import org.junit.runner.RunWith
87

9-
import org.junit.Assert.*
10-
118
/**
129
* Instrumented test, which will execute on an Android device.
1310
*
1411
* See [testing documentation](http://d.android.com/tools/testing).
1512
*/
1613
@RunWith(AndroidJUnit4::class)
1714
class ExampleInstrumentedTest {
18-
@org.junit.jupiter.api.Test
1915
fun useAppContext() {
2016
// Context of the app under test.
2117
val appContext = InstrumentationRegistry.getInstrumentation().targetContext

‎app/src/main/java/com/thecode/onboardingviewagerexamples/activities/MainActivity.kt

-2
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@ class MainActivity : AppCompatActivity() {
1919

2020
fun onClick(view: View) {
2121
when (view.id) {
22-
2322
R.id.btn_example1 -> {
2423
val intent =
2524
Intent(applicationContext, OnboardingExample1Activity::class.java)
2625
startActivity(intent)
2726
}
28-
2927
R.id.btn_example2 -> {
3028
val intent =
3129
Intent(applicationContext, OnboardingExample2Activity::class.java)

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

+16-18
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
4-
android:id="@+id/rl_create_account"
54
android:layout_width="match_parent"
65
android:layout_height="match_parent"
76
android:background="@color/md_white_1000">
@@ -10,54 +9,53 @@
109
android:id="@+id/text_skip"
1110
android:layout_width="wrap_content"
1211
android:layout_height="wrap_content"
13-
android:text="@string/skip"
14-
app:textAllCaps="true"
15-
android:textSize="18sp"
1612
android:layout_alignParentEnd="true"
17-
android:layout_marginTop="30dp"
1813
android:layout_marginStart="30dp"
19-
android:layout_marginEnd="30dp"/>
14+
android:layout_marginTop="30dp"
15+
android:layout_marginEnd="30dp"
16+
android:text="@string/skip"
17+
android:textSize="18sp"
18+
app:textAllCaps="true" />
2019

2120
<androidx.viewpager2.widget.ViewPager2
2221
android:id="@+id/viewPager"
2322
android:layout_width="match_parent"
2423
android:layout_height="match_parent"
25-
android:clipToPadding="false"
26-
android:overScrollMode="never"
24+
android:layout_above="@id/bottom_navigation"
2725
android:layout_below="@id/text_skip"
28-
android:layout_above="@id/bottom_navigation" />
26+
android:clipToPadding="false"
27+
android:overScrollMode="never" />
2928

3029
<RelativeLayout
3130
android:id="@+id/bottom_navigation"
3231
android:layout_width="match_parent"
3332
android:layout_height="56dp"
34-
android:orientation="horizontal"
33+
android:layout_alignParentBottom="true"
3534
android:background="@color/md_white_1000"
36-
android:layout_alignParentBottom="true">
35+
android:orientation="horizontal">
3736

3837
<com.google.android.material.tabs.TabLayout
3938
android:id="@+id/pageIndicator"
4039
android:layout_width="wrap_content"
4140
android:layout_height="wrap_content"
42-
app:tabGravity="center"
43-
app:tabIndicatorHeight="0dp"
4441
android:layout_alignParentStart="true"
4542
android:layout_centerVertical="true"
4643
android:layout_margin="30dp"
47-
app:tabBackground="@drawable/onboarding_viewpager_selector_blue"/>
48-
44+
app:tabBackground="@drawable/onboarding_viewpager_selector_blue"
45+
app:tabGravity="center"
46+
app:tabIndicatorHeight="0dp" />
4947

5048
<Button
5149
android:id="@+id/btn_next_step"
5250
android:layout_width="wrap_content"
5351
android:layout_height="50dp"
52+
android:layout_alignParentEnd="true"
53+
android:layout_margin="10dp"
5454
android:background="?android:attr/selectableItemBackground"
5555
android:drawableTint="@color/md_grey_900"
5656
android:text="@string/next"
57-
android:textSize="16sp"
58-
android:layout_margin="10dp"
5957
android:textColor="@color/colorPrimary"
60-
android:layout_alignParentEnd="true"/>
58+
android:textSize="16sp" />
6159

6260
</RelativeLayout>
6361

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

+55-66
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,66 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
3-
<RelativeLayout
4-
xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
54
android:layout_width="match_parent"
65
android:layout_height="match_parent"
7-
xmlns:app="http://schemas.android.com/apk/res-auto"
86
android:background="@color/colorPrimary">
97

10-
11-
<LinearLayout
8+
<androidx.viewpager2.widget.ViewPager2
9+
android:id="@+id/viewPager"
10+
android:layout_width="match_parent"
11+
android:layout_height="0dp"
12+
android:clipToPadding="false"
13+
android:overScrollMode="never"
14+
app:layout_constraintBottom_toTopOf="@id/pageIndicator"
15+
app:layout_constraintEnd_toEndOf="parent"
16+
app:layout_constraintStart_toStartOf="parent"
17+
app:layout_constraintTop_toTopOf="parent" />
18+
19+
<com.google.android.material.tabs.TabLayout
20+
android:id="@+id/pageIndicator"
21+
android:layout_width="wrap_content"
22+
android:layout_height="wrap_content"
23+
android:layout_margin="10dp"
24+
app:layout_constraintBottom_toTopOf="@id/layout_info"
25+
app:layout_constraintEnd_toEndOf="parent"
26+
app:layout_constraintStart_toStartOf="parent"
27+
app:layout_constraintTop_toBottomOf="@id/viewPager"
28+
app:tabBackground="@drawable/onboarding_viewpager_selector_white"
29+
app:tabGravity="center"
30+
app:tabIndicatorHeight="0dp" />
31+
32+
<LinearLayout
33+
android:id="@+id/layout_info"
34+
android:layout_width="match_parent"
35+
android:layout_height="wrap_content"
36+
android:layout_alignParentBottom="true"
37+
android:background="@drawable/layout_rounded_top_white"
38+
android:gravity="center"
39+
android:orientation="vertical"
40+
android:weightSum="10"
41+
app:layout_constraintBottom_toBottomOf="parent">
42+
43+
<androidx.appcompat.widget.AppCompatButton
44+
android:id="@+id/btn_create_account"
1245
android:layout_width="match_parent"
13-
android:layout_height="wrap_content"
14-
android:layout_above="@id/layout_info"
15-
android:orientation="vertical"
16-
android:gravity="center">
17-
18-
19-
<androidx.viewpager2.widget.ViewPager2
20-
android:id="@+id/viewPager"
21-
android:layout_width="match_parent"
22-
android:layout_height="match_parent"
23-
android:clipToPadding="false"
24-
android:overScrollMode="never" />
25-
26-
27-
<com.google.android.material.tabs.TabLayout
28-
android:id="@+id/pageIndicator"
29-
android:layout_width="wrap_content"
30-
android:layout_height="wrap_content"
31-
android:layout_margin="30dp"
32-
app:tabGravity="center"
33-
app:tabIndicatorHeight="0dp"
34-
app:tabBackground="@drawable/onboarding_viewpager_selector_white"/>
35-
36-
37-
</LinearLayout>
38-
39-
40-
<LinearLayout
41-
android:id="@+id/layout_info"
46+
android:layout_height="50dp"
47+
android:layout_margin="20dp"
48+
android:background="@drawable/btn_blue_selector"
49+
android:text="@string/start"
50+
android:textAllCaps="true"
51+
android:textColor="@color/md_white_1000" />
52+
53+
<androidx.appcompat.widget.AppCompatTextView
54+
android:id="@+id/text_policy_terms"
4255
android:layout_width="match_parent"
4356
android:layout_height="wrap_content"
44-
android:layout_alignParentBottom="true"
45-
android:orientation="vertical"
57+
android:layout_margin="20dp"
4658
android:gravity="center"
47-
android:background="@drawable/layout_rounded_top_white"
48-
android:weightSum="10">
49-
50-
51-
<androidx.appcompat.widget.AppCompatButton
52-
android:id="@+id/btn_create_account"
53-
android:layout_width="match_parent"
54-
android:layout_height="50dp"
55-
android:layout_margin="20dp"
56-
android:background="@drawable/btn_blue_selector"
57-
android:text="@string/start"
58-
android:textAllCaps="true"
59-
android:textColor="@color/md_white_1000" />
60-
61-
<androidx.appcompat.widget.AppCompatTextView
62-
android:id="@+id/text_policy_terms"
63-
android:layout_width="match_parent"
64-
android:layout_height="wrap_content"
65-
android:layout_margin="20dp"
66-
android:textColor="@color/md_grey_600"
67-
android:gravity="center"
68-
android:text="@string/start_text_advice"
69-
android:textColorLink="@color/colorPrimary"
70-
android:textSize="12sp" />
71-
72-
73-
</LinearLayout>
74-
59+
android:text="@string/start_text_advice"
60+
android:textColor="@color/md_grey_600"
61+
android:textColorLink="@color/colorPrimary"
62+
android:textSize="12sp" />
7563

64+
</LinearLayout>
7665

77-
</RelativeLayout>
66+
</androidx.constraintlayout.widget.ConstraintLayout>

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

+28-30
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
4-
android:id="@+id/rl_create_account"
54
android:layout_width="match_parent"
65
android:layout_height="match_parent">
76

@@ -10,78 +9,77 @@
109
android:layout_width="match_parent"
1110
android:layout_height="match_parent"
1211
android:clipToPadding="false"
13-
android:overScrollMode="never"/>
12+
android:overScrollMode="never" />
1413

1514
<View
1615
android:layout_width="match_parent"
1716
android:layout_height="1dp"
18-
android:background="@color/md_grey_300"
19-
android:layout_above="@id/bottom_navigation"/>
17+
android:layout_above="@id/bottom_navigation"
18+
android:background="@color/md_grey_300" />
2019

2120
<RelativeLayout
2221
android:id="@+id/bottom_navigation"
2322
android:layout_width="match_parent"
2423
android:layout_height="56dp"
25-
android:orientation="horizontal"
24+
android:layout_alignParentBottom="true"
2625
android:background="@android:color/transparent"
27-
android:layout_alignParentBottom="true">
26+
android:orientation="horizontal">
2827

2928

3029
<androidx.appcompat.widget.AppCompatTextView
3130
android:id="@+id/text_skip"
3231
android:layout_width="90dp"
3332
android:layout_height="match_parent"
34-
android:text="@string/skip"
33+
android:layout_alignParentStart="true"
34+
android:layout_centerVertical="true"
35+
android:layout_marginEnd="30dp"
3536
android:background="?android:attr/selectableItemBackground"
36-
android:gravity="center"
37-
android:textStyle="bold"
38-
android:textAllCaps="true"
39-
android:textSize="16sp"
4037
android:clickable="true"
4138
android:focusable="true"
39+
android:gravity="center"
40+
android:text="@string/skip"
41+
android:textAllCaps="true"
4242
android:textColor="@color/md_white_1000"
43-
android:layout_alignParentStart="true"
44-
android:layout_centerVertical="true"
45-
android:layout_marginEnd="30dp"/>
43+
android:textSize="16sp"
44+
android:textStyle="bold" />
4645

4746

4847
<com.google.android.material.tabs.TabLayout
4948
android:id="@+id/pageIndicator"
5049
android:layout_width="wrap_content"
5150
android:layout_height="wrap_content"
52-
android:layout_centerVertical="true"
5351
android:layout_centerHorizontal="true"
52+
android:layout_centerVertical="true"
53+
app:tabBackground="@drawable/onboarding_viewpager_selector_white"
5454
app:tabGravity="center"
55-
app:tabIndicatorHeight="0dp"
56-
app:tabBackground="@drawable/onboarding_viewpager_selector_white"/>
57-
55+
app:tabIndicatorHeight="0dp" />
5856

5957

6058
<androidx.appcompat.widget.AppCompatImageButton
6159
android:id="@+id/btn_next_step"
6260
android:layout_width="90dp"
6361
android:layout_height="match_parent"
64-
android:background="?android:attr/selectableItemBackground"
65-
android:src="@drawable/ic_chevron_right_white_24dp"
66-
android:layout_centerVertical="true"
6762
android:layout_alignParentEnd="true"
68-
android:layout_marginStart="30dp"/>
63+
android:layout_centerVertical="true"
64+
android:layout_marginStart="30dp"
65+
android:background="?android:attr/selectableItemBackground"
66+
android:src="@drawable/ic_chevron_right_white_24dp" />
6967

7068
<androidx.appcompat.widget.AppCompatTextView
7169
android:id="@+id/text_end"
7270
android:layout_width="90dp"
7371
android:layout_height="match_parent"
74-
android:text="@string/finish"
75-
android:textStyle="bold"
72+
android:layout_alignParentEnd="true"
73+
android:layout_centerVertical="true"
74+
android:layout_marginStart="30dp"
75+
android:background="?android:attr/selectableItemBackground"
7676
android:gravity="center"
77+
android:text="@string/finish"
7778
android:textAllCaps="true"
78-
android:textSize="16sp"
79-
android:visibility="gone"
8079
android:textColor="@color/md_white_1000"
81-
android:background="?android:attr/selectableItemBackground"
82-
android:layout_alignParentEnd="true"
83-
android:layout_centerVertical="true"
84-
android:layout_marginStart="30dp"/>
80+
android:textSize="16sp"
81+
android:textStyle="bold"
82+
android:visibility="gone" />
8583

8684
</RelativeLayout>
8785

0 commit comments

Comments
 (0)