Unverified Commit 4e13a26f authored by divyanshu bhargava's avatar divyanshu bhargava Committed by GitHub

Merge branch 'develop-2.x' into status-ripple-effect

parents 34b505a0 aa4e1bc8
...@@ -2,22 +2,26 @@ ...@@ -2,22 +2,26 @@
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.constraint.ConstraintLayout 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"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/layout_new_password" android:id="@+id/layout_new_password"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:theme="@style/EditText.Password" android:theme="@style/EditText.Password"
app:layout_constraintBottom_toTopOf="@id/middle_guide" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toEndOf="@id/start_guide" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toStartOf="@id/end_guide"> app:layout_constraintTop_toTopOf="parent"
android:layout_margin="16dp"
>
<EditText <EditText
android:id="@+id/text_new_password" android:id="@+id/text_new_password"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/msg_new_password" android:hint="@string/msg_new_password"
android:inputType="textPassword" /> android:inputType="textPassword"
/>
</android.support.design.widget.TextInputLayout> </android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
...@@ -25,9 +29,11 @@ ...@@ -25,9 +29,11 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:theme="@style/EditText.Password" android:theme="@style/EditText.Password"
app:layout_constraintTop_toBottomOf="@id/middle_guide" app:layout_constraintTop_toBottomOf="@+id/layout_new_password"
app:layout_constraintStart_toEndOf="@id/start_guide" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/end_guide"> app:layout_constraintEnd_toEndOf="parent"
android:layout_margin="16dp"
>
<EditText <EditText
android:id="@+id/text_confirm_password" android:id="@+id/text_confirm_password"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -40,31 +46,12 @@ ...@@ -40,31 +46,12 @@
android:id="@+id/view_loading" android:id="@+id/view_loading"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:visibility="visible"
android:visibility="gone" android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/middle_guide"
app:layout_constraintStart_toEndOf="@id/start_guide"
app:layout_constraintEnd_toStartOf="@id/end_guide"
app:indicatorColor="@color/black" app:indicatorColor="@color/black"
app:indicatorName="BallPulseIndicator" /> app:indicatorName="BallPulseIndicator"
app:layout_constraintStart_toStartOf="parent"
<android.support.constraint.Guideline app:layout_constraintEnd_toEndOf="parent"
android:id="@+id/middle_guide" app:layout_constraintTop_toTopOf="parent"
android:layout_width="wrap_content" app:layout_constraintBottom_toBottomOf="parent"/>
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.2" />
<android.support.constraint.Guideline
android:id="@+id/start_guide"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.05" />
<android.support.constraint.Guideline
android:id="@+id/end_guide"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.95" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
\ 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