Skip to content

Commit 9227e90

Browse files
author
Dan Oprea
committed
Fix warnings
1 parent a852162 commit 9227e90

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

app/src/main/java/com/dan/simplerawcamera/CameraActivity.kt

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class CameraActivity : AppCompatActivity() {
7979

8080
const val SELECT_CAMERA_ASYNC_DELAY = 250L //ms
8181

82-
val FILE_NAME_DATE_FORMAT = SimpleDateFormat("yyyyMMdd_HHmmss_SSS", Locale.US)
82+
private val FILE_NAME_DATE_FORMAT = SimpleDateFormat("yyyyMMdd_HHmmss_SSS", Locale.US)
8383

8484
fun getMemInfo(): Pair<Long, Long> {
8585
val info = Runtime.getRuntime()
@@ -215,7 +215,7 @@ class CameraActivity : AppCompatActivity() {
215215
for (column in 0 until imageW) {
216216
var yValue = yBytes[index].toInt()
217217
if (yValue < 0) yValue += 256
218-
var valueIndex = HISTOGRAM_BITMAP_WIDTH * yValue / 256
218+
val valueIndex = HISTOGRAM_BITMAP_WIDTH * yValue / 256
219219
values[valueIndex]++
220220
index++
221221
}
@@ -356,6 +356,7 @@ class CameraActivity : AppCompatActivity() {
356356

357357
/** Preview callback */
358358
private val mCameraCaptureSessionPreviewCaptureCallback = object: CameraCaptureSession.CaptureCallback() {
359+
@SuppressLint("SetTextI18n")
359360
override fun onCaptureCompleted(session: CameraCaptureSession, request: CaptureRequest, result: TotalCaptureResult) {
360361
super.onCaptureCompleted(session, request, result)
361362

@@ -388,6 +389,7 @@ class CameraActivity : AppCompatActivity() {
388389

389390
val captureEA = getCaptureEA()
390391
mBinding.txtExpDelta.visibility = if (captureEA.third < -0.1 || captureEA.third > 0.1) View.VISIBLE else View.INVISIBLE
392+
@SuppressLint("SetTextI18n")
391393
mBinding.txtExpDelta.text = "%.2f".format(captureEA.third)
392394

393395
mBinding.frameView.setDebugInfo(FrameView.DEBUG_INFO_TARGET, "Target - ISO ${captureEA.first}, Speed ${getSpeedStr(captureEA.second)} (${captureEA.second})")
@@ -939,6 +941,7 @@ class CameraActivity : AppCompatActivity() {
939941
}
940942

941943
private fun showIso(value: Int) {
944+
@SuppressLint("SetTextI18n")
942945
mBinding.txtIso.text = "$value ISO (${Settings.ISO_MODE_TO_STRING[settings.isoMode]})"
943946
}
944947

@@ -1015,25 +1018,29 @@ class CameraActivity : AppCompatActivity() {
10151018
}
10161019

10171020
private fun showSpeed(speed: Long) {
1021+
@SuppressLint("SetTextI18n")
10181022
mBinding.txtSpeed.text = "${getSpeedStr(speed)} (${Settings.SPEED_MODE_TO_STRING[settings.speedMode]})"
10191023
}
10201024

10211025
private fun showFocus() {
10221026
if (mCameraInfo.focusAllowManual) {
10231027
when(settings.focusType) {
10241028
Settings.FOCUS_TYPE_HYPERFOCAL -> {
1029+
@SuppressLint("SetTextI18n")
10251030
mBinding.txtFocus.text = "Focus: Hyperfocal"
10261031
mBinding.txtFocus.visibility = View.VISIBLE
10271032
mBinding.seekBarFocus.visibility = View.INVISIBLE
10281033
}
10291034

10301035
Settings.FOCUS_TYPE_MANUAL -> {
1036+
@SuppressLint("SetTextI18n")
10311037
mBinding.txtFocus.text = "Focus: Manual"
10321038
mBinding.txtFocus.visibility = View.VISIBLE
10331039
mBinding.seekBarFocus.visibility = View.VISIBLE
10341040
}
10351041

10361042
else -> {
1043+
@SuppressLint("SetTextI18n")
10371044
mBinding.txtFocus.text = "Focus: Auto"
10381045
mBinding.txtFocus.visibility = View.VISIBLE
10391046
mBinding.seekBarFocus.visibility = View.INVISIBLE
@@ -1060,14 +1067,17 @@ class CameraActivity : AppCompatActivity() {
10601067
}
10611068

10621069
private fun updateSequenceDelayStart() {
1070+
@SuppressLint("SetTextI18n")
10631071
mBinding.txtSequenceDelayStart.text = "Delay start: ${getSecondsText(settings.sequenceDelayStart)}"
10641072
}
10651073

10661074
private fun updateSequenceDelayBetween() {
1075+
@SuppressLint("SetTextI18n")
10671076
mBinding.txtSequenceDelayBetween.text = "Delay between: ${getSecondsText(settings.sequenceDelayBetween)}"
10681077
}
10691078

10701079
private fun updateSequenceNumberOfPhotos() {
1080+
@SuppressLint("SetTextI18n")
10711081
mBinding.txtSequenceNumberOfPhotos.text = "Number of photos: ${getNumberOfPhotosText(settings.sequenceNumberOfPhotos)}"
10721082
}
10731083

@@ -1307,6 +1317,7 @@ class CameraActivity : AppCompatActivity() {
13071317
mSelectCameraTimer?.cancel()
13081318
mSelectCameraTimer = null
13091319

1320+
@SuppressLint("SetTextI18n")
13101321
mBinding.txtCamera.text = "${index+1}"
13111322

13121323
if (async) {

0 commit comments

Comments
 (0)