staxriver
/
poker-analytics
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes warnings

Browse Source
hh
Laurent 6 years ago
parent 93eebe40b2
commit ec402c8d17
11 changed files with 78 additions and 65 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
  2. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
  3. 5
      app/src/main/java/net/pokeranalytics/android/ui/activity/FiltersListActivity.kt
  4. 77
      app/src/main/java/net/pokeranalytics/android/ui/activity/components/MediaActivity.kt
  5. 28
      app/src/main/java/net/pokeranalytics/android/ui/adapter/FilterSectionAdapter.kt
  6. 5
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt
  7. 2
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt
  8. 2
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/VideoView.kt
  9. 4
      app/src/main/java/net/pokeranalytics/android/util/ImageUtils.kt
  10. 6
      app/src/main/java/net/pokeranalytics/android/util/video/MMediaMuxer.kt
  11. 7
      app/src/main/res/drawable/rounded_highlighted_board_background.xml

5
app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
Unescape View File

@ -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<String>
get() {
when (this.operator) {
Operator.MORE, Operator.LESS -> return listOf("$baseId+${this.operator.name}")
else -> {}
}
return when (this) {

2
app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
Unescape View File

@ -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)

5
app/src/main/java/net/pokeranalytics/android/ui/activity/FiltersListActivity.kt
Unescape View File

@ -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

77
app/src/main/java/net/pokeranalytics/android/ui/activity/components/MediaActivity.kt
Unescape View File

@ -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<String>()
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<String>(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<String>()
// 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<String>(permissions.size)), PERMISSION_REQUEST_CAMERA)
// }
// }
//
// /**
// * Called when a bitmap is return
// *
// * @param bitmap the bitmap returned
// */
// open fun getBitmapImage(file: File?, bitmap: Bitmap?) {}
/**

28
app/src/main/java/net/pokeranalytics/android/ui/adapter/FilterSectionAdapter.kt
Unescape View File

@ -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

5
app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt
Unescape View File

@ -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)

2
app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt
Unescape View File

@ -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

2
app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/VideoView.kt
Unescape View File

@ -24,7 +24,7 @@ class VideoView : FrameLayout {
init()
}
open fun getResourceLayout(): Int {
private fun getResourceLayout(): Int {
return R.layout.view_video
}

4
app/src/main/java/net/pokeranalytics/android/util/ImageUtils.kt
Unescape View File

@ -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

6
app/src/main/java/net/pokeranalytics/android/util/video/MMediaMuxer.kt
Unescape View File

@ -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
}
}

7
app/src/main/res/drawable/rounded_highlighted_board_background.xml
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/kaki_light"/>
<!-- <stroke android:width="3dp" android:color="#B1BCBE" />-->
<corners android:radius="6dp"/>
<padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
</shape>
Write Preview
Loading…
Cancel
Save