diff --git a/easyPhotos/src/main/AndroidManifest.xml b/easyPhotos/src/main/AndroidManifest.xml index 9ae6a2a4..f8fd9c11 100644 --- a/easyPhotos/src/main/AndroidManifest.xml +++ b/easyPhotos/src/main/AndroidManifest.xml @@ -2,12 +2,12 @@ - + - + + app:layout_constraintTop_toBottomOf="@+id/m_tool_bar"> + app:layout_constraintBottom_toBottomOf="@+id/m_tool_bar" + app:layout_constraintLeft_toRightOf="@+id/iv_back" + app:layout_constraintTop_toTopOf="@+id/m_tool_bar" /> + app:layout_constraintTop_toBottomOf="@+id/m_tool_bar" /> + app:layout_constraintTop_toBottomOf="@+id/m_tool_bar_bottom_line"> @@ -271,7 +271,7 @@ app:borderWidth="0dp" app:elevation="1dp" app:fabSize="normal" - app:layout_constraintBottom_toTopOf="@id/m_bottom_bar" + app:layout_constraintBottom_toTopOf="@+id/m_bottom_bar" app:layout_constraintRight_toRightOf="parent" app:srcCompat="@drawable/ic_camera_easy_photos" /> diff --git a/easyPhotos/src/main/res/layout/activity_preview_easy_photos.xml b/easyPhotos/src/main/res/layout/activity_preview_easy_photos.xml index b25eda5a..46557127 100644 --- a/easyPhotos/src/main/res/layout/activity_preview_easy_photos.xml +++ b/easyPhotos/src/main/res/layout/activity_preview_easy_photos.xml @@ -47,8 +47,8 @@ android:id="@+id/m_back_line" android:layout_width="1dp" android:layout_height="22dp" - android:layout_alignEnd="@id/iv_back" - android:layout_alignRight="@id/iv_back" + android:layout_alignEnd="@+id/iv_back" + android:layout_alignRight="@+id/iv_back" android:layout_centerVertical="true" android:layout_gravity="center_vertical" android:background="@color/easy_photos_bar_primary_dark" /> @@ -57,8 +57,8 @@ android:id="@+id/tv_number" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_toEndOf="@id/m_back_line" - android:layout_toRightOf="@id/m_back_line" + android:layout_toEndOf="@+id/m_back_line" + android:layout_toRightOf="@+id/m_back_line" android:gravity="center" android:paddingLeft="16dp" android:paddingRight="16dp" @@ -116,7 +116,7 @@ android:layout_height="42dp" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:layout_below="@id/fl_fragment" + android:layout_below="@+id/fl_fragment" android:gravity="center" android:paddingLeft="16dp" android:paddingRight="16dp" @@ -129,7 +129,7 @@ android:id="@+id/tv_original" android:layout_width="wrap_content" android:layout_height="42dp" - android:layout_below="@id/fl_fragment" + android:layout_below="@+id/fl_fragment" android:layout_centerInParent="true" android:gravity="center" android:text="@string/original_easy_photos" @@ -141,7 +141,7 @@ android:id="@+id/tv_selector" android:layout_width="wrap_content" android:layout_height="42dp" - android:layout_below="@id/fl_fragment" + android:layout_below="@+id/fl_fragment" android:layout_toLeftOf="@+id/iv_selector" android:layout_toStartOf="@+id/iv_selector" android:gravity="center" @@ -155,7 +155,7 @@ android:layout_height="42dp" android:layout_alignParentEnd="true" android:layout_alignParentRight="true" - android:layout_below="@id/fl_fragment" + android:layout_below="@+id/fl_fragment" android:paddingEnd="16dp" android:paddingLeft="6dp" android:paddingRight="16dp" diff --git a/easyPhotos/src/main/res/layout/activity_puzzle_easy_photos.xml b/easyPhotos/src/main/res/layout/activity_puzzle_easy_photos.xml index 07b7d7d0..b5311a54 100644 --- a/easyPhotos/src/main/res/layout/activity_puzzle_easy_photos.xml +++ b/easyPhotos/src/main/res/layout/activity_puzzle_easy_photos.xml @@ -37,7 +37,7 @@ android:layout_width="match_parent" android:layout_height="32dp" android:paddingTop="8dp" - android:layout_below="@id/degree_seek_bar" + android:layout_below="@+id/degree_seek_bar" android:orientation="horizontal" android:visibility="gone"> @@ -92,7 +92,7 @@ android:id="@+id/rv_puzzle_template" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/ll_menu" + android:layout_below="@+id/ll_menu" android:paddingBottom="8dp" android:paddingTop="6dp" /> @@ -100,7 +100,7 @@ + app:layout_constraintBottom_toBottomOf="@+id/m_tool_bar" + app:layout_constraintLeft_toRightOf="@+id/iv_back" + app:layout_constraintTop_toTopOf="@+id/m_tool_bar" /> diff --git a/easyPhotos/src/main/res/layout/fragment_text_sticker_easy_photos.xml b/easyPhotos/src/main/res/layout/fragment_text_sticker_easy_photos.xml index 3ab0322b..4403fda8 100644 --- a/easyPhotos/src/main/res/layout/fragment_text_sticker_easy_photos.xml +++ b/easyPhotos/src/main/res/layout/fragment_text_sticker_easy_photos.xml @@ -25,8 +25,8 @@ android:gravity="center" android:textSize="@dimen/sticker_text_size_easy_photos" android:textStyle="bold" - app:layout_constraintLeft_toRightOf="@id/guideline2" - app:layout_constraintRight_toLeftOf="@id/guideline3" + app:layout_constraintLeft_toRightOf="@+id/guideline2" + app:layout_constraintRight_toLeftOf="@+id/guideline3" app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@+id/m_seek_bar" /> + app:layout_constraintRight_toLeftOf="@+id/tv_done" + app:layout_constraintTop_toTopOf="@+id/tv_done" />