diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
index e3f557c9..7051683f 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
@@ -68,20 +68,20 @@ enum class Stat : RowRepresentable {
NETRESULT -> R.string.net_result
HOURLY_RATE -> R.string.average_hour_rate
AVERAGE -> R.string.average
- NUMBER_OF_SETS -> R.string.number_of_groups
- NUMBER_OF_GAMES -> R.string.number_of_games
+ NUMBER_OF_SETS -> R.string.number_of_sessions
+ NUMBER_OF_GAMES -> R.string.number_of_records
DURATION -> R.string.duration
- AVERAGE_DURATION -> R.string.average_duration
- NET_BB_PER_100_HANDS -> R.string.net_bb_per_100_hands
- HOURLY_RATE_BB -> R.string.hourly_rate_bb
- AVERAGE_NET_BB -> R.string.average_net_bb
+ AVERAGE_DURATION -> R.string.average_hours_played
+ NET_BB_PER_100_HANDS -> R.string.net_result_bb_per_100_hands
+ HOURLY_RATE_BB -> R.string.average_hour_rate_bb_
+ AVERAGE_NET_BB -> R.string.average_net_result_bb_
WIN_RATIO -> R.string.win_ratio
AVERAGE_BUYIN -> R.string.average_buyin
- ROI -> R.string.roi
+ ROI -> R.string.tournament_roi
STANDARD_DEVIATION -> R.string.standard_deviation
- STANDARD_DEVIATION_HOURLY -> R.string.standard_deviation_hourly
+ STANDARD_DEVIATION_HOURLY -> R.string.standard_deviation_per_hour
STANDARD_DEVIATION_BB_PER_100_HANDS -> R.string.standard_deviation_bb_per_100_hands
- HANDS_PLAYED -> R.string.hands_played
+ HANDS_PLAYED -> R.string.number_of_hands
}
}
diff --git a/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt b/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt
index 5fdd89aa..b271423e 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt
@@ -149,7 +149,7 @@ enum class LiveData : Localizable {
* Return the new entity title
*/
fun newEntityLocalizedTitle(context: Context): String {
- return "${context.getString(R.string.new_entity)} ${this.localizedTitle(context)}"
+ return "${context.getString(R.string.new_str)} ${this.localizedTitle(context)}"
}
}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
index 931256f1..3ced9609 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
@@ -114,16 +114,16 @@ class HomeActivity : PokerAnalyticsActivity() {
private fun updateToolbar(index: Int) {
when (index) {
0 -> {
- toolbar.title = getString(R.string.title_history)
+ toolbar.title = getString(R.string.feed)
//TODO: Change filter button visibility
homeMenu?.findItem(R.id.filter)?.isVisible = false
}
1 -> {
- toolbar.title = getString(R.string.title_stats)
+ toolbar.title = getString(R.string.stats)
homeMenu?.findItem(R.id.filter)?.isVisible = false
}
2 -> {
- toolbar.title = getString(R.string.title_settings)
+ toolbar.title = getString(R.string.services)
homeMenu?.findItem(R.id.filter)?.isVisible = false
}
}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt
index fa9f8a97..018896b8 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt
@@ -58,7 +58,8 @@ enum class SettingRow : RowRepresentable {
resId = R.string.data_management
)
)
- rows.addAll(arrayListOf(BANKROLL, GAME, LOCATION, TOURNAMENT_NAME, TOURNAMENT_FEATURE, TRANSACTION, TRANSACTION_TYPE))
+ rows.addAll(arrayListOf(BANKROLL, GAME, LOCATION, TOURNAMENT_NAME, TOURNAMENT_FEATURE))
+//, TRANSACTION, TRANSACTION_TYPE //TODO add them back
rows.add(CustomizableRowRepresentable(customViewType = RowViewType.HEADER_TITLE, resId = R.string.terms))
rows.addAll(arrayListOf(PRIVACY_POLICY, TERMS_OF_USE, GDPR))
diff --git a/app/src/main/res/menu/navigation.xml b/app/src/main/res/menu/navigation.xml
index c279292d..762f9cdb 100644
--- a/app/src/main/res/menu/navigation.xml
+++ b/app/src/main/res/menu/navigation.xml
@@ -4,16 +4,16 @@