Skip to content

Commit 597d5fd

Browse files
committed
feat(ui): use strokes around image preview and flip camera button
1 parent bda559c commit 597d5fd

6 files changed

Lines changed: 28 additions & 7 deletions

File tree

app/src/main/kotlin/org/fossify/camera/activities/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
580580
runOnUiThread {
581581
if (!isDestroyed) {
582582
val options = RequestOptions()
583-
.centerCrop()
583+
.circleCrop()
584584
.diskCacheStrategy(DiskCacheStrategy.NONE)
585585

586586
Glide.with(this)
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:color="#80FFFFFF">
4+
<item android:id="@android:id/mask">
5+
<shape android:shape="rectangle">
6+
<corners android:radius="100dp" />
7+
<solid android:color="#FFFFFFFF" />
8+
</shape>
9+
</item>
10+
11+
<item>
12+
<shape android:shape="rectangle">
13+
<solid android:color="@android:color/transparent" />
14+
<corners android:radius="100dp" />
15+
<stroke
16+
android:width="2dp"
17+
android:color="#FFFFFFFF" />
18+
</shape>
19+
</item>
20+
</ripple>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="960" android:viewportHeight="960">
2-
<path android:fillColor="#FFFFFFFF" android:pathData="M480 880q-143 0-253-90T88 560h82q28 106 114 173t196 67q86 0 160-42.5T756 640H640v-80h240v240h-80v-80q-57 76-141 118t-179 42zm0-280q-50 0-85-35t-35-85q0-50 35-85t85-35q50 0 85 35t35 85q0 50-35 85t-85 35zM80 400V160h80v80q57-76 141-118t179-42q143 0 253 90t139 230h-82q-28-106-114-173t-196-67q-86 0-160 42.5T204 320h116v80H80z"/>
2+
<path android:pathData="M480 880q-128 0-230.5-73T104 616q-5-15 3-28t24-18q16-5 30.5 3.5T182 597q36 91 117 147t181 56q86 0 160-42.5T756 640h-76q-17 0-28.5-11.5T640 600q0-17 11.5-28.5T680 560h160q17 0 28.5 11.5T880 600v160q0 17-11.5 28.5T840 800q-17 0-28.5-11.5T800 760v-40q-57 76-141 118t-179 42zm0-720q-86 0-160 42.5T204 320h76q17 0 28.5 11.5T320 360q0 17-11.5 28.5T280 400H120q-17 0-28.5-11.5T80 360V200q0-17 11.5-28.5T120 160q17 0 28.5 11.5T160 200v40q57-76 141-118t179-42q128 0 230.5 73T856 344q5 15-3 28t-24 18q-16 5-30.5-3.5T778 363q-36-91-117-147t-181-56zm0 440q-50 0-85-35t-35-85q0-50 35-85t85-35q50 0 85 35t35 85q0 50-35 85t-85 35z" android:fillColor="#FFFFFFFF"/>
33
</vector>

app/src/main/res/layout/activity_main.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,13 @@
112112
tools:text="00:00"
113113
tools:visibility="visible" />
114114

115-
116115
<ImageView
117116
android:id="@+id/last_photo_video_preview"
118117
android:layout_width="@dimen/icon_size"
119118
android:layout_height="@dimen/icon_size"
119+
android:background="@drawable/camera_button_background"
120120
android:contentDescription="@string/view_last_media"
121-
android:padding="@dimen/medium_margin"
121+
android:padding="@dimen/tiny_margin"
122122
app:layout_constraintBottom_toBottomOf="@id/shutter"
123123
app:layout_constraintEnd_toStartOf="@id/shutter"
124124
app:layout_constraintHorizontal_chainStyle="spread"
@@ -142,8 +142,9 @@
142142
android:id="@+id/toggle_camera"
143143
android:layout_width="@dimen/icon_size"
144144
android:layout_height="@dimen/icon_size"
145+
android:background="@drawable/camera_button_background"
145146
android:contentDescription="@string/toggle_camera"
146-
android:padding="@dimen/normal_margin"
147+
android:padding="@dimen/medium_margin"
147148
android:src="@drawable/ic_flip_camera_vector"
148149
app:layout_constraintBottom_toBottomOf="@id/shutter"
149150
app:layout_constraintEnd_toEndOf="parent"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<dimen name="icon_size">64dp</dimen>
3+
<dimen name="icon_size">56dp</dimen>
44
</resources>

app/src/main/res/values/dimens.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<dimen name="icon_size">56dp</dimen>
3+
<dimen name="icon_size">48dp</dimen>
44
<dimen name="large_icon_size">72dp</dimen>
55
<dimen name="top_icon_size">48dp</dimen>
66
<dimen name="toggle_icon_size">24dp</dimen>

0 commit comments

Comments
 (0)