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

merge conflicts resolution

Browse Source
dev_raz_wip
Razmig Sarkissian 7 years ago
parent a38ba8e3bb 52e81944aa
commit 5126f73da5
19 changed files with 39 additions and 41 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. 7
      app/src/main/java/net/pokeranalytics/android/ui/activity/DataListActivity.kt
  2. 9
      app/src/main/java/net/pokeranalytics/android/ui/activity/EditableDataActivity.kt
  3. 2
      app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
  4. 2
      app/src/main/java/net/pokeranalytics/android/ui/activity/NewSessionActivity.kt
  5. 2
      app/src/main/java/net/pokeranalytics/android/ui/activity/components/PokerAnalyticsActivity.kt
  6. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
  7. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
  8. 3
      app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
  9. 4
      app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt
  10. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt
  11. 3
      app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt
  12. 3
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDateFragment.kt
  13. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DatePickerFragment.kt
  14. 3
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DynamicListFragment.kt
  15. 3
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/PokerAnalyticsFragment.kt
  16. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/TimePickerFragment.kt
  17. 3
      app/src/main/res/layout/activity_home.xml
  18. 4
      app/src/main/res/layout/fragment_new_session.xml
  19. 22
      app/src/main/res/values/styles.xml

7
app/src/main/java/net/pokeranalytics/android/ui/activity/DataListActivity.kt
Unescape View File

@ -3,15 +3,10 @@ package net.pokeranalytics.android.ui.activity
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import io.realm.Realm
import io.realm.kotlin.where
import kotlinx.android.synthetic.main.activity_data_list.* import kotlinx.android.synthetic.main.activity_data_list.*
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.realm.Session
import net.pokeranalytics.android.ui.fragment.DataListFragment import net.pokeranalytics.android.ui.fragment.DataListFragment
import net.pokeranalytics.android.util.PokerAnalyticsActivity import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
import net.pokeranalytics.android.util.data.sessionDao
import java.util.*
class DataListActivity : PokerAnalyticsActivity() { class DataListActivity : PokerAnalyticsActivity() {

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

@ -3,17 +3,10 @@ package net.pokeranalytics.android.ui.activity
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import io.realm.Realm
import io.realm.kotlin.where
import kotlinx.android.synthetic.main.activity_data_list.*
import kotlinx.android.synthetic.main.activity_editable_data.* import kotlinx.android.synthetic.main.activity_editable_data.*
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.realm.Session
import net.pokeranalytics.android.ui.fragment.DataListFragment
import net.pokeranalytics.android.ui.fragment.EditableDataFragment import net.pokeranalytics.android.ui.fragment.EditableDataFragment
import net.pokeranalytics.android.util.PokerAnalyticsActivity import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
import net.pokeranalytics.android.util.data.sessionDao
import java.util.*
class EditableDataActivity : PokerAnalyticsActivity() { class EditableDataActivity : PokerAnalyticsActivity() {

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

@ -11,7 +11,7 @@ import net.pokeranalytics.android.model.realm.Session
import net.pokeranalytics.android.ui.fragment.HistoryFragment import net.pokeranalytics.android.ui.fragment.HistoryFragment
import net.pokeranalytics.android.ui.fragment.SettingsFragment import net.pokeranalytics.android.ui.fragment.SettingsFragment
import net.pokeranalytics.android.ui.fragment.StatsFragment import net.pokeranalytics.android.ui.fragment.StatsFragment
import net.pokeranalytics.android.util.PokerAnalyticsActivity import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
import net.pokeranalytics.android.util.data.sessionDao import net.pokeranalytics.android.util.data.sessionDao
import java.util.* import java.util.*

2
app/src/main/java/net/pokeranalytics/android/ui/activity/NewSessionActivity.kt
Unescape View File

@ -6,7 +6,7 @@ import android.os.Bundle
import kotlinx.android.synthetic.main.activity_new_session.* import kotlinx.android.synthetic.main.activity_new_session.*
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.ui.fragment.NewSessionFragment import net.pokeranalytics.android.ui.fragment.NewSessionFragment
import net.pokeranalytics.android.util.PokerAnalyticsActivity import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
class NewSessionActivity: PokerAnalyticsActivity() { class NewSessionActivity: PokerAnalyticsActivity() {

2
app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsActivity.kt → app/src/main/java/net/pokeranalytics/android/ui/activity/components/PokerAnalyticsActivity.kt
Unescape View File

@ -1,4 +1,4 @@
package net.pokeranalytics.android.util package net.pokeranalytics.android.ui.activity.components
import android.os.Bundle import android.os.Bundle
import android.os.PersistableBundle import android.os.PersistableBundle

2
app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
Unescape View File

@ -11,7 +11,7 @@ import kotlinx.android.synthetic.main.fragment_data_list.*
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.ui.activity.EditableDataActivity import net.pokeranalytics.android.ui.activity.EditableDataActivity
import net.pokeranalytics.android.ui.adapter.components.* import net.pokeranalytics.android.ui.adapter.components.*
import net.pokeranalytics.android.util.PokerAnalyticsFragment import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
class DataListFragment : PokerAnalyticsFragment(), DisplayableDelegate { class DataListFragment : PokerAnalyticsFragment(), DisplayableDelegate {

2
app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
Unescape View File

@ -15,7 +15,7 @@ import net.pokeranalytics.android.model.realm.*
import net.pokeranalytics.android.ui.adapter.components.* import net.pokeranalytics.android.ui.adapter.components.*
import net.pokeranalytics.android.ui.fragment.components.BottomSheetFragment import net.pokeranalytics.android.ui.fragment.components.BottomSheetFragment
import net.pokeranalytics.android.ui.fragment.components.BottomSheetType import net.pokeranalytics.android.ui.fragment.components.BottomSheetType
import net.pokeranalytics.android.util.PokerAnalyticsFragment import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
class EditableDataFragment : PokerAnalyticsFragment(), DynamicRowCallback, EditableDataDelegate { class EditableDataFragment : PokerAnalyticsFragment(), DynamicRowCallback, EditableDataDelegate {

3
app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
Unescape View File

@ -17,9 +17,8 @@ import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.realm.Session import net.pokeranalytics.android.model.realm.Session
import net.pokeranalytics.android.ui.activity.NewSessionActivity import net.pokeranalytics.android.ui.activity.NewSessionActivity
import net.pokeranalytics.android.ui.adapter.HistoryAdapter import net.pokeranalytics.android.ui.adapter.HistoryAdapter
import net.pokeranalytics.android.util.PokerAnalyticsFragment import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
import net.pokeranalytics.android.util.data.sessionDao import net.pokeranalytics.android.util.data.sessionDao
import timber.log.Timber
import java.util.* import java.util.*
class HistoryFragment : PokerAnalyticsFragment() { class HistoryFragment : PokerAnalyticsFragment() {

4
app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt
Unescape View File

@ -9,14 +9,14 @@ import androidx.recyclerview.widget.LinearLayoutManager
import kotlinx.android.synthetic.main.fragment_new_session.* import kotlinx.android.synthetic.main.fragment_new_session.*
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.realm.Session import net.pokeranalytics.android.model.realm.Session
import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
import net.pokeranalytics.android.ui.adapter.components.DynamicListAdapter import net.pokeranalytics.android.ui.adapter.components.DynamicListAdapter
import net.pokeranalytics.android.ui.adapter.components.DynamicRowCallback import net.pokeranalytics.android.ui.adapter.components.DynamicRowCallback
import net.pokeranalytics.android.ui.adapter.components.DynamicRowInterface import net.pokeranalytics.android.ui.adapter.components.DynamicRowInterface
import net.pokeranalytics.android.ui.adapter.components.EditableDataDelegate import net.pokeranalytics.android.ui.adapter.components.EditableDataDelegate
import net.pokeranalytics.android.ui.fragment.components.BottomSheetFragment import net.pokeranalytics.android.ui.fragment.components.BottomSheetFragment
import net.pokeranalytics.android.ui.fragment.components.BottomSheetType import net.pokeranalytics.android.ui.fragment.components.BottomSheetType
import net.pokeranalytics.android.util.PokerAnalyticsActivity import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
import net.pokeranalytics.android.util.PokerAnalyticsFragment
class NewSessionFragment : PokerAnalyticsFragment(), DynamicRowCallback, EditableDataDelegate { class NewSessionFragment : PokerAnalyticsFragment(), DynamicRowCallback, EditableDataDelegate {

2
app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt
Unescape View File

@ -9,7 +9,7 @@ import kotlinx.android.synthetic.main.fragment_settings.*
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.ui.activity.DataListActivity import net.pokeranalytics.android.ui.activity.DataListActivity
import net.pokeranalytics.android.ui.adapter.components.* import net.pokeranalytics.android.ui.adapter.components.*
import net.pokeranalytics.android.util.PokerAnalyticsFragment import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
class SettingsFragment : PokerAnalyticsFragment(), DynamicRowDelegate, DynamicRowCallback { class SettingsFragment : PokerAnalyticsFragment(), DynamicRowDelegate, DynamicRowCallback {

3
app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt
Unescape View File

@ -4,9 +4,8 @@ import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.fragment.app.Fragment
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.util.PokerAnalyticsFragment import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
class StatsFragment : PokerAnalyticsFragment() { class StatsFragment : PokerAnalyticsFragment() {

3
app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDateFragment.kt
Unescape View File

@ -7,9 +7,6 @@ import kotlinx.android.synthetic.main.bottom_sheet_date.*
import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.* import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.*
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.realm.TimeFrame import net.pokeranalytics.android.model.realm.TimeFrame
import net.pokeranalytics.android.ui.fragment.components.BottomSheetFragment
import net.pokeranalytics.android.util.DatePickerFragment
import net.pokeranalytics.android.util.TimePickerFragment
class BottomSheetDateFragment : BottomSheetFragment() { class BottomSheetDateFragment : BottomSheetFragment() {

2
app/src/main/java/net/pokeranalytics/android/util/DatePickerFragment.kt → app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DatePickerFragment.kt
Unescape View File

@ -1,4 +1,4 @@
package net.pokeranalytics.android.util package net.pokeranalytics.android.ui.fragment.components
import android.app.DatePickerDialog import android.app.DatePickerDialog
import android.app.Dialog import android.app.Dialog

3
app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DynamicListFragment.kt
Unescape View File

@ -1,8 +1,5 @@
package net.pokeranalytics.android.ui.fragment.components package net.pokeranalytics.android.ui.fragment.components
import androidx.recyclerview.widget.RecyclerView
import net.pokeranalytics.android.util.PokerAnalyticsFragment
open class DynamicListFragment : PokerAnalyticsFragment() { open class DynamicListFragment : PokerAnalyticsFragment() {

3
app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsFragment.kt → app/src/main/java/net/pokeranalytics/android/ui/fragment/components/PokerAnalyticsFragment.kt
Unescape View File

@ -1,8 +1,9 @@
package net.pokeranalytics.android.util package net.pokeranalytics.android.ui.fragment.components
import android.os.Bundle import android.os.Bundle
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import io.realm.Realm import io.realm.Realm
import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
open class PokerAnalyticsFragment: Fragment() { open class PokerAnalyticsFragment: Fragment() {

2
app/src/main/java/net/pokeranalytics/android/util/TimePickerFragment.kt → app/src/main/java/net/pokeranalytics/android/ui/fragment/components/TimePickerFragment.kt
Unescape View File

@ -1,4 +1,4 @@
package net.pokeranalytics.android.util package net.pokeranalytics.android.ui.fragment.components
import android.app.Dialog import android.app.Dialog
import android.app.TimePickerDialog import android.app.TimePickerDialog

3
app/src/main/res/layout/activity_home.xml
Unescape View File

@ -13,8 +13,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:title="@string/app_name" app:title="@string/app_name" />
app:titleTextColor="@color/white" />
<FrameLayout <FrameLayout
android:id="@+id/container" android:id="@+id/container"

4
app/src/main/res/layout/fragment_new_session.xml
Unescape View File

@ -40,6 +40,9 @@
android:layout_height="match_parent" android:layout_height="match_parent"
app:contentScrim="?attr/colorPrimary" app:contentScrim="?attr/colorPrimary"
app:expandedTitleGravity="bottom" app:expandedTitleGravity="bottom"
app:expandedTitleMarginStart="72dp"
app:expandedTitleTextAppearance="@style/PokerAnalyticsTheme.Toolbar.ExpandedTitleAppearance"
app:collapsedTitleTextAppearance="@style/PokerAnalyticsTheme.Toolbar.CollapsedTitleAppearance"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"> app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
<androidx.appcompat.widget.Toolbar <androidx.appcompat.widget.Toolbar
@ -47,7 +50,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
app:title="Poker Analytics" app:title="Poker Analytics"
app:titleMargins="0dp"
app:titleTextColor="@color/white" app:titleTextColor="@color/white"
app:layout_collapseMode="pin" /> app:layout_collapseMode="pin" />

22
app/src/main/res/values/styles.xml
Unescape View File

@ -24,20 +24,36 @@
<item name="android:background">@color/gray_darker</item> <item name="android:background">@color/gray_darker</item>
</style> </style>
<!-- Toolbar --> <!-- Toolbar -->
<style name="PokerAnalyticsTheme.Toolbar" parent="Widget.MaterialComponents.Toolbar"> <style name="PokerAnalyticsTheme.Toolbar" parent="Widget.MaterialComponents.Toolbar">
<item name="android:background">@color/gray_darker</item> <item name="android:background">@color/gray_darker</item>
<item name="titleTextColor">@color/white</item> <item name="titleTextColor">@color/white</item>
<item name="android:fontFamily">@font/roboto_bold</item> <item name="titleTextAppearance">@style/PokerAnalyticsTheme.Toolbar.TitleAppearance</item>
</style> </style>
<style name="PokerAnalyticsTheme.TextView"> <style name="PokerAnalyticsTheme.Toolbar.TitleAppearance">
<item name="android:textColor">@color/white</item> <item name="android:textSize">20sp</item>
<item name="android:fontFamily">@font/roboto</item> <item name="android:fontFamily">@font/roboto</item>
</style> </style>
<style name="PokerAnalyticsTheme.Toolbar.ExpandedTitleAppearance">
<item name="android:textSize">32sp</item>
<item name="android:textColor">@color/white</item>
</style>
<style name="PokerAnalyticsTheme.Toolbar.CollapsedTitleAppearance">
<item name="android:textSize">20sp</item>
<item name="android:textColor">@color/white</item>
</style>
<!-- TextView --> <!-- TextView -->
<style name="PokerAnalyticsTheme.TextView">
<item name="android:textColor">@color/white</item>
<item name="android:fontFamily">@font/roboto</item>
</style>
<style name="PokerAnalyticsTheme.TextView.Title" parent="PokerAnalyticsTheme"> <style name="PokerAnalyticsTheme.TextView.Title" parent="PokerAnalyticsTheme">
<item name="android:textSize">22sp</item> <item name="android:textSize">22sp</item>
<item name="android:textColor">@color/white</item> <item name="android:textColor">@color/white</item>

Write Preview
Loading…
Cancel
Save