|
|
|
@ -1,12 +1,9 @@ |
|
|
|
package net.pokeranalytics.android.ui.activity |
|
|
|
package net.pokeranalytics.android.ui.activity |
|
|
|
|
|
|
|
|
|
|
|
import android.Manifest |
|
|
|
|
|
|
|
import android.content.Context |
|
|
|
import android.content.Context |
|
|
|
import android.content.Intent |
|
|
|
import android.content.Intent |
|
|
|
import android.content.pm.PackageManager |
|
|
|
|
|
|
|
import android.net.Uri |
|
|
|
import android.net.Uri |
|
|
|
import android.os.Bundle |
|
|
|
import android.os.Bundle |
|
|
|
import androidx.core.app.ActivityCompat |
|
|
|
|
|
|
|
import io.realm.Realm |
|
|
|
import io.realm.Realm |
|
|
|
import net.pokeranalytics.android.R |
|
|
|
import net.pokeranalytics.android.R |
|
|
|
import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity |
|
|
|
import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity |
|
|
|
@ -18,7 +15,7 @@ class ImportActivity : PokerAnalyticsActivity() { |
|
|
|
private lateinit var fileURI: Uri |
|
|
|
private lateinit var fileURI: Uri |
|
|
|
|
|
|
|
|
|
|
|
enum class IntentKey(val keyName: String) { |
|
|
|
enum class IntentKey(val keyName: String) { |
|
|
|
FILE_PATH("filepath") |
|
|
|
URI("uri") |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
companion object { |
|
|
|
companion object { |
|
|
|
@ -26,13 +23,13 @@ class ImportActivity : PokerAnalyticsActivity() { |
|
|
|
/** |
|
|
|
/** |
|
|
|
* Create a new instance for result |
|
|
|
* Create a new instance for result |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
fun newInstance(context: Context, filePath: String) { |
|
|
|
fun newInstance(context: Context, uri: Uri) { |
|
|
|
context.startActivity(getIntent(context, filePath)) |
|
|
|
context.startActivity(getIntent(context, uri)) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private fun getIntent(context: Context, filePath: String) : Intent { |
|
|
|
private fun getIntent(context: Context, uri: Uri) : Intent { |
|
|
|
val intent = Intent(context, ImportActivity::class.java) |
|
|
|
val intent = Intent(context, ImportActivity::class.java) |
|
|
|
intent.putExtra(ImportActivity.IntentKey.FILE_PATH.keyName, filePath) |
|
|
|
intent.putExtra(ImportActivity.IntentKey.URI.keyName, uri) |
|
|
|
return intent |
|
|
|
return intent |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -40,10 +37,7 @@ class ImportActivity : PokerAnalyticsActivity() { |
|
|
|
override fun onCreate(savedInstanceState: Bundle?) { |
|
|
|
override fun onCreate(savedInstanceState: Bundle?) { |
|
|
|
super.onCreate(savedInstanceState) |
|
|
|
super.onCreate(savedInstanceState) |
|
|
|
|
|
|
|
|
|
|
|
Timber.d("Start ImportActivity with URI: ${intent.data}") |
|
|
|
this.fileURI = intent.getParcelableExtra(ImportActivity.IntentKey.URI.keyName) |
|
|
|
intent?.data?.let { |
|
|
|
|
|
|
|
this.fileURI = it |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
setContentView(R.layout.activity_import) |
|
|
|
setContentView(R.layout.activity_import) |
|
|
|
initUI() |
|
|
|
initUI() |
|
|
|
@ -69,34 +63,21 @@ class ImportActivity : PokerAnalyticsActivity() { |
|
|
|
fragment.setData(it) |
|
|
|
fragment.setData(it) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// val |
|
|
|
|
|
|
|
// CSVFormat.DEFAULT.parse() |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// val path = fileURI.path(contentResolver) |
|
|
|
|
|
|
|
// Timber.d("Load fragment with path: ${path}") |
|
|
|
|
|
|
|
// |
|
|
|
|
|
|
|
// val file = File(path) |
|
|
|
|
|
|
|
// Timber.d(">>>> length = ${file.length()}") |
|
|
|
|
|
|
|
// |
|
|
|
|
|
|
|
// path?.let { filePath -> |
|
|
|
|
|
|
|
// fragment.setData(filePath) |
|
|
|
|
|
|
|
// } |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fragmentTransaction.add(R.id.container, fragment) |
|
|
|
fragmentTransaction.add(R.id.container, fragment) |
|
|
|
fragmentTransaction.commit() |
|
|
|
fragmentTransaction.commit() |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private fun requestPermission() { |
|
|
|
// private fun requestPermission() { |
|
|
|
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED) { |
|
|
|
// if (ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED) { |
|
|
|
ActivityCompat.requestPermissions( |
|
|
|
// ActivityCompat.requestPermissions( |
|
|
|
this, arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), PERMISSION_REQUEST_ACCESS_FINE_LOCATION |
|
|
|
// this, arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), PERMISSION_REQUEST_ACCESS_FINE_LOCATION |
|
|
|
) |
|
|
|
// ) |
|
|
|
} |
|
|
|
// } |
|
|
|
} |
|
|
|
// } |
|
|
|
|
|
|
|
// |
|
|
|
override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) { |
|
|
|
// override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) { |
|
|
|
super.onRequestPermissionsResult(requestCode, permissions, grantResults) |
|
|
|
// super.onRequestPermissionsResult(requestCode, permissions, grantResults) |
|
|
|
} |
|
|
|
// } |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |