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

Clean code & format

Browse Source
feature/top10
Aurelien Hubert 7 years ago
parent dc15b402c4
commit 2129cde49a
6 changed files with 35 additions and 35 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. 12
      app/src/main/java/net/pokeranalytics/android/ui/activity/EditableDataActivity.kt
  2. 4
      app/src/main/java/net/pokeranalytics/android/ui/activity/SessionActivity.kt
  3. 14
      app/src/main/res/layout/activity_data_list.xml
  4. 14
      app/src/main/res/layout/activity_editable_data.xml
  5. 13
      app/src/main/res/layout/activity_new_session.xml
  6. 13
      app/src/main/res/layout/activity_session.xml

12
app/src/main/java/net/pokeranalytics/android/ui/activity/EditableDataActivity.kt
Unescape View File

@ -10,16 +10,16 @@ import net.pokeranalytics.android.ui.fragment.EditableDataFragment
class EditableDataActivity : PokerAnalyticsActivity() {
enum class IntentKey(val keyName : String) {
DATATYPE("DATATYPE"),
PRIMARYKEY("PRIMARYKEY");
DATA_TYPE("DATA_TYPE"),
PRIMARY_KEY("PRIMARY_KEY");
}
companion object {
fun newInstance(context: Context, dataType: Int, primaryKey: String? = null) {
val intent = Intent(context, EditableDataActivity::class.java)
intent.putExtra(IntentKey.DATATYPE.keyName, dataType)
intent.putExtra(IntentKey.DATA_TYPE.keyName, dataType)
primaryKey?.let {
intent.putExtra(IntentKey.PRIMARYKEY.keyName, it)
intent.putExtra(IntentKey.PRIMARY_KEY.keyName, it)
}
context.startActivity(intent)
}
@ -36,8 +36,8 @@ class EditableDataActivity : PokerAnalyticsActivity() {
*/
private fun initUI() {
val dataType = intent.getIntExtra(IntentKey.DATATYPE.keyName, 0)
val primaryKey = intent.getStringExtra(IntentKey.PRIMARYKEY.keyName)
val dataType = intent.getIntExtra(IntentKey.DATA_TYPE.keyName, 0)
val primaryKey = intent.getStringExtra(IntentKey.PRIMARY_KEY.keyName)
val fragment = editableDataFragment as EditableDataFragment
fragment.setData(dataType, primaryKey)
}

4
app/src/main/java/net/pokeranalytics/android/ui/activity/SessionActivity.kt
Unescape View File

@ -3,7 +3,7 @@ package net.pokeranalytics.android.ui.activity
import android.content.Context
import android.content.Intent
import android.os.Bundle
import kotlinx.android.synthetic.main.activity_new_session.*
import kotlinx.android.synthetic.main.activity_session.*
import net.pokeranalytics.android.R
import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
import net.pokeranalytics.android.ui.fragment.SessionFragment
@ -34,7 +34,7 @@ class SessionActivity: PokerAnalyticsActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_new_session)
setContentView(R.layout.activity_session)
initUI()
}

14
app/src/main/res/layout/activity_data_list.xml
Unescape View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<fragment
android:id="@+id/dataListFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:name="net.pokeranalytics.android.ui.fragment.DataListFragment" />
android:id="@+id/dataListFragment"
android:name="net.pokeranalytics.android.ui.fragment.DataListFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

14
app/src/main/res/layout/activity_editable_data.xml
Unescape View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<fragment
android:id="@+id/editableDataFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:name="net.pokeranalytics.android.ui.fragment.EditableDataFragment" />
android:id="@+id/editableDataFragment"
android:name="net.pokeranalytics.android.ui.fragment.EditableDataFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

13
app/src/main/res/layout/activity_new_session.xml
Unescape View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<fragment
android:id="@+id/newSessionFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:name="net.pokeranalytics.android.ui.fragment.SessionFragment" />
</LinearLayout>

13
app/src/main/res/layout/activity_session.xml
Unescape View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<fragment
android:id="@+id/newSessionFragment"
android:name="net.pokeranalytics.android.ui.fragment.SessionFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
Write Preview
Loading…
Cancel
Save