Skip to content

Commit

Permalink
Merge pull request #16 from HuanTanSheng/dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@HuanTanSheng
HuanTanSheng authored Jan 23, 2018
2 parents 5bea171 + 9724545 commit e63a6b2
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 39 deletions.
5 changes: 3 additions & 2 deletions easyPhotos/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -22,6 +22,7 @@
android:theme="@style/EasyPhotosFullscreenTheme" />
<activity
android:name=".ui.PuzzleActivity"
android:windowSoftInputMode="adjustPan"
android:screenOrientation="portrait" />

<activity android:name=".ui.PuzzleSelectorActivity"
Expand Down
20 changes: 10 additions & 10 deletions easyPhotos/src/main/res/layout/activity_easy_photos.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -191,16 +191,16 @@
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"
android:layout_width="42dp"
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
Expand Down Expand Up @@ -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"
Expand All @@ -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" />
Expand All @@ -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>
16 changes: 8 additions & 8 deletions easyPhotos/src/main/res/layout/activity_preview_easy_photos.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions easyPhotos/src/main/res/layout/activity_puzzle_easy_photos.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">

Expand Down Expand Up @@ -92,15 +92,15 @@
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" />


<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
Expand Down Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions easyPhotos/src/main/res/layout/activity_puzzle_selector_easy_photos.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand All @@ -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" />


Expand Down
18 changes: 9 additions & 9 deletions easyPhotos/src/main/res/layout/fragment_text_sticker_easy_photos.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand All @@ -80,20 +80,20 @@
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"
android:layout_width="16dp"
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" />


Expand Down

0 comments on commit e63a6b2

Please sign in to comment.