Commit f6fae203 authored by Ahmad Abi Mulya's avatar Ahmad Abi Mulya

Update Intro Slider

parent 5db5c211
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".activities.RegisterActivity"> tools:context=".activities.RegisterActivity">
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/tvRegister" android:id="@+id/tvRegister"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -99,7 +98,6 @@ ...@@ -99,7 +98,6 @@
android:imeOptions="actionNext" android:imeOptions="actionNext"
android:textSize="@dimen/text_default" /> android:textSize="@dimen/text_default" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/btnRegister" android:id="@+id/btnRegister"
android:layout_width="match_parent" android:layout_width="match_parent"
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingHorizontal="10dp"
tools:showIn="@layout/activity_welcome"> tools:showIn="@layout/activity_welcome">
<androidx.viewpager.widget.ViewPager <androidx.viewpager.widget.ViewPager
...@@ -23,6 +22,7 @@ ...@@ -23,6 +22,7 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:paddingHorizontal="10dp"
android:layout_height="1dp" android:layout_height="1dp"
android:alpha=".5" android:alpha=".5"
android:layout_above="@id/layoutDots" android:layout_above="@id/layoutDots"
...@@ -34,17 +34,18 @@ ...@@ -34,17 +34,18 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:background="@null" android:background="@android:color/transparent"
android:text="@string/next" android:text="@string/next"
android:textColor="@android:color/white" /> android:textStyle="bold"
android:textColor="@color/colorPrimary" />
<Button <Button
android:id="@+id/btn_skip" android:id="@+id/btn_skip"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true" android:background="@android:color/transparent"
android:background="@null"
android:text="@string/skip" android:text="@string/skip"
android:textColor="@android:color/white" /> android:textStyle="bold"
android:textColor="@color/colorPrimary" />
</RelativeLayout> </RelativeLayout>
\ No newline at end of file
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/bg_screen1"> android:background="@color/white">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -12,14 +12,14 @@ ...@@ -12,14 +12,14 @@
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
android:layout_width="@dimen/img_width_height" android:layout_width="250dp"
android:layout_height="@dimen/img_width_height" /> android:layout_height="200dp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/slide_1_title" android:text="@string/slide_1_title"
android:textColor="@android:color/white" android:textColor="@android:color/black"
android:textSize="@dimen/slide_title" android:textSize="@dimen/slide_title"
android:textStyle="bold" /> android:textStyle="bold" />
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
android:paddingRight="@dimen/desc_padding" android:paddingRight="@dimen/desc_padding"
android:text="@string/slide_1_desc" android:text="@string/slide_1_desc"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@android:color/white" android:textColor="@android:color/black"
android:textSize="@dimen/slide_desc" /> android:textSize="@dimen/slide_desc" />
</LinearLayout> </LinearLayout>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/bg_screen2"> android:background="@color/white">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -12,14 +12,15 @@ ...@@ -12,14 +12,15 @@
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
android:layout_width="@dimen/img_width_height" android:layout_width="250dp"
android:layout_height="@dimen/img_width_height" /> android:layout_height="200dp"
android:src="@drawable/organize"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/slide_2_title" android:text="@string/slide_2_title"
android:textColor="@android:color/white" android:textColor="@android:color/black"
android:textSize="@dimen/slide_title" android:textSize="@dimen/slide_title"
android:textStyle="bold" /> android:textStyle="bold" />
...@@ -31,7 +32,7 @@ ...@@ -31,7 +32,7 @@
android:paddingRight="@dimen/desc_padding" android:paddingRight="@dimen/desc_padding"
android:text="@string/slide_2_desc" android:text="@string/slide_2_desc"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@android:color/white" android:textColor="@android:color/black"
android:textSize="@dimen/slide_desc" /> android:textSize="@dimen/slide_desc" />
</LinearLayout> </LinearLayout>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/bg_screen3"> android:background="@color/white">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -12,14 +12,15 @@ ...@@ -12,14 +12,15 @@
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
android:layout_width="@dimen/img_width_height" android:layout_width="250dp"
android:layout_height="@dimen/img_width_height"/> android:layout_height="200dp"
android:src="@drawable/mobile_payment"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/slide_3_title" android:text="@string/slide_3_title"
android:textColor="@android:color/white" android:textColor="@android:color/black"
android:textSize="@dimen/slide_title" android:textSize="@dimen/slide_title"
android:textStyle="bold" /> android:textStyle="bold" />
...@@ -31,7 +32,7 @@ ...@@ -31,7 +32,7 @@
android:paddingRight="@dimen/desc_padding" android:paddingRight="@dimen/desc_padding"
android:text="@string/slide_3_desc" android:text="@string/slide_3_desc"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@android:color/white" android:textColor="@android:color/black"
android:textSize="@dimen/slide_desc" /> android:textSize="@dimen/slide_desc" />
</LinearLayout> </LinearLayout>
......
...@@ -13,12 +13,6 @@ ...@@ -13,12 +13,6 @@
<color name="color_grey">#fff</color> <color name="color_grey">#fff</color>
<color name="blue">#2196F3</color> <color name="blue">#2196F3</color>
<!-- Screens background color-->
<color name="bg_screen1">#800000</color>
<color name="bg_screen2">#006400</color>
<color name="bg_screen3">#008B8B</color>
<color name="bg_screen4">#8A2BE2</color>
<!-- dots inactive colors --> <!-- dots inactive colors -->
<color name="dot_dark_screen1">#FFFFF0</color> <color name="dot_dark_screen1">#FFFFF0</color>
<color name="dot_dark_screen2">#FFFFF0</color> <color name="dot_dark_screen2">#FFFFF0</color>
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
<dimen name="fab_margin">16dp</dimen> <dimen name="fab_margin">16dp</dimen>
<dimen name="dots_height">30dp</dimen> <dimen name="dots_height">30dp</dimen>
<dimen name="dots_margin_bottom">20dp</dimen> <dimen name="dots_margin_bottom">20dp</dimen>
<dimen name="img_width_height">120dp</dimen>
<dimen name="slide_title">30dp</dimen> <dimen name="slide_title">30dp</dimen>
<dimen name="slide_desc">16dp</dimen> <dimen name="slide_desc">16dp</dimen>
<dimen name="desc_padding">40dp</dimen> <dimen name="desc_padding">40dp</dimen>
......
...@@ -37,15 +37,12 @@ ...@@ -37,15 +37,12 @@
<string name="skip">LEWATI</string> <string name="skip">LEWATI</string>
<string name="start">MULAI</string> <string name="start">MULAI</string>
<string name="slide_1_title">KULINER</string> <string name="slide_1_title">SMART SOFTWARE</string>
<string name="slide_1_desc">Rasakan Berbagai Kuliner yang Akan Memanjakan Lidahmu</string> <string name="slide_1_desc">Manage your business easily and practically</string>
<string name="slide_2_title">HOTEL</string> <string name="slide_2_title">FLEXIBILITY</string>
<string name="slide_2_desc">Temukan Hotel yang Nyaman Untuk Istirahat Perjalananmu</string> <string name="slide_2_desc">Easily manage your transaction, payment, and stock anywhere</string>
<string name="slide_3_title">WISATA</string> <string name="slide_3_title">FUTURE PAYMENT</string>
<string name="slide_3_desc">Destinasi Menarik Menantimu. Segera Pilih Destinasi Wisatamu</string> <string name="slide_3_desc">Integrated with easy and secure payments</string>
<string name="slide_4_title">GUIDE</string>
<string name="slide_4_desc">Cari Guide Untuk Menemani Perjalananmu Agar semakin asyik </string>
</resources> </resources>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment