replacing some images with vectors
@ -199,7 +199,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener {
|
||||
checkImageCaptureIntent()
|
||||
mPreview?.setIsImageCaptureIntent(isImageCaptureIntent())
|
||||
|
||||
val imageDrawable = if (config.lastUsedCamera == mCameraImpl.getBackCameraId().toString()) R.drawable.ic_camera_front else R.drawable.ic_camera_rear
|
||||
val imageDrawable = if (config.lastUsedCamera == mCameraImpl.getBackCameraId().toString()) R.drawable.ic_camera_front_vector else R.drawable.ic_camera_rear_vector
|
||||
toggle_camera.setImageResource(imageDrawable)
|
||||
|
||||
mFocusCircleView = FocusCircleView(applicationContext)
|
||||
@ -246,15 +246,15 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener {
|
||||
fun updateFlashlightState(state: Int) {
|
||||
config.flashlightState = state
|
||||
val flashDrawable = when (state) {
|
||||
FLASH_OFF -> R.drawable.ic_flash_off
|
||||
FLASH_ON -> R.drawable.ic_flash_on
|
||||
else -> R.drawable.ic_flash_auto
|
||||
FLASH_OFF -> R.drawable.ic_flash_off_vector
|
||||
FLASH_ON -> R.drawable.ic_flash_on_vector
|
||||
else -> R.drawable.ic_flash_auto_vector
|
||||
}
|
||||
toggle_flash.setImageResource(flashDrawable)
|
||||
}
|
||||
|
||||
fun updateCameraIcon(isUsingFrontCamera: Boolean) {
|
||||
toggle_camera.setImageResource(if (isUsingFrontCamera) R.drawable.ic_camera_rear else R.drawable.ic_camera_front)
|
||||
toggle_camera.setImageResource(if (isUsingFrontCamera) R.drawable.ic_camera_rear_vector else R.drawable.ic_camera_front_vector)
|
||||
}
|
||||
|
||||
private fun shutterPressed() {
|
||||
@ -334,8 +334,8 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener {
|
||||
}
|
||||
|
||||
private fun initPhotoMode() {
|
||||
toggle_photo_video.setImageResource(R.drawable.ic_video)
|
||||
shutter.setImageResource(R.drawable.ic_shutter)
|
||||
toggle_photo_video.setImageResource(R.drawable.ic_video_vector)
|
||||
shutter.setImageResource(R.drawable.ic_shutter_vector)
|
||||
mPreview?.initPhotoMode()
|
||||
setupPreviewImage(true)
|
||||
}
|
||||
@ -499,7 +499,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener {
|
||||
toggle_flash.beVisible()
|
||||
} else {
|
||||
toggle_flash.beInvisible()
|
||||
toggle_flash.setImageResource(R.drawable.ic_flash_off)
|
||||
toggle_flash.setImageResource(R.drawable.ic_flash_off_vector)
|
||||
mPreview?.setFlashlightState(FLASH_OFF)
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 274 B |
Before Width: | Height: | Size: 224 B |
Before Width: | Height: | Size: 379 B |
Before Width: | Height: | Size: 306 B |
Before Width: | Height: | Size: 217 B |
Before Width: | Height: | Size: 295 B |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 173 B |
Before Width: | Height: | Size: 317 B |
Before Width: | Height: | Size: 266 B |
Before Width: | Height: | Size: 459 B |
Before Width: | Height: | Size: 345 B |
Before Width: | Height: | Size: 239 B |
Before Width: | Height: | Size: 304 B |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 178 B |
Before Width: | Height: | Size: 444 B |
Before Width: | Height: | Size: 377 B |
Before Width: | Height: | Size: 673 B |
Before Width: | Height: | Size: 485 B |
Before Width: | Height: | Size: 318 B |
Before Width: | Height: | Size: 420 B |
Before Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 234 B |
Before Width: | Height: | Size: 570 B |
Before Width: | Height: | Size: 489 B |
Before Width: | Height: | Size: 839 B |
Before Width: | Height: | Size: 602 B |
Before Width: | Height: | Size: 386 B |
Before Width: | Height: | Size: 542 B |
Before Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 290 B |
9
app/src/main/res/drawable/ic_camera_front_vector.xml
Normal file
@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FFFFFFFF"
|
||||
android:pathData="M10,20L5,20v2h5v2l3,-3 -3,-3v2zM14,20v2h5v-2h-5zM12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -1.99,0.9 -1.99,2S10.9,8 12,8zM17,0L7,0C5.9,0 5,0.9 5,2v14c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,2c0,-1.1 -0.9,-2 -2,-2zM7,2h10v10.5c0,-1.67 -3.33,-2.5 -5,-2.5s-5,0.83 -5,2.5L7,2z"/>
|
||||
</vector>
|
9
app/src/main/res/drawable/ic_camera_rear_vector.xml
Normal file
@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FFFFFFFF"
|
||||
android:pathData="M10,20L5,20v2h5v2l3,-3 -3,-3v2zM14,20v2h5v-2h-5zM17,0L7,0C5.9,0 5,0.9 5,2v14c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,2c0,-1.1 -0.9,-2 -2,-2zM12,6c-1.11,0 -2,-0.9 -2,-2s0.89,-2 1.99,-2 2,0.9 2,2C14,5.1 13.1,6 12,6z"/>
|
||||
</vector>
|
9
app/src/main/res/drawable/ic_flash_auto_vector.xml
Normal file
@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FFFFFFFF"
|
||||
android:pathData="M3,2v12h3v9l7,-12L9,11l4,-9L3,2zM19,2h-2l-3.2,9h1.9l0.7,-2h3.2l0.7,2h1.9L19,2zM16.85,7.65L18,4l1.15,3.65h-2.3z"/>
|
||||
</vector>
|
9
app/src/main/res/drawable/ic_flash_off_vector.xml
Normal file
@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FFFFFFFF"
|
||||
android:pathData="M3.27,3L2,4.27l5,5V13h3v9l3.58,-6.14L17.73,20 19,18.73 3.27,3zM17,10h-4l4,-8H7v2.18l8.46,8.46L17,10z"/>
|
||||
</vector>
|
9
app/src/main/res/drawable/ic_flash_on_vector.xml
Normal file
@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FFFFFFFF"
|
||||
android:pathData="M7,2v11h3v9l7,-12h-4l4,-8z"/>
|
||||
</vector>
|
9
app/src/main/res/drawable/ic_resolution_vector.xml
Normal file
@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FFFFFFFF"
|
||||
android:pathData="M21,15h2v2h-2v-2zM21,11h2v2h-2v-2zM23,19h-2v2c1,0 2,-1 2,-2zM13,3h2v2h-2L13,3zM21,7h2v2h-2L21,7zM21,3v2h2c0,-1 -1,-2 -2,-2zM1,7h2v2L1,9L1,7zM17,3h2v2h-2L17,3zM17,19h2v2h-2v-2zM3,3C2,3 1,4 1,5h2L3,3zM9,3h2v2L9,5L9,3zM5,3h2v2L5,5L5,3zM1,11v8c0,1.1 0.9,2 2,2h12L15,11L1,11zM3,19l2.5,-3.21 1.79,2.15 2.5,-3.22L13,19L3,19z"/>
|
||||
</vector>
|
9
app/src/main/res/drawable/ic_shutter_vector.xml
Normal file
@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FFFFFFFF"
|
||||
android:pathData="M9.4,10.5l4.77,-8.26C13.47,2.09 12.75,2 12,2c-2.4,0 -4.6,0.85 -6.32,2.25l3.66,6.35 0.06,-0.1zM21.54,9c-0.92,-2.92 -3.15,-5.26 -6,-6.34L11.88,9h9.66zM21.8,10h-7.49l0.29,0.5 4.76,8.25C21,16.97 22,14.61 22,12c0,-0.69 -0.07,-1.35 -0.2,-2zM8.54,12l-3.9,-6.75C3.01,7.03 2,9.39 2,12c0,0.69 0.07,1.35 0.2,2h7.49l-1.15,-2zM2.46,15c0.92,2.92 3.15,5.26 6,6.34L12.12,15L2.46,15zM13.73,15l-3.9,6.76c0.7,0.15 1.42,0.24 2.17,0.24 2.4,0 4.6,-0.85 6.32,-2.25l-3.66,-6.35 -0.93,1.6z"/>
|
||||
</vector>
|
9
app/src/main/res/drawable/ic_video_vector.xml
Normal file
@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FFFFFFFF"
|
||||
android:pathData="M17,10.5V7c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4z"/>
|
||||
</vector>
|
@ -26,7 +26,7 @@
|
||||
android:layout_below="@+id/settings"
|
||||
android:layout_alignParentRight="true"
|
||||
android:padding="@dimen/normal_margin"
|
||||
android:src="@drawable/ic_video"/>
|
||||
android:src="@drawable/ic_video_vector"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/change_resolution"
|
||||
@ -35,7 +35,7 @@
|
||||
android:layout_below="@+id/toggle_photo_video"
|
||||
android:layout_alignParentRight="true"
|
||||
android:padding="@dimen/normal_margin"
|
||||
android:src="@drawable/ic_resolution"/>
|
||||
android:src="@drawable/ic_resolution_vector"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/last_photo_video_preview"
|
||||
@ -58,14 +58,14 @@
|
||||
android:layout_height="@dimen/icon_size"
|
||||
android:layout_weight="1"
|
||||
android:padding="@dimen/normal_margin"
|
||||
android:src="@drawable/ic_camera_front"/>
|
||||
android:src="@drawable/ic_camera_front_vector"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/shutter"
|
||||
android:layout_width="@dimen/icon_size"
|
||||
android:layout_height="@dimen/icon_size"
|
||||
android:layout_weight="1"
|
||||
android:src="@drawable/ic_shutter"/>
|
||||
android:src="@drawable/ic_shutter_vector"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/toggle_flash"
|
||||
@ -73,7 +73,7 @@
|
||||
android:layout_height="@dimen/icon_size"
|
||||
android:layout_weight="1"
|
||||
android:padding="@dimen/normal_margin"
|
||||
android:src="@drawable/ic_flash_off"/>
|
||||
android:src="@drawable/ic_flash_off_vector"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|