From 582c05db3815a208903fab35455ed882be854351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A1=93=E4=B8=80=E6=96=87?= <35919502@qq.com>
Date: Tue, 23 Jan 2018 13:04:40 +0800
Subject: [PATCH 1/2] manifest

---
 easyPhotos/src/main/AndroidManifest.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.huantansheng.easyphotos">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
 
     <application
         android:allowBackup="true"
@@ -22,6 +22,7 @@
             android:theme="@style/EasyPhotosFullscreenTheme" />
         <activity
             android:name=".ui.PuzzleActivity"
+            android:windowSoftInputMode="adjustPan"
             android:screenOrientation="portrait" />
 
         <activity android:name=".ui.PuzzleSelectorActivity"

From 972454573626207e3fe64b384132d0b54fd8fdc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A1=93=E4=B8=80=E6=96=87?= <35919502@qq.com>
Date: Tue, 23 Jan 2018 13:31:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/activity_easy_photos.xml  | 20 +++++++++----------
 .../layout/activity_preview_easy_photos.xml   | 16 +++++++--------
 .../layout/activity_puzzle_easy_photos.xml    |  8 ++++----
 .../activity_puzzle_selector_easy_photos.xml  | 12 +++++------
 .../fragment_text_sticker_easy_photos.xml     | 18 ++++++++---------
 5 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/easyPhotos/src/main/res/layout/activity_easy_photos.xml b/easyPhotos/src/main/res/layout/activity_easy_photos.xml
index 65b4b4ae..f531c029 100644
--- a/easyPhotos/src/main/res/layout/activity_easy_photos.xml
+++ b/easyPhotos/src/main/res/layout/activity_easy_photos.xml
@@ -100,7 +100,7 @@
         app:layout_constraintBottom_toTopOf="@+id/m_bottom_bar"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/m_tool_bar">
+        app:layout_constraintTop_toBottomOf="@+id/m_tool_bar">
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/rv_album_items"
@@ -180,9 +180,9 @@
         android:layout_width="1dp"
         android:layout_height="18dp"
         android:background="@color/easy_photos_bar_primary_dark"
-        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_constraintBottom_toBottomOf="@+id/m_tool_bar"
+        app:layout_constraintLeft_toRightOf="@+id/iv_back"
+        app:layout_constraintTop_toTopOf="@+id/m_tool_bar" />
 
     <View
         android:id="@+id/m_tool_bar_bottom_line"
@@ -191,7 +191,7 @@
         android:background="@color/easy_photos_bar_primary_dark"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/m_tool_bar" />
+        app:layout_constraintTop_toBottomOf="@+id/m_tool_bar" />
 
     <ImageView
         android:id="@+id/iv_back"
@@ -199,8 +199,8 @@
         android:layout_height="42dp"
         android:onClick="onClick"
         android:padding="10dp"
-        app:layout_constraintLeft_toLeftOf="@id/m_tool_bar"
-        app:layout_constraintTop_toTopOf="@id/m_tool_bar"
+        app:layout_constraintLeft_toLeftOf="@+id/m_tool_bar"
+        app:layout_constraintTop_toTopOf="@+id/m_tool_bar"
         app:srcCompat="@drawable/ic_arrow_back_easy_photos" />
 
     <TextView
@@ -242,7 +242,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/m_tool_bar_bottom_line">
+        app:layout_constraintTop_toBottomOf="@+id/m_tool_bar_bottom_line">
 
         <TextView
             android:id="@+id/tv_permission"
@@ -255,7 +255,7 @@
         <ImageView
             android:layout_width="32dp"
             android:layout_height="32dp"
-            android:layout_above="@id/tv_permission"
+            android:layout_above="@+id/tv_permission"
             android:layout_centerHorizontal="true"
             android:layout_marginBottom="16dp"
             app:srcCompat="@drawable/ic_notifications_easy_photos" />
@@ -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" />
 </android.support.constraint.ConstraintLayout>
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 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/rv_puzzle_template"
+                android:layout_below="@+id/rv_puzzle_template"
                 android:orientation="horizontal">
 
                 <TextView
@@ -133,7 +133,7 @@
             android:id="@+id/fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_above="@id/m_bottom_layout"
+            android:layout_above="@+id/m_bottom_layout"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:layout_alignWithParentIfMissing="true"
diff --git a/easyPhotos/src/main/res/layout/activity_puzzle_selector_easy_photos.xml b/easyPhotos/src/main/res/layout/activity_puzzle_selector_easy_photos.xml
index 68495d12..e20f5bfd 100644
--- a/easyPhotos/src/main/res/layout/activity_puzzle_selector_easy_photos.xml
+++ b/easyPhotos/src/main/res/layout/activity_puzzle_selector_easy_photos.xml
@@ -90,7 +90,7 @@
         android:visibility="gone"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/m_tool_bar_bottom_line"
+        app:layout_constraintTop_toBottomOf="@+id/m_tool_bar_bottom_line"
         app:layout_constraintBottom_toTopOf="@+id/m_selector_root">
 
         <android.support.v7.widget.RecyclerView
@@ -136,9 +136,9 @@
         android:layout_width="1dp"
         android:layout_height="18dp"
         android:background="@color/easy_photos_bar_primary_dark"
-        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_constraintBottom_toBottomOf="@+id/m_tool_bar"
+        app:layout_constraintLeft_toRightOf="@+id/iv_back"
+        app:layout_constraintTop_toTopOf="@+id/m_tool_bar" />
 
     <View
         android:id="@+id/m_tool_bar_bottom_line"
@@ -155,8 +155,8 @@
         android:layout_height="42dp"
         android:onClick="onClick"
         android:padding="10dp"
-        app:layout_constraintLeft_toLeftOf="@id/m_tool_bar"
-        app:layout_constraintTop_toTopOf="@id/m_tool_bar"
+        app:layout_constraintLeft_toLeftOf="@+id/m_tool_bar"
+        app:layout_constraintTop_toTopOf="@+id/m_tool_bar"
         app:srcCompat="@drawable/ic_arrow_back_easy_photos" />
 
 
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" />
 
     <android.support.constraint.ConstraintLayout
@@ -63,7 +63,7 @@
             android:textColor="@color/easy_photos_fg_accent"
             android:textStyle="bold"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/m_seek_bar" />
+            app:layout_constraintTop_toBottomOf="@+id/m_seek_bar" />
 
         <EditText
             android:id="@+id/et"
@@ -80,10 +80,10 @@
             android:paddingTop="8dp"
             android:textColor="@color/easy_photos_fg_accent"
             android:textSize="14sp"
-            app:layout_constraintBottom_toBottomOf="@id/tv_done"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_done"
             app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toLeftOf="@id/tv_done"
-            app:layout_constraintTop_toTopOf="@id/tv_done" />
+            app:layout_constraintRight_toLeftOf="@+id/tv_done"
+            app:layout_constraintTop_toTopOf="@+id/tv_done" />
 
         <ImageView
             android:id="@+id/iv_clear"
@@ -91,9 +91,9 @@
             android:layout_height="16dp"
             android:layout_marginEnd="8dp"
             android:layout_marginRight="8dp"
-            app:layout_constraintBottom_toBottomOf="@id/et"
-            app:layout_constraintRight_toRightOf="@id/et"
-            app:layout_constraintTop_toTopOf="@id/et"
+            app:layout_constraintBottom_toBottomOf="@+id/et"
+            app:layout_constraintRight_toRightOf="@+id/et"
+            app:layout_constraintTop_toTopOf="@+id/et"
             app:srcCompat="@drawable/ic_clear_easy_photos" />