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

Create Activity + Fragment for import

Browse Source
dev
Laurent 7 years ago
parent 1deb7d4d46
commit bbb54890dd
5 changed files with 226 additions and 166 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. 290
      app/src/main/AndroidManifest.xml
  2. 2
      app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt
  3. 22
      app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
  4. 67
      app/src/main/java/net/pokeranalytics/android/ui/activity/ImportActivity.kt
  5. 11
      app/src/main/java/net/pokeranalytics/android/ui/fragment/ImportFragment.kt

290
app/src/main/AndroidManifest.xml
Unescape View File

@ -1,147 +1,151 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.pokeranalytics.android"> package="net.pokeranalytics.android">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="com.android.vending.BILLING" /> <uses-permission android:name="com.android.vending.BILLING" />
<application <application
android:name=".PokerAnalyticsApplication" android:name=".PokerAnalyticsApplication"
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/PokerAnalyticsTheme"> android:theme="@style/PokerAnalyticsTheme">
<meta-data <meta-data
android:name="firebase_crashlytics_collection_enabled" android:name="firebase_crashlytics_collection_enabled"
android:value="false" /> android:value="false" />
<activity <activity
android:name="net.pokeranalytics.android.ui.activity.HomeActivity" android:name="net.pokeranalytics.android.ui.activity.HomeActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:screenOrientation="portrait"> android:screenOrientation="portrait">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity android:name="net.pokeranalytics.android.ui.activity.ImportActivity">
android:name="net.pokeranalytics.android.ui.activity.SessionActivity"
android:launchMode="singleTop" </activity>
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustNothing" /> <activity
android:name="net.pokeranalytics.android.ui.activity.SessionActivity"
<activity android:launchMode="singleTop"
android:name="net.pokeranalytics.android.ui.activity.NewDataMenuActivity" android:screenOrientation="portrait"
android:launchMode="singleTop" android:windowSoftInputMode="adjustNothing" />
android:screenOrientation="portrait"
android:theme="@style/PokerAnalyticsTheme.MenuDialog" /> <activity
android:name="net.pokeranalytics.android.ui.activity.NewDataMenuActivity"
<activity android:launchMode="singleTop"
android:name="net.pokeranalytics.android.ui.activity.BankrollActivity" android:screenOrientation="portrait"
android:launchMode="singleTop" android:theme="@style/PokerAnalyticsTheme.MenuDialog" />
android:screenOrientation="portrait" />
<activity
<activity android:name="net.pokeranalytics.android.ui.activity.BankrollActivity"
android:name="net.pokeranalytics.android.ui.activity.BankrollDetailsActivity" android:launchMode="singleTop"
android:launchMode="singleTop" android:screenOrientation="portrait" />
android:screenOrientation="portrait" />
<activity
<activity android:name="net.pokeranalytics.android.ui.activity.BankrollDetailsActivity"
android:name="net.pokeranalytics.android.ui.activity.SettingsActivity" android:launchMode="singleTop"
android:launchMode="singleTop" android:screenOrientation="portrait" />
android:screenOrientation="portrait" />
<activity
<activity android:name="net.pokeranalytics.android.ui.activity.SettingsActivity"
android:name="net.pokeranalytics.android.ui.activity.GraphActivity" android:launchMode="singleTop"
android:launchMode="singleTop" android:screenOrientation="portrait" />
android:screenOrientation="portrait" />
<activity
<activity android:name="net.pokeranalytics.android.ui.activity.GraphActivity"
android:name="net.pokeranalytics.android.ui.activity.ProgressReportActivity" android:launchMode="singleTop"
android:launchMode="singleTop" android:screenOrientation="portrait" />
android:screenOrientation="portrait" />
<activity
<activity android:name="net.pokeranalytics.android.ui.activity.ProgressReportActivity"
android:name="net.pokeranalytics.android.ui.activity.ComparisonReportActivity" android:launchMode="singleTop"
android:launchMode="singleTop" android:screenOrientation="portrait" />
android:screenOrientation="portrait" />
<activity
<activity android:name="net.pokeranalytics.android.ui.activity.ComparisonReportActivity"
android:name="net.pokeranalytics.android.ui.activity.CalendarDetailsActivity" android:launchMode="singleTop"
android:launchMode="singleTop" android:screenOrientation="portrait" />
android:screenOrientation="portrait" />
<activity
<activity android:name="net.pokeranalytics.android.ui.activity.CalendarDetailsActivity"
android:name="net.pokeranalytics.android.ui.activity.ComparisonChartActivity" android:launchMode="singleTop"
android:launchMode="singleTop" android:screenOrientation="portrait" />
android:screenOrientation="portrait" />
<activity
<activity android:name="net.pokeranalytics.android.ui.activity.ComparisonChartActivity"
android:name="net.pokeranalytics.android.ui.activity.DataListActivity" android:launchMode="singleTop"
android:launchMode="singleTop" android:screenOrientation="portrait" />
android:screenOrientation="portrait" />
<activity
<activity android:name="net.pokeranalytics.android.ui.activity.DataListActivity"
android:name="net.pokeranalytics.android.ui.activity.EditableDataActivity" android:launchMode="singleTop"
android:launchMode="singleTop" android:screenOrientation="portrait" />
android:screenOrientation="portrait" />
<activity
<activity android:name="net.pokeranalytics.android.ui.activity.EditableDataActivity"
android:name="net.pokeranalytics.android.ui.activity.CurrenciesActivity" android:launchMode="singleTop"
android:launchMode="singleTop" android:screenOrientation="portrait" />
android:screenOrientation="portrait" />
<activity
<activity android:name="net.pokeranalytics.android.ui.activity.CurrenciesActivity"
android:name="net.pokeranalytics.android.ui.activity.FiltersActivity" android:launchMode="singleTop"
android:launchMode="singleTop" android:screenOrientation="portrait" />
android:screenOrientation="portrait" />
<activity
<activity android:name="net.pokeranalytics.android.ui.activity.FiltersActivity"
android:name="net.pokeranalytics.android.ui.activity.FilterDetailsActivity" android:launchMode="singleTop"
android:launchMode="singleTop" android:screenOrientation="portrait" />
android:screenOrientation="portrait" />
<activity
<activity android:name="net.pokeranalytics.android.ui.activity.FilterDetailsActivity"
android:name="net.pokeranalytics.android.ui.activity.GDPRActivity" android:launchMode="singleTop"
android:launchMode="singleTop" android:screenOrientation="portrait" />
android:screenOrientation="portrait" />
<activity
<activity android:name="net.pokeranalytics.android.ui.activity.GDPRActivity"
android:name="net.pokeranalytics.android.ui.activity.BillingActivity" android:launchMode="singleTop"
android:launchMode="singleTop" android:screenOrientation="portrait" />
android:screenOrientation="portrait" />
<activity
<activity android:name="net.pokeranalytics.android.ui.activity.BillingActivity"
android:name="net.pokeranalytics.android.ui.activity.ReportCreationActivity" android:launchMode="singleTop"
android:launchMode="singleTop" android:screenOrientation="portrait" />
android:screenOrientation="portrait" />
<activity
<activity android:name="net.pokeranalytics.android.ui.activity.ReportCreationActivity"
android:name="net.pokeranalytics.android.ui.activity.TableReportActivity" android:launchMode="singleTop"
android:launchMode="singleTop" android:screenOrientation="portrait" />
android:screenOrientation="portrait" />
<activity
<meta-data android:name="net.pokeranalytics.android.ui.activity.TableReportActivity"
android:name="preloaded_fonts" android:launchMode="singleTop"
android:resource="@array/preloaded_fonts" /> android:screenOrientation="portrait" />
<provider <meta-data
android:name="androidx.core.content.FileProvider" android:name="preloaded_fonts"
android:authorities="${applicationId}.fileprovider" android:resource="@array/preloaded_fonts" />
android:exported="false"
android:grantUriPermissions="true"> <provider
<meta-data android:name="androidx.core.content.FileProvider"
android:name="android.support.FILE_PROVIDER_PATHS" android:authorities="${applicationId}.fileprovider"
android:resource="@xml/provider_paths" /> android:exported="false"
</provider> android:grantUriPermissions="true">
<meta-data
</application> android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths" />
</provider>
</application>
</manifest> </manifest>

2
app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt
Unescape View File

@ -61,7 +61,7 @@ class PokerAnalyticsApplication : Application() {
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
Timber.d("UserPreferences.defaultCurrency: ${UserDefaults.currency.symbol}") Timber.d("UserPreferences.defaultCurrency: ${UserDefaults.currency.symbol}")
this.createFakeSessions() // this.createFakeSessions()
} }

22
app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
Unescape View File

@ -1,12 +1,10 @@
package net.pokeranalytics.android.ui.activity package net.pokeranalytics.android.ui.activity
import android.Manifest
import android.app.KeyguardManager import android.app.KeyguardManager
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import androidx.core.app.ActivityCompat
import com.google.android.material.bottomnavigation.BottomNavigationView import com.google.android.material.bottomnavigation.BottomNavigationView
import io.realm.RealmResults import io.realm.RealmResults
import kotlinx.android.synthetic.main.activity_home.* import kotlinx.android.synthetic.main.activity_home.*
@ -16,7 +14,6 @@ import net.pokeranalytics.android.model.realm.Currency
import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
import net.pokeranalytics.android.ui.adapter.HomePagerAdapter import net.pokeranalytics.android.ui.adapter.HomePagerAdapter
import net.pokeranalytics.android.util.billing.AppGuard import net.pokeranalytics.android.util.billing.AppGuard
import net.pokeranalytics.android.util.csv.CSVImporter
class HomeActivity : PokerAnalyticsActivity() { class HomeActivity : PokerAnalyticsActivity() {
@ -74,25 +71,6 @@ class HomeActivity : PokerAnalyticsActivity() {
observeRealmObjects() observeRealmObjects()
initUI() initUI()
checkFirstLaunch() checkFirstLaunch()
// csv()
}
fun csv() {
val path = "sdcard/Download/RunGoodSessions1.csv"
val csv = CSVImporter(path)
csv.start()
ActivityCompat.requestPermissions(
this, arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), PERMISSION_REQUEST_ACCESS_FINE_LOCATION
)
}
override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults)
} }

67
app/src/main/java/net/pokeranalytics/android/ui/activity/ImportActivity.kt
Unescape View File

@ -0,0 +1,67 @@
package net.pokeranalytics.android.ui.activity
import android.Manifest
import android.content.Intent
import android.os.Bundle
import android.os.PersistableBundle
import androidx.core.app.ActivityCompat
import io.realm.Realm
import net.pokeranalytics.android.R
import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
import net.pokeranalytics.android.ui.fragment.ImportFragment
import net.pokeranalytics.android.util.csv.CSVImporter
import timber.log.Timber
class ImportActivity : PokerAnalyticsActivity() {
override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
super.onCreate(savedInstanceState, persistentState)
initUI()
}
override fun onStop() {
super.onStop()
val realm = Realm.getDefaultInstance()
realm.refresh()
realm.close()
}
private fun initUI() {
val fragmentTransaction = supportFragmentManager.beginTransaction()
val fragment = ImportFragment()
fragmentTransaction.add(R.id.container, fragment)
fragmentTransaction.commit()
}
private fun csv() {
val path = "sdcard/Download/RunGoodSessions1.csv"
val csv = CSVImporter(path)
csv.start()
ActivityCompat.requestPermissions(
this, arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), PERMISSION_REQUEST_ACCESS_FINE_LOCATION
)
}
override fun onNewIntent(intent: Intent?) {
super.onNewIntent(intent)
val f = intent?.data
val uri = f.toString()
Timber.d("!!!Intent!!! uri = $uri")
}
override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults)
}
}

11
app/src/main/java/net/pokeranalytics/android/ui/fragment/ImportFragment.kt
Unescape View File

@ -0,0 +1,11 @@
package net.pokeranalytics.android.ui.fragment
import net.pokeranalytics.android.ui.fragment.components.RealmFragment
class ImportFragment : RealmFragment() {
}
Write Preview
Loading…
Cancel
Save