|
@@ -9,17 +9,17 @@
|
|
|
android:layout_height="match_parent" />
|
|
|
|
|
|
<View
|
|
|
- android:visibility="gone"
|
|
|
android:id="@+id/mask_view"
|
|
|
- android:background="@color/color_33000000"
|
|
|
android:layout_width="match_parent"
|
|
|
- android:layout_height="match_parent"/>
|
|
|
+ android:layout_height="match_parent"
|
|
|
+ android:background="@color/color_33000000"
|
|
|
+ android:visibility="gone" />
|
|
|
|
|
|
|
|
|
<ImageView
|
|
|
android:id="@+id/iv_play"
|
|
|
- android:layout_width="@dimen/convert_270px"
|
|
|
- android:layout_height="@dimen/convert_270px"
|
|
|
+ android:layout_width="@dimen/convert_126px"
|
|
|
+ android:layout_height="@dimen/convert_126px"
|
|
|
android:layout_centerInParent="true"
|
|
|
android:background="@drawable/ic_play"
|
|
|
android:visibility="gone" />
|
|
@@ -28,86 +28,87 @@
|
|
|
android:id="@+id/seekbar"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:progressDrawable="@drawable/shape_30pxccffffff_corners"
|
|
|
android:layout_alignParentBottom="true"
|
|
|
- android:layout_marginStart="@dimen/convert_75px"
|
|
|
- android:thumb="@drawable/thumb_circle"
|
|
|
- android:layout_marginEnd="@dimen/convert_75px"
|
|
|
+ android:layout_marginStart="@dimen/convert_40px"
|
|
|
+ android:layout_marginEnd="@dimen/convert_40px"
|
|
|
+ android:layout_marginBottom="@dimen/convert_74px"
|
|
|
android:background="@null"
|
|
|
- android:thumbOffset="0dp"
|
|
|
android:duplicateParentState="true"
|
|
|
- android:maxHeight="@dimen/convert_26px"
|
|
|
- android:layout_marginBottom="@dimen/convert_74px" />
|
|
|
+ android:maxHeight="@dimen/convert_12px"
|
|
|
+ android:progressDrawable="@drawable/shape_30pxccffffff_corners"
|
|
|
+ android:thumb="@drawable/thumb_circle"
|
|
|
+ android:thumbOffset="0dp" />
|
|
|
|
|
|
<androidx.appcompat.widget.AppCompatTextView
|
|
|
android:id="@+id/tv_skin"
|
|
|
- android:layout_width="@dimen/convert_120px"
|
|
|
- android:layout_height="@dimen/convert_120px"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
android:layout_alignParentEnd="true"
|
|
|
- android:layout_marginTop="@dimen/convert_21px"
|
|
|
+ android:layout_marginTop="@dimen/convert_40px"
|
|
|
android:layout_marginEnd="@dimen/convert_72px"
|
|
|
- android:background="@drawable/white_circle"
|
|
|
android:gravity="center"
|
|
|
android:text="@string/skip"
|
|
|
- android:textColor="@color/color_F4A12E"
|
|
|
- android:textSize="@dimen/convert_38px" />
|
|
|
+ android:textColor="@color/color_fff"
|
|
|
+ android:textSize="@dimen/convert_40px" />
|
|
|
|
|
|
|
|
|
<LinearLayout
|
|
|
- android:visibility="gone"
|
|
|
android:id="@+id/function_layout"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_centerInParent="true"
|
|
|
- android:orientation="vertical">
|
|
|
+ android:orientation="vertical"
|
|
|
+ android:visibility="gone">
|
|
|
|
|
|
<RelativeLayout
|
|
|
android:id="@+id/skin_layout"
|
|
|
- android:layout_width="@dimen/convert_450px"
|
|
|
- android:layout_height="@dimen/convert_120px"
|
|
|
- android:background="@drawable/shadow_60pxffa627_stoke">
|
|
|
+ android:layout_width="@dimen/convert_350px"
|
|
|
+ android:layout_height="@dimen/convert_98px"
|
|
|
+ android:background="@drawable/shadow_60pxffffff_stoke">
|
|
|
|
|
|
<ImageView
|
|
|
android:id="@+id/iv_skin"
|
|
|
- android:layout_width="@dimen/convert_120px"
|
|
|
- android:layout_height="@dimen/convert_120px"
|
|
|
- android:layout_marginStart="@dimen/convert_50px"
|
|
|
+ android:layout_width="@dimen/convert_60px"
|
|
|
+ android:layout_height="@dimen/convert_60px"
|
|
|
+ android:layout_centerVertical="true"
|
|
|
+ android:layout_marginStart="@dimen/convert_55px"
|
|
|
android:background="@drawable/ic_skin" />
|
|
|
|
|
|
<androidx.appcompat.widget.AppCompatTextView
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_centerVertical="true"
|
|
|
- android:layout_marginStart="@dimen/convert_24px"
|
|
|
+ android:layout_marginStart="@dimen/convert_28px"
|
|
|
android:layout_toEndOf="@id/iv_skin"
|
|
|
- android:text="@string/skip"
|
|
|
+ android:text="@string/enter"
|
|
|
android:textColor="@color/color_FFA627"
|
|
|
- android:textSize="@dimen/convert_54px" />
|
|
|
+ android:textSize="@dimen/convert_36px" />
|
|
|
</RelativeLayout>
|
|
|
|
|
|
<RelativeLayout
|
|
|
- android:layout_marginTop="@dimen/convert_95px"
|
|
|
android:id="@+id/resume_layout"
|
|
|
- android:layout_width="@dimen/convert_450px"
|
|
|
- android:layout_height="@dimen/convert_120px"
|
|
|
+ android:layout_width="@dimen/convert_350px"
|
|
|
+ android:layout_height="@dimen/convert_98px"
|
|
|
+ android:layout_marginTop="@dimen/convert_40px"
|
|
|
android:background="@drawable/shadow_60pxffffff_stoke">
|
|
|
|
|
|
<ImageView
|
|
|
android:id="@+id/iv_resume"
|
|
|
- android:layout_width="@dimen/convert_120px"
|
|
|
- android:layout_height="@dimen/convert_120px"
|
|
|
- android:layout_marginStart="@dimen/convert_50px"
|
|
|
+ android:layout_width="@dimen/convert_60px"
|
|
|
+ android:layout_height="@dimen/convert_60px"
|
|
|
+ android:layout_centerVertical="true"
|
|
|
+ android:layout_marginStart="@dimen/convert_55px"
|
|
|
android:background="@drawable/ic_resume" />
|
|
|
|
|
|
<androidx.appcompat.widget.AppCompatTextView
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_centerVertical="true"
|
|
|
- android:layout_marginStart="@dimen/convert_24px"
|
|
|
+ android:layout_marginStart="@dimen/convert_28px"
|
|
|
android:layout_toEndOf="@id/iv_resume"
|
|
|
- android:text="@string/resume"
|
|
|
+ android:text="@string/repeat"
|
|
|
android:textColor="@color/color_fff"
|
|
|
- android:textSize="@dimen/convert_54px" />
|
|
|
+ android:textSize="@dimen/convert_36px" />
|
|
|
</RelativeLayout>
|
|
|
</LinearLayout>
|
|
|
|