Skip to content
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.

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

Improve media displayed in widgets [BarcodeWidget] #6534

Draft
wants to merge 16 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
package org.odk.collect.android.widgets

import android.annotation.SuppressLint
import android.app.Activity
import android.content.Context
import android.content.Intent
import android.content.pm.ActivityInfo
import android.graphics.Bitmap
import android.graphics.drawable.BitmapDrawable
import android.view.View
import org.javarosa.form.api.FormEntryPrompt
import org.odk.collect.android.databinding.AnnotateWidgetBinding
import org.odk.collect.android.formentry.questions.QuestionDetails
import org.odk.collect.android.utilities.Appearances
import org.odk.collect.android.utilities.ApplicationConstants.RequestCodes
import org.odk.collect.android.utilities.FileUtils
import org.odk.collect.android.utilities.QuestionMediaManager
import org.odk.collect.android.widgets.utilities.ImageCaptureIntentCreator.imageCaptureIntent
import org.odk.collect.android.widgets.utilities.WaitingForDataRegistry
import org.odk.collect.androidshared.ui.ToastUtils.showLongToast
import org.odk.collect.draw.DrawActivity
import org.odk.collect.permissions.PermissionListener
import org.odk.collect.strings.R
import java.io.File

@SuppressLint("ViewConstructor")
class AnnotateWidget(
context: Context,
prompt: QuestionDetails,
questionMediaManager: QuestionMediaManager,
waitingForDataRegistry: WaitingForDataRegistry,
tmpImageFilePath: String
) : BaseImageWidget(
context,
prompt,
questionMediaManager,
waitingForDataRegistry,
tmpImageFilePath
) {
lateinit var binding: AnnotateWidgetBinding

init {
imageClickHandler = DrawImageClickHandler(
DrawActivity.OPTION_ANNOTATE,
RequestCodes.ANNOTATE_IMAGE,
R.string.annotate_image
)
imageCaptureHandler = ImageCaptureHandler()

render()
updateAnswer()
}

override fun onCreateAnswerView(context: Context, prompt: FormEntryPrompt, answerFontSize: Int): View {
binding = AnnotateWidgetBinding.inflate((context as Activity).layoutInflater)
if (formEntryPrompt.appearanceHint != null && formEntryPrompt.appearanceHint.lowercase().contains(Appearances.NEW)) {
binding.chooseButton.visibility = GONE
}

if (binaryName == null || binding.answerView.hasError()) {
binding.annotateButton.isEnabled = false
}

binding.captureButton.setOnClickListener {
getPermissionsProvider().requestCameraPermission(
(getContext() as Activity),
object : PermissionListener {
override fun granted() {
val intent = imageCaptureIntent(
formEntryPrompt, getContext(), tmpImageFilePath
)
imageCaptureHandler.captureImage(intent, RequestCodes.IMAGE_CAPTURE, R.string.annotate_image)
}
}
)
}
binding.chooseButton.setOnClickListener {
imageCaptureHandler.chooseImage(
R.string.annotate_image
)
}
binding.annotateButton.setOnClickListener {
imageClickHandler.clickImage(
"annotateButton"
)
}
binding.answerView.setOnClickListener { imageClickHandler.clickImage("viewImage") }

if (questionDetails.isReadOnly) {
binding.captureButton.visibility = GONE
binding.chooseButton.visibility = GONE
binding.annotateButton.visibility = GONE
}

answerView = binding.answerView
answerView.setup(prompt.answerValue, imageLoader, questionMediaManager, referenceManager, getDefaultFilePath())

return binding.root
}

override fun addExtrasToIntent(intent: Intent): Intent {
var bmp: Bitmap? = null
val image = binding.answerView.getImageView()
if (image.drawable != null) {
bmp = (image.drawable as BitmapDrawable).bitmap
}

val screenOrientation =
if (bmp != null && bmp.height > bmp.width) ActivityInfo.SCREEN_ORIENTATION_PORTRAIT else ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE

intent.putExtra(DrawActivity.SCREEN_ORIENTATION, screenOrientation)
return intent
}

override fun clearAnswer() {
super.clearAnswer()
binding.annotateButton.isEnabled = false
binding.captureButton.text =
context.getString(R.string.capture_image)
}

override fun setOnLongClickListener(l: OnLongClickListener?) {
binding.captureButton.setOnLongClickListener(l)
binding.chooseButton.setOnLongClickListener(l)
binding.annotateButton.setOnLongClickListener(l)
super.setOnLongClickListener(l)
}

override fun cancelLongPress() {
super.cancelLongPress()
binding.captureButton.cancelLongPress()
binding.chooseButton.cancelLongPress()
binding.annotateButton.cancelLongPress()
}

override fun setData(newImageObj: Any?) {
if (newImageObj is File) {
val mimeType = FileUtils.getMimeType(newImageObj)
if ("image/gif" == mimeType) {
showLongToast(context, R.string.gif_not_supported)
} else {
super.setData(newImageObj)
binding.annotateButton.isEnabled = binaryName != null
}
}
}
}
Loading