Skip to content

Attempt to support older API up to 15. #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yccheok wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Attempt to support older API up to 15. #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android {
compileSdkVersion 27
defaultConfig {
applicationId "com.divyanshu.androiddraw"
minSdkVersion 21
minSdkVersion 15
targetSdkVersion 27
versionCode 3
versionName "1.0.2"
Expand Down
2 changes: 1 addition & 1 deletion draw/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ android {


defaultConfig {
minSdkVersion 19
minSdkVersion 15
targetSdkVersion 27
versionCode 1
versionName "1.0"
Expand Down
43 changes: 39 additions & 4 deletions draw/src/main/res/layout/activity_drawing.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
android:padding="12dp"
android:layout_margin="10dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:background="@color/color_white"
android:foreground="?selectableItemBackgroundBorderless" />
Expand All @@ -34,7 +35,9 @@
android:tint="@color/color_white"
app:layout_constraintTop_toTopOf="@id/image_close_drawing"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:fabSize="mini"/>

<android.support.constraint.ConstraintLayout
Expand All @@ -43,6 +46,8 @@
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:background="@color/color_white"
android:elevation="4dp"
Expand All @@ -59,6 +64,8 @@
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/image_draw_width"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/image_draw_width"
app:layout_constraintTop_toTopOf="parent" />

<ImageView
Expand All @@ -71,6 +78,8 @@
android:foreground="?selectableItemBackground"
app:layout_constraintStart_toEndOf="@id/image_draw_eraser"
app:layout_constraintEnd_toStartOf="@id/image_draw_color"
app:layout_constraintLeft_toRightOf="@id/image_draw_eraser"
app:layout_constraintRight_toLeftOf="@id/image_draw_color"
app:layout_constraintTop_toTopOf="parent"/>

<ImageView
Expand All @@ -83,6 +92,8 @@
android:foreground="?selectableItemBackground"
app:layout_constraintStart_toEndOf="@id/image_draw_width"
app:layout_constraintEnd_toStartOf="@id/image_draw_opacity"
app:layout_constraintLeft_toRightOf="@id/image_draw_width"
app:layout_constraintRight_toLeftOf="@id/image_draw_opacity"
app:layout_constraintTop_toTopOf="parent"/>

<ImageView
Expand All @@ -95,6 +106,8 @@
android:foreground="?selectableItemBackground"
app:layout_constraintStart_toEndOf="@id/image_draw_color"
app:layout_constraintEnd_toStartOf="@id/image_draw_undo"
app:layout_constraintLeft_toRightOf="@id/image_draw_color"
app:layout_constraintRight_toLeftOf="@id/image_draw_undo"
app:layout_constraintTop_toTopOf="parent"/>

<ImageView
Expand All @@ -107,6 +120,8 @@
android:foreground="?selectableItemBackground"
app:layout_constraintStart_toEndOf="@id/image_draw_opacity"
app:layout_constraintEnd_toStartOf="@id/image_draw_redo"
app:layout_constraintLeft_toRightOf="@id/image_draw_opacity"
app:layout_constraintRight_toLeftOf="@id/image_draw_redo"
app:layout_constraintTop_toTopOf="parent" />

<ImageView
Expand All @@ -119,43 +134,61 @@
android:foreground="?selectableItemBackground"
app:layout_constraintStart_toEndOf="@id/image_draw_undo"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintLeft_toRightOf="@id/image_draw_undo"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<!-- https://stackoverflow.com/questions/7404100/how-to-fix-seekbar-bar-thumb-centering-issues/7404421 -->
<SeekBar
android:id="@+id/seekBar_width"
android:layout_width="0dp"
android:layout_height="56dp"
android:minHeight="56dip"
android:maxHeight="56dip"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/circle_view_width"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/circle_view_width"
app:layout_constraintTop_toBottomOf="@id/image_draw_eraser"
android:progress="8"
android:paddingStart="16dp"
android:paddingEnd="16dp" />
android:paddingEnd="16dp"
android:paddingLeft="16dp"
android:paddingRight="16dp" />

<com.divyanshu.draw.widget.CircleView
android:id="@+id/circle_view_width"
android:layout_width="56dp"
android:layout_height="56dp"
app:layout_constraintTop_toBottomOf="@id/image_draw_eraser"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintRight_toRightOf="parent" />

<!-- https://stackoverflow.com/questions/7404100/how-to-fix-seekbar-bar-thumb-centering-issues/7404421 -->
<SeekBar
android:id="@+id/seekBar_opacity"
android:layout_width="0dp"
android:layout_height="56dp"
android:minHeight="56dip"
android:maxHeight="56dip"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/circle_view_opacity"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/circle_view_opacity"
app:layout_constraintTop_toBottomOf="@id/image_draw_eraser"
android:progress="100"
android:paddingStart="16dp"
android:paddingEnd="16dp" />
android:paddingEnd="16dp"
android:paddingLeft="16dp"
android:paddingRight="16dp" />

<com.divyanshu.draw.widget.CircleView
android:id="@+id/circle_view_opacity"
android:layout_width="56dp"
android:layout_height="56dp"
app:layout_constraintTop_toBottomOf="@id/image_draw_eraser"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintRight_toRightOf="parent" />

<include
android:id="@+id/draw_color_palette"
Expand All @@ -164,6 +197,8 @@
android:layout_height="56dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/image_draw_eraser" />

</android.support.constraint.ConstraintLayout>
Expand Down
26 changes: 20 additions & 6 deletions draw/src/main/res/layout/color_palette_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
android:paddingBottom="16dp"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:scaleY="1.5"
android:scaleX="1.5"/>

Expand All @@ -25,7 +27,9 @@
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:paddingStart="12dp"
android:paddingEnd="12dp" />
android:paddingEnd="12dp"
android:paddingLeft="12dp"
android:paddingRight="12dp" />

<ImageView
android:id="@+id/image_color_yellow"
Expand All @@ -35,7 +39,9 @@
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:paddingStart="12dp"
android:paddingEnd="12dp" />
android:paddingEnd="12dp"
android:paddingLeft="12dp"
android:paddingRight="12dp" />

<ImageView
android:id="@+id/image_color_green"
Expand All @@ -45,7 +51,9 @@
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:paddingStart="12dp"
android:paddingEnd="12dp" />
android:paddingEnd="12dp"
android:paddingLeft="12dp"
android:paddingRight="12dp" />

<ImageView
android:id="@+id/image_color_blue"
Expand All @@ -55,7 +63,9 @@
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:paddingStart="12dp"
android:paddingEnd="12dp" />
android:paddingEnd="12dp"
android:paddingLeft="12dp"
android:paddingRight="12dp" />

<ImageView
android:id="@+id/image_color_pink"
Expand All @@ -65,7 +75,9 @@
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:paddingStart="12dp"
android:paddingEnd="12dp" />
android:paddingEnd="12dp"
android:paddingLeft="12dp"
android:paddingRight="12dp" />

<ImageView
android:id="@+id/image_color_brown"
Expand All @@ -75,5 +87,7 @@
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:paddingStart="12dp"
android:paddingEnd="12dp" />
android:paddingEnd="12dp"
android:paddingLeft="12dp"
android:paddingRight="12dp" />
</LinearLayout>