From ec402c8d17d6d4f4bab1144ccc43798cba3e8d5e Mon Sep 17 00:00:00 2001 From: Laurent Date: Thu, 5 Mar 2020 15:50:36 +0100 Subject: [PATCH] Fixes warnings --- .../android/model/filter/QueryCondition.kt | 5 +- .../android/model/realm/Session.kt | 2 +- .../ui/activity/FiltersListActivity.kt | 5 +- .../ui/activity/components/MediaActivity.kt | 77 +++++++++---------- .../ui/adapter/FilterSectionAdapter.kt | 28 +++---- .../modules/handhistory/HandHistoryAdapter.kt | 5 +- .../handhistory/model/HandHistoryViewModel.kt | 2 +- .../ui/modules/handhistory/views/VideoView.kt | 2 +- .../pokeranalytics/android/util/ImageUtils.kt | 4 +- .../android/util/video/MMediaMuxer.kt | 6 +- .../rounded_highlighted_board_background.xml | 7 ++ 11 files changed, 78 insertions(+), 65 deletions(-) create mode 100644 app/src/main/res/drawable/rounded_highlighted_board_background.xml diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt index ac94450e..d450c5e9 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt @@ -96,16 +96,17 @@ sealed class QueryCondition : FilterElementRow { val groupId: String get() { - when (this.operator) { + return when (this.operator) { Operator.MORE, Operator.LESS -> return "${this.operator.name.toLowerCase().capitalize()}$baseId" + else -> this.baseId } - return baseId } val id: List get() { when (this.operator) { Operator.MORE, Operator.LESS -> return listOf("$baseId+${this.operator.name}") + else -> {} } return when (this) { diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt index 5c85dcf5..87f6ee8c 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt @@ -823,7 +823,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat } } SessionRow.TOURNAMENT_NAME -> tournamentName?.name ?: NULL_TEXT - SessionRow.HANDS -> this.handHistories?.size.toString() ?: NULL_TEXT + SessionRow.HANDS -> this.handHistories?.size.toString() is CustomField -> { customFieldEntries.find { it.customField?.id == row.id }?.let { customFieldEntry -> return customFieldEntry.getFormattedValue(currency) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/FiltersListActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/FiltersListActivity.kt index 47f9aab5..7003d2e1 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/activity/FiltersListActivity.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/FiltersListActivity.kt @@ -5,11 +5,9 @@ import android.content.Intent import android.os.Bundle import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProviders -import kotlinx.android.synthetic.main.activity_filters_list.* import net.pokeranalytics.android.R import net.pokeranalytics.android.model.LiveData import net.pokeranalytics.android.ui.activity.components.BaseActivity -import net.pokeranalytics.android.ui.fragment.FiltersListFragment import net.pokeranalytics.android.ui.interfaces.FilterActivityRequestCode import net.pokeranalytics.android.ui.modules.datalist.DataListViewModel @@ -57,7 +55,8 @@ class FiltersListActivity : BaseActivity() { private fun initUI() { val dataType = intent.getIntExtra(IntentKey.DATA_TYPE.keyName, 0) val showAddButton = intent.getBooleanExtra(IntentKey.SHOW_ADD_BUTTON.keyName, true) - val fragment = filtersListFragment as FiltersListFragment + +// val fragment = filtersListFragment as FiltersListFragment this.model.dataType = LiveData.values()[dataType] this.model.showAddButton = showAddButton diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/components/MediaActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/components/MediaActivity.kt index 4408de4a..f5c5ba4b 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/activity/components/MediaActivity.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/components/MediaActivity.kt @@ -4,7 +4,6 @@ import android.Manifest import android.app.Activity import android.content.Intent import android.content.pm.PackageManager -import android.graphics.Bitmap import android.provider.MediaStore import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat @@ -62,7 +61,7 @@ open class MediaActivity : BaseActivity() { } } } else if (data?.clipData != null) { - data?.clipData?.let { clipData -> + data.clipData?.let { clipData -> try { GlobalScope.launch(Dispatchers.Main) { @@ -87,7 +86,7 @@ open class MediaActivity : BaseActivity() { } } } else if (data?.data != null) { - data?.data?.let { uri -> + data.data?.let { uri -> try { GlobalScope.launch(Dispatchers.Main) { @@ -216,42 +215,42 @@ open class MediaActivity : BaseActivity() { } } - /** - * Ask for the acmera permission - */ - private fun askForCameraPermission() { - // Here, thisActivity is the current activity - if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) { - ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.CAMERA), - PERMISSION_REQUEST_CAMERA) - } - } - - /** - * Ask for camera and storage permission - */ - private fun askForCameraAndStoragePermissions() { - - val permissions = ArrayList() - if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) { - permissions.add(Manifest.permission.CAMERA) - } - - if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { - permissions.add(Manifest.permission.WRITE_EXTERNAL_STORAGE) - } - - if (permissions.size > 0) { - ActivityCompat.requestPermissions(this, permissions.toArray(arrayOfNulls(permissions.size)), PERMISSION_REQUEST_CAMERA) - } - } - - /** - * Called when a bitmap is return - * - * @param bitmap the bitmap returned - */ - open fun getBitmapImage(file: File?, bitmap: Bitmap?) {} +// /** +// * Ask for the acmera permission +// */ +// private fun askForCameraPermission() { +// // Here, thisActivity is the current activity +// if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) { +// ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.CAMERA), +// PERMISSION_REQUEST_CAMERA) +// } +// } + +// /** +// * Ask for camera and storage permission +// */ +// private fun askForCameraAndStoragePermissions() { +// +// val permissions = ArrayList() +// if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) { +// permissions.add(Manifest.permission.CAMERA) +// } +// +// if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { +// permissions.add(Manifest.permission.WRITE_EXTERNAL_STORAGE) +// } +// +// if (permissions.size > 0) { +// ActivityCompat.requestPermissions(this, permissions.toArray(arrayOfNulls(permissions.size)), PERMISSION_REQUEST_CAMERA) +// } +// } +// +// /** +// * Called when a bitmap is return +// * +// * @param bitmap the bitmap returned +// */ +// open fun getBitmapImage(file: File?, bitmap: Bitmap?) {} /** diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/FilterSectionAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/FilterSectionAdapter.kt index 529c96a5..6b4a124d 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/FilterSectionAdapter.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/FilterSectionAdapter.kt @@ -107,20 +107,20 @@ class FilterSectionAdapter( // } - /** - * Display a transaction view - */ - inner class RowEntityViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), BindableHolder { - - fun bind(position: Int, row: DateModel?, adapter: FilterSectionAdapter) { - -// itemView.transactionRow.setData(row as Transaction) -// val listener = View.OnClickListener { -// adapter.delegate?.onRowSelected(position, row) -// } -// itemView.transactionRow.setOnClickListener(listener) - } - } +// /** +// * Display a transaction view +// */ +// inner class RowEntityViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), BindableHolder { +// +// fun bind(position: Int, row: DateModel?, adapter: FilterSectionAdapter) { +// +//// itemView.transactionRow.setData(row as Transaction) +//// val listener = View.OnClickListener { +//// adapter.delegate?.onRowSelected(position, row) +//// } +//// itemView.transactionRow.setOnClickListener(listener) +// } +// } /** * Display a header diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt index 9c31f1f3..0a108750 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt @@ -270,7 +270,10 @@ class HandHistoryAdapter( dataSource.rowRepresentableForPosition(this.currentPosition)?.let { row -> val focused = dataSource.isSelected(this.currentPosition, row, layout.tag as Int) - layout.setBackgroundColor(color(focused)) +// layout.setBackgroundColor(color(focused)) + + val drawableId = if (focused) R.drawable.rounded_highlighted_board_background else R.drawable.rounded_board_background + layout.background = itemView.resources.getDrawable(drawableId, null) dataSource.contentForRow(row, itemView.context, Card::class).forEach { card -> val cardView = card.view(itemView.context, inflater, layout) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt index 672ba927..be64a018 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt @@ -51,7 +51,7 @@ class HandHistoryViewModel : ViewModel(), RowRepresentableDataSource, CardCentra /*** * Indicates whether the HH is new or not */ - var isNew: Boolean = true + private var isNew: Boolean = true /*** * Indicates whether the hand history is being edited or not diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/VideoView.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/VideoView.kt index da20b18f..76885408 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/VideoView.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/VideoView.kt @@ -24,7 +24,7 @@ class VideoView : FrameLayout { init() } - open fun getResourceLayout(): Int { + private fun getResourceLayout(): Int { return R.layout.view_video } diff --git a/app/src/main/java/net/pokeranalytics/android/util/ImageUtils.kt b/app/src/main/java/net/pokeranalytics/android/util/ImageUtils.kt index f4182e33..76810371 100755 --- a/app/src/main/java/net/pokeranalytics/android/util/ImageUtils.kt +++ b/app/src/main/java/net/pokeranalytics/android/util/ImageUtils.kt @@ -102,7 +102,7 @@ object ImageUtils { * @param filePath Path of the file * @param bitmap Bitmap to save */ - fun updateFile(filePath: String, bitmap: Bitmap) { + private fun updateFile(filePath: String, bitmap: Bitmap) { var out: FileOutputStream? = null try { out = FileOutputStream(filePath) @@ -222,7 +222,7 @@ object ImageUtils { /** * Calculate the sample size */ - fun calculateInSampleSize(options: BitmapFactory.Options, reqWidth: Int, + private fun calculateInSampleSize(options: BitmapFactory.Options, reqWidth: Int, reqHeight: Int): Int { // Raw height and width of image val height = options.outHeight diff --git a/app/src/main/java/net/pokeranalytics/android/util/video/MMediaMuxer.kt b/app/src/main/java/net/pokeranalytics/android/util/video/MMediaMuxer.kt index 4c781376..772c029c 100644 --- a/app/src/main/java/net/pokeranalytics/android/util/video/MMediaMuxer.kt +++ b/app/src/main/java/net/pokeranalytics/android/util/video/MMediaMuxer.kt @@ -407,7 +407,11 @@ class MMediaMuxer { */ private fun isRecognizedFormat(colorFormat: Int): Boolean { return when (colorFormat) { - CodecCapabilities.COLOR_FormatYUV420Planar, CodecCapabilities.COLOR_FormatYUV420PackedPlanar, CodecCapabilities.COLOR_FormatYUV420SemiPlanar, CodecCapabilities.COLOR_FormatYUV420PackedSemiPlanar, CodecCapabilities.COLOR_TI_FormatYUV420PackedSemiPlanar -> true + CodecCapabilities.COLOR_FormatYUV420Planar, + CodecCapabilities.COLOR_FormatYUV420PackedPlanar, + CodecCapabilities.COLOR_FormatYUV420SemiPlanar, + CodecCapabilities.COLOR_FormatYUV420PackedSemiPlanar, + CodecCapabilities.COLOR_TI_FormatYUV420PackedSemiPlanar -> true else -> false } } diff --git a/app/src/main/res/drawable/rounded_highlighted_board_background.xml b/app/src/main/res/drawable/rounded_highlighted_board_background.xml new file mode 100644 index 00000000..3cc2c38f --- /dev/null +++ b/app/src/main/res/drawable/rounded_highlighted_board_background.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file