From 2129cde49a76acf265fcaad8923b63b2a65b226d Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Wed, 27 Feb 2019 11:37:57 +0100 Subject: [PATCH] Clean code & format --- .../android/ui/activity/EditableDataActivity.kt | 12 ++++++------ .../android/ui/activity/SessionActivity.kt | 4 ++-- app/src/main/res/layout/activity_data_list.xml | 14 +++++++------- app/src/main/res/layout/activity_editable_data.xml | 14 +++++++------- app/src/main/res/layout/activity_new_session.xml | 13 ------------- app/src/main/res/layout/activity_session.xml | 13 +++++++++++++ 6 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 app/src/main/res/layout/activity_new_session.xml create mode 100644 app/src/main/res/layout/activity_session.xml diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/EditableDataActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/EditableDataActivity.kt index 28b7f8ff..4a1c5224 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/activity/EditableDataActivity.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/EditableDataActivity.kt @@ -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) } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/SessionActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/SessionActivity.kt index 0017d653..12be0c7d 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/activity/SessionActivity.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/SessionActivity.kt @@ -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() } diff --git a/app/src/main/res/layout/activity_data_list.xml b/app/src/main/res/layout/activity_data_list.xml index 2911b5ae..bdbc43aa 100644 --- a/app/src/main/res/layout/activity_data_list.xml +++ b/app/src/main/res/layout/activity_data_list.xml @@ -1,13 +1,13 @@ + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + android:id="@+id/dataListFragment" + android:name="net.pokeranalytics.android.ui.fragment.DataListFragment" + android:layout_width="match_parent" + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_editable_data.xml b/app/src/main/res/layout/activity_editable_data.xml index 479e51ea..d669661e 100644 --- a/app/src/main/res/layout/activity_editable_data.xml +++ b/app/src/main/res/layout/activity_editable_data.xml @@ -1,13 +1,13 @@ + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + android:id="@+id/editableDataFragment" + android:name="net.pokeranalytics.android.ui.fragment.EditableDataFragment" + android:layout_width="match_parent" + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_new_session.xml b/app/src/main/res/layout/activity_new_session.xml deleted file mode 100644 index 3305e157..00000000 --- a/app/src/main/res/layout/activity_new_session.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_session.xml b/app/src/main/res/layout/activity_session.xml new file mode 100644 index 00000000..3a3d0b9a --- /dev/null +++ b/app/src/main/res/layout/activity_session.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file