Release: v4.7.0

Fixes #1647.

.editorconfig

@@ -0,0 +1,965 @@
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = false
+max_line_length = 100
+tab_width = 4
+ij_continuation_indent_size = 8
+ij_formatter_off_tag = @formatter:off
+ij_formatter_on_tag = @formatter:on
+ij_formatter_tags_enabled = false
+ij_smart_tabs = false
+ij_visual_guides = none
+ij_wrap_on_typing = false
+
+[*.java]
+ij_java_align_consecutive_assignments = false
+ij_java_align_consecutive_variable_declarations = false
+ij_java_align_group_field_declarations = false
+ij_java_align_multiline_annotation_parameters = false
+ij_java_align_multiline_array_initializer_expression = false
+ij_java_align_multiline_assignment = false
+ij_java_align_multiline_binary_operation = false
+ij_java_align_multiline_chained_methods = false
+ij_java_align_multiline_deconstruction_list_components = true
+ij_java_align_multiline_extends_list = false
+ij_java_align_multiline_for = true
+ij_java_align_multiline_method_parentheses = false
+ij_java_align_multiline_parameters = true
+ij_java_align_multiline_parameters_in_calls = false
+ij_java_align_multiline_parenthesized_expression = false
+ij_java_align_multiline_records = true
+ij_java_align_multiline_resources = true
+ij_java_align_multiline_ternary_operation = false
+ij_java_align_multiline_text_blocks = false
+ij_java_align_multiline_throws_list = false
+ij_java_align_subsequent_simple_methods = false
+ij_java_align_throws_keyword = false
+ij_java_align_types_in_multi_catch = true
+ij_java_annotation_parameter_wrap = off
+ij_java_array_initializer_new_line_after_left_brace = false
+ij_java_array_initializer_right_brace_on_new_line = false
+ij_java_array_initializer_wrap = off
+ij_java_assert_statement_colon_on_next_line = false
+ij_java_assert_statement_wrap = off
+ij_java_assignment_wrap = off
+ij_java_binary_operation_sign_on_next_line = false
+ij_java_binary_operation_wrap = off
+ij_java_blank_lines_after_anonymous_class_header = 0
+ij_java_blank_lines_after_class_header = 0
+ij_java_blank_lines_after_imports = 1
+ij_java_blank_lines_after_package = 1
+ij_java_blank_lines_around_class = 1
+ij_java_blank_lines_around_field = 0
+ij_java_blank_lines_around_field_in_interface = 0
+ij_java_blank_lines_around_initializer = 1
+ij_java_blank_lines_around_method = 1
+ij_java_blank_lines_around_method_in_interface = 1
+ij_java_blank_lines_before_class_end = 0
+ij_java_blank_lines_before_imports = 1
+ij_java_blank_lines_before_method_body = 0
+ij_java_blank_lines_before_package = 0
+ij_java_block_brace_style = end_of_line
+ij_java_block_comment_add_space = false
+ij_java_block_comment_at_first_column = true
+ij_java_builder_methods = none
+ij_java_call_parameters_new_line_after_left_paren = false
+ij_java_call_parameters_right_paren_on_new_line = false
+ij_java_call_parameters_wrap = off
+ij_java_case_statement_on_separate_line = true
+ij_java_catch_on_new_line = false
+ij_java_class_annotation_wrap = split_into_lines
+ij_java_class_brace_style = end_of_line
+ij_java_class_count_to_use_import_on_demand = 99
+ij_java_class_names_in_javadoc = 1
+ij_java_deconstruction_list_wrap = normal
+ij_java_do_not_indent_top_level_class_members = false
+ij_java_do_not_wrap_after_single_annotation = false
+ij_java_do_not_wrap_after_single_annotation_in_parameter = false
+ij_java_do_while_brace_force = never
+ij_java_doc_add_blank_line_after_description = true
+ij_java_doc_add_blank_line_after_param_comments = false
+ij_java_doc_add_blank_line_after_return = false
+ij_java_doc_add_p_tag_on_empty_lines = true
+ij_java_doc_align_exception_comments = true
+ij_java_doc_align_param_comments = true
+ij_java_doc_do_not_wrap_if_one_line = false
+ij_java_doc_enable_formatting = true
+ij_java_doc_enable_leading_asterisks = true
+ij_java_doc_indent_on_continuation = false
+ij_java_doc_keep_empty_lines = true
+ij_java_doc_keep_empty_parameter_tag = true
+ij_java_doc_keep_empty_return_tag = true
+ij_java_doc_keep_empty_throws_tag = true
+ij_java_doc_keep_invalid_tags = true
+ij_java_doc_param_description_on_new_line = false
+ij_java_doc_preserve_line_breaks = false
+ij_java_doc_use_throws_not_exception_tag = true
+ij_java_else_on_new_line = false
+ij_java_enum_constants_wrap = off
+ij_java_extends_keyword_wrap = off
+ij_java_extends_list_wrap = off
+ij_java_field_annotation_wrap = split_into_lines
+ij_java_finally_on_new_line = false
+ij_java_for_brace_force = never
+ij_java_for_statement_new_line_after_left_paren = false
+ij_java_for_statement_right_paren_on_new_line = false
+ij_java_for_statement_wrap = off
+ij_java_generate_final_locals = false
+ij_java_generate_final_parameters = false
+ij_java_if_brace_force = never
+ij_java_imports_layout = $android.**,$androidx.**,$com.**,$junit.**,$net.**,$org.**,$java.**,$javax.**,$*,|,android.**,|,androidx.**,|,com.**,|,junit.**,|,net.**,|,org.**,|,java.**,|,javax.**,|,*,|
+ij_java_indent_case_from_switch = true
+ij_java_insert_inner_class_imports = false
+ij_java_insert_override_annotation = true
+ij_java_keep_blank_lines_before_right_brace = 2
+ij_java_keep_blank_lines_between_package_declaration_and_header = 2
+ij_java_keep_blank_lines_in_code = 2
+ij_java_keep_blank_lines_in_declarations = 2
+ij_java_keep_builder_methods_indents = false
+ij_java_keep_control_statement_in_one_line = true
+ij_java_keep_first_column_comment = true
+ij_java_keep_indents_on_empty_lines = false
+ij_java_keep_line_breaks = true
+ij_java_keep_multiple_expressions_in_one_line = false
+ij_java_keep_simple_blocks_in_one_line = false
+ij_java_keep_simple_classes_in_one_line = false
+ij_java_keep_simple_lambdas_in_one_line = false
+ij_java_keep_simple_methods_in_one_line = false
+ij_java_label_indent_absolute = false
+ij_java_label_indent_size = 0
+ij_java_lambda_brace_style = end_of_line
+ij_java_layout_static_imports_separately = true
+ij_java_line_comment_add_space = false
+ij_java_line_comment_add_space_on_reformat = false
+ij_java_line_comment_at_first_column = true
+ij_java_method_annotation_wrap = split_into_lines
+ij_java_method_brace_style = end_of_line
+ij_java_method_call_chain_wrap = off
+ij_java_method_parameters_new_line_after_left_paren = false
+ij_java_method_parameters_right_paren_on_new_line = false
+ij_java_method_parameters_wrap = off
+ij_java_modifier_list_wrap = false
+ij_java_multi_catch_types_wrap = normal
+ij_java_names_count_to_use_import_on_demand = 99
+ij_java_new_line_after_lparen_in_annotation = false
+ij_java_new_line_after_lparen_in_deconstruction_pattern = true
+ij_java_new_line_after_lparen_in_record_header = false
+ij_java_parameter_annotation_wrap = off
+ij_java_parentheses_expression_new_line_after_left_paren = false
+ij_java_parentheses_expression_right_paren_on_new_line = false
+ij_java_place_assignment_sign_on_next_line = false
+ij_java_prefer_longer_names = true
+ij_java_prefer_parameters_wrap = false
+ij_java_record_components_wrap = normal
+ij_java_repeat_synchronized = true
+ij_java_replace_instanceof_and_cast = false
+ij_java_replace_null_check = true
+ij_java_replace_sum_lambda_with_method_ref = true
+ij_java_resource_list_new_line_after_left_paren = false
+ij_java_resource_list_right_paren_on_new_line = false
+ij_java_resource_list_wrap = off
+ij_java_rparen_on_new_line_in_annotation = false
+ij_java_rparen_on_new_line_in_deconstruction_pattern = true
+ij_java_rparen_on_new_line_in_record_header = false
+ij_java_space_after_closing_angle_bracket_in_type_argument = false
+ij_java_space_after_colon = true
+ij_java_space_after_comma = true
+ij_java_space_after_comma_in_type_arguments = true
+ij_java_space_after_for_semicolon = true
+ij_java_space_after_quest = true
+ij_java_space_after_type_cast = true
+ij_java_space_before_annotation_array_initializer_left_brace = false
+ij_java_space_before_annotation_parameter_list = false
+ij_java_space_before_array_initializer_left_brace = false
+ij_java_space_before_catch_keyword = true
+ij_java_space_before_catch_left_brace = true
+ij_java_space_before_catch_parentheses = true
+ij_java_space_before_class_left_brace = true
+ij_java_space_before_colon = true
+ij_java_space_before_colon_in_foreach = true
+ij_java_space_before_comma = false
+ij_java_space_before_deconstruction_list = false
+ij_java_space_before_do_left_brace = true
+ij_java_space_before_else_keyword = true
+ij_java_space_before_else_left_brace = true
+ij_java_space_before_finally_keyword = true
+ij_java_space_before_finally_left_brace = true
+ij_java_space_before_for_left_brace = true
+ij_java_space_before_for_parentheses = true
+ij_java_space_before_for_semicolon = false
+ij_java_space_before_if_left_brace = true
+ij_java_space_before_if_parentheses = true
+ij_java_space_before_method_call_parentheses = false
+ij_java_space_before_method_left_brace = true
+ij_java_space_before_method_parentheses = false
+ij_java_space_before_opening_angle_bracket_in_type_parameter = false
+ij_java_space_before_quest = true
+ij_java_space_before_switch_left_brace = true
+ij_java_space_before_switch_parentheses = true
+ij_java_space_before_synchronized_left_brace = true
+ij_java_space_before_synchronized_parentheses = true
+ij_java_space_before_try_left_brace = true
+ij_java_space_before_try_parentheses = true
+ij_java_space_before_type_parameter_list = false
+ij_java_space_before_while_keyword = true
+ij_java_space_before_while_left_brace = true
+ij_java_space_before_while_parentheses = true
+ij_java_space_inside_one_line_enum_braces = false
+ij_java_space_within_empty_array_initializer_braces = false
+ij_java_space_within_empty_method_call_parentheses = false
+ij_java_space_within_empty_method_parentheses = false
+ij_java_spaces_around_additive_operators = true
+ij_java_spaces_around_annotation_eq = true
+ij_java_spaces_around_assignment_operators = true
+ij_java_spaces_around_bitwise_operators = true
+ij_java_spaces_around_equality_operators = true
+ij_java_spaces_around_lambda_arrow = true
+ij_java_spaces_around_logical_operators = true
+ij_java_spaces_around_method_ref_dbl_colon = false
+ij_java_spaces_around_multiplicative_operators = true
+ij_java_spaces_around_relational_operators = true
+ij_java_spaces_around_shift_operators = true
+ij_java_spaces_around_type_bounds_in_type_parameters = true
+ij_java_spaces_around_unary_operator = false
+ij_java_spaces_within_angle_brackets = false
+ij_java_spaces_within_annotation_parentheses = false
+ij_java_spaces_within_array_initializer_braces = false
+ij_java_spaces_within_braces = false
+ij_java_spaces_within_brackets = false
+ij_java_spaces_within_cast_parentheses = false
+ij_java_spaces_within_catch_parentheses = false
+ij_java_spaces_within_deconstruction_list = false
+ij_java_spaces_within_for_parentheses = false
+ij_java_spaces_within_if_parentheses = false
+ij_java_spaces_within_method_call_parentheses = false
+ij_java_spaces_within_method_parentheses = false
+ij_java_spaces_within_parentheses = false
+ij_java_spaces_within_record_header = false
+ij_java_spaces_within_switch_parentheses = false
+ij_java_spaces_within_synchronized_parentheses = false
+ij_java_spaces_within_try_parentheses = false
+ij_java_spaces_within_while_parentheses = false
+ij_java_special_else_if_treatment = true
+ij_java_subclass_name_suffix = Impl
+ij_java_ternary_operation_signs_on_next_line = false
+ij_java_ternary_operation_wrap = off
+ij_java_test_name_suffix = Test
+ij_java_throws_keyword_wrap = off
+ij_java_throws_list_wrap = off
+ij_java_use_external_annotations = false
+ij_java_use_fq_class_names = false
+ij_java_use_relative_indents = false
+ij_java_use_single_class_imports = true
+ij_java_variable_annotation_wrap = off
+ij_java_visibility = public
+ij_java_while_brace_force = never
+ij_java_while_on_new_line = false
+ij_java_wrap_comments = false
+ij_java_wrap_first_method_in_call_chain = false
+ij_java_wrap_long_lines = false
+
+[*.properties]
+ij_properties_align_group_field_declarations = false
+ij_properties_keep_blank_lines = false
+ij_properties_key_value_delimiter = equals
+ij_properties_spaces_around_key_value_delimiter = false
+
+[.editorconfig]
+ij_editorconfig_align_group_field_declarations = false
+ij_editorconfig_space_after_colon = false
+ij_editorconfig_space_after_comma = true
+ij_editorconfig_space_before_colon = false
+ij_editorconfig_space_before_comma = false
+ij_editorconfig_spaces_around_assignment_operators = true
+
+[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul}]
+ij_continuation_indent_size = 4
+ij_xml_align_attributes = false
+ij_xml_align_text = false
+ij_xml_attribute_wrap = normal
+ij_xml_block_comment_add_space = false
+ij_xml_block_comment_at_first_column = true
+ij_xml_keep_blank_lines = 2
+ij_xml_keep_indents_on_empty_lines = false
+ij_xml_keep_line_breaks = false
+ij_xml_keep_line_breaks_in_text = true
+ij_xml_keep_whitespaces = false
+ij_xml_keep_whitespaces_around_cdata = preserve
+ij_xml_keep_whitespaces_inside_cdata = false
+ij_xml_line_comment_at_first_column = true
+ij_xml_space_after_tag_name = false
+ij_xml_space_around_equals_in_attribute = false
+ij_xml_space_inside_empty_tag = true
+ij_xml_text_wrap = normal
+ij_xml_use_custom_settings = true
+
+[{*.apinotes,*.yaml,*.yml}]
+indent_size = 2
+ij_yaml_align_values_properties = do_not_align
+ij_yaml_autoinsert_sequence_marker = true
+ij_yaml_block_mapping_on_new_line = false
+ij_yaml_indent_sequence_value = true
+ij_yaml_keep_indents_on_empty_lines = false
+ij_yaml_keep_line_breaks = true
+ij_yaml_sequence_on_new_line = false
+ij_yaml_space_before_colon = false
+ij_yaml_spaces_within_braces = true
+ij_yaml_spaces_within_brackets = true
+
+[{*.bash,*.sh,*.zsh}]
+indent_size = 2
+tab_width = 2
+ij_shell_binary_ops_start_line = false
+ij_shell_keep_column_alignment_padding = false
+ij_shell_minify_program = false
+ij_shell_redirect_followed_by_space = false
+ij_shell_switch_cases_indented = false
+ij_shell_use_unix_line_separator = true
+
+[{*.c,*.c++,*.cc,*.cp,*.cpp,*.cppm,*.cu,*.cuh,*.cxx,*.h,*.h++,*.hh,*.hp,*.hpp,*.hxx,*.i,*.icc,*.ii,*.inl,*.ino,*.ipp,*.ixx,*.m,*.mm,*.mxx,*.pch,*.tcc,*.tpp}]
+ij_c_add_brief_tag = false
+ij_c_add_getter_prefix = true
+ij_c_add_setter_prefix = true
+ij_c_align_dictionary_pair_values = false
+ij_c_align_group_field_declarations = false
+ij_c_align_init_list_in_columns = true
+ij_c_align_multiline_array_initializer_expression = true
+ij_c_align_multiline_assignment = true
+ij_c_align_multiline_binary_operation = true
+ij_c_align_multiline_chained_methods = false
+ij_c_align_multiline_for = true
+ij_c_align_multiline_ternary_operation = true
+ij_c_array_initializer_comma_on_next_line = false
+ij_c_array_initializer_new_line_after_left_brace = false
+ij_c_array_initializer_right_brace_on_new_line = false
+ij_c_array_initializer_wrap = normal
+ij_c_assignment_wrap = off
+ij_c_binary_operation_sign_on_next_line = false
+ij_c_binary_operation_wrap = normal
+ij_c_blank_lines_after_class_header = 0
+ij_c_blank_lines_after_imports = 1
+ij_c_blank_lines_around_class = 1
+ij_c_blank_lines_around_field = 0
+ij_c_blank_lines_around_field_in_interface = 0
+ij_c_blank_lines_around_method = 1
+ij_c_blank_lines_around_method_in_interface = 1
+ij_c_blank_lines_around_namespace = 0
+ij_c_blank_lines_around_properties_in_declaration = 0
+ij_c_blank_lines_around_properties_in_interface = 0
+ij_c_blank_lines_before_imports = 1
+ij_c_blank_lines_before_method_body = 0
+ij_c_block_brace_placement = end_of_line
+ij_c_block_brace_style = end_of_line
+ij_c_block_comment_at_first_column = true
+ij_c_catch_on_new_line = false
+ij_c_class_brace_style = end_of_line
+ij_c_class_constructor_init_list_align_multiline = true
+ij_c_class_constructor_init_list_comma_on_next_line = false
+ij_c_class_constructor_init_list_new_line_after_colon = never
+ij_c_class_constructor_init_list_new_line_before_colon = if_long
+ij_c_class_constructor_init_list_wrap = normal
+ij_c_copy_is_deep = false
+ij_c_create_interface_for_categories = true
+ij_c_declare_generated_methods = true
+ij_c_description_include_member_names = true
+ij_c_discharged_short_ternary_operator = false
+ij_c_do_not_add_breaks = false
+ij_c_do_while_brace_force = never
+ij_c_else_on_new_line = false
+ij_c_enum_constants_comma_on_next_line = false
+ij_c_enum_constants_wrap = on_every_item
+ij_c_for_brace_force = never
+ij_c_for_statement_new_line_after_left_paren = false
+ij_c_for_statement_right_paren_on_new_line = false
+ij_c_for_statement_wrap = off
+ij_c_function_brace_placement = end_of_line
+ij_c_function_call_arguments_align_multiline = true
+ij_c_function_call_arguments_align_multiline_pars = false
+ij_c_function_call_arguments_comma_on_next_line = false
+ij_c_function_call_arguments_new_line_after_lpar = false
+ij_c_function_call_arguments_new_line_before_rpar = false
+ij_c_function_call_arguments_wrap = normal
+ij_c_function_non_top_after_return_type_wrap = normal
+ij_c_function_parameters_align_multiline = true
+ij_c_function_parameters_align_multiline_pars = false
+ij_c_function_parameters_comma_on_next_line = false
+ij_c_function_parameters_new_line_after_lpar = false
+ij_c_function_parameters_new_line_before_rpar = false
+ij_c_function_parameters_wrap = normal
+ij_c_function_top_after_return_type_wrap = normal
+ij_c_generate_additional_eq_operators = true
+ij_c_generate_additional_rel_operators = true
+ij_c_generate_class_constructor = true
+ij_c_generate_comparison_operators_use_std_tie = false
+ij_c_generate_instance_variables_for_properties = ask
+ij_c_generate_operators_as_members = true
+ij_c_header_guard_style_pattern = ${PROJECT_NAME}_${FILE_NAME}_${EXT}
+ij_c_if_brace_force = never
+ij_c_in_line_short_ternary_operator = true
+ij_c_indent_block_comment = true
+ij_c_indent_c_struct_members = 4
+ij_c_indent_case_from_switch = true
+ij_c_indent_class_members = 4
+ij_c_indent_directive_as_code = false
+ij_c_indent_implementation_members = 0
+ij_c_indent_inside_code_block = 4
+ij_c_indent_interface_members = 0
+ij_c_indent_interface_members_except_ivars_block = false
+ij_c_indent_namespace_members = 4
+ij_c_indent_preprocessor_directive = 0
+ij_c_indent_visibility_keywords = 0
+ij_c_insert_override = true
+ij_c_insert_virtual_with_override = false
+ij_c_introduce_auto_vars = false
+ij_c_introduce_const_params = false
+ij_c_introduce_const_vars = false
+ij_c_introduce_generate_property = false
+ij_c_introduce_generate_synthesize = true
+ij_c_introduce_globals_to_header = true
+ij_c_introduce_prop_to_private_category = false
+ij_c_introduce_static_consts = true
+ij_c_introduce_use_ns_types = false
+ij_c_ivars_prefix = _
+ij_c_keep_blank_lines_before_end = 2
+ij_c_keep_blank_lines_before_right_brace = 2
+ij_c_keep_blank_lines_in_code = 2
+ij_c_keep_blank_lines_in_declarations = 2
+ij_c_keep_case_expressions_in_one_line = false
+ij_c_keep_control_statement_in_one_line = true
+ij_c_keep_directive_at_first_column = true
+ij_c_keep_first_column_comment = true
+ij_c_keep_line_breaks = true
+ij_c_keep_nested_namespaces_in_one_line = false
+ij_c_keep_simple_blocks_in_one_line = true
+ij_c_keep_simple_methods_in_one_line = true
+ij_c_keep_structures_in_one_line = false
+ij_c_lambda_capture_list_align_multiline = false
+ij_c_lambda_capture_list_align_multiline_bracket = false
+ij_c_lambda_capture_list_comma_on_next_line = false
+ij_c_lambda_capture_list_new_line_after_lbracket = false
+ij_c_lambda_capture_list_new_line_before_rbracket = false
+ij_c_lambda_capture_list_wrap = off
+ij_c_line_comment_add_space = false
+ij_c_line_comment_at_first_column = true
+ij_c_method_brace_placement = end_of_line
+ij_c_method_call_arguments_align_by_colons = true
+ij_c_method_call_arguments_align_multiline = false
+ij_c_method_call_arguments_special_dictionary_pairs_treatment = true
+ij_c_method_call_arguments_wrap = off
+ij_c_method_call_chain_wrap = off
+ij_c_method_parameters_align_by_colons = true
+ij_c_method_parameters_align_multiline = false
+ij_c_method_parameters_wrap = off
+ij_c_namespace_brace_placement = end_of_line
+ij_c_parentheses_expression_new_line_after_left_paren = false
+ij_c_parentheses_expression_right_paren_on_new_line = false
+ij_c_place_assignment_sign_on_next_line = false
+ij_c_property_nonatomic = true
+ij_c_put_ivars_to_implementation = true
+ij_c_refactor_compatibility_aliases_and_classes = true
+ij_c_refactor_properties_and_ivars = true
+ij_c_release_style = ivar
+ij_c_retain_object_parameters_in_constructor = true
+ij_c_semicolon_after_method_signature = false
+ij_c_shift_operation_align_multiline = true
+ij_c_shift_operation_wrap = normal
+ij_c_show_non_virtual_functions = false
+ij_c_space_after_colon = true
+ij_c_space_after_colon_in_foreach = true
+ij_c_space_after_colon_in_selector = false
+ij_c_space_after_comma = true
+ij_c_space_after_cup_in_blocks = false
+ij_c_space_after_dictionary_literal_colon = true
+ij_c_space_after_for_semicolon = true
+ij_c_space_after_init_list_colon = true
+ij_c_space_after_method_parameter_type_parentheses = false
+ij_c_space_after_method_return_type_parentheses = false
+ij_c_space_after_pointer_in_declaration = false
+ij_c_space_after_quest = true
+ij_c_space_after_reference_in_declaration = false
+ij_c_space_after_reference_in_rvalue = false
+ij_c_space_after_structures_rbrace = true
+ij_c_space_after_superclass_colon = true
+ij_c_space_after_type_cast = true
+ij_c_space_after_visibility_sign_in_method_declaration = true
+ij_c_space_before_autorelease_pool_lbrace = true
+ij_c_space_before_catch_keyword = true
+ij_c_space_before_catch_left_brace = true
+ij_c_space_before_catch_parentheses = true
+ij_c_space_before_category_parentheses = true
+ij_c_space_before_chained_send_message = true
+ij_c_space_before_class_left_brace = true
+ij_c_space_before_colon = true
+ij_c_space_before_colon_in_foreach = false
+ij_c_space_before_comma = false
+ij_c_space_before_dictionary_literal_colon = false
+ij_c_space_before_do_left_brace = true
+ij_c_space_before_else_keyword = true
+ij_c_space_before_else_left_brace = true
+ij_c_space_before_export_lbrace = true
+ij_c_space_before_for_left_brace = true
+ij_c_space_before_for_parentheses = true
+ij_c_space_before_for_semicolon = false
+ij_c_space_before_if_left_brace = true
+ij_c_space_before_if_parentheses = true
+ij_c_space_before_init_list = false
+ij_c_space_before_init_list_colon = true
+ij_c_space_before_method_call_parentheses = false
+ij_c_space_before_method_left_brace = true
+ij_c_space_before_method_parentheses = false
+ij_c_space_before_namespace_lbrace = true
+ij_c_space_before_pointer_in_declaration = true
+ij_c_space_before_property_attributes_parentheses = false
+ij_c_space_before_protocols_brackets = true
+ij_c_space_before_quest = true
+ij_c_space_before_reference_in_declaration = true
+ij_c_space_before_superclass_colon = true
+ij_c_space_before_switch_left_brace = true
+ij_c_space_before_switch_parentheses = true
+ij_c_space_before_template_call_lt = false
+ij_c_space_before_template_declaration_lt = false
+ij_c_space_before_try_left_brace = true
+ij_c_space_before_while_keyword = true
+ij_c_space_before_while_left_brace = true
+ij_c_space_before_while_parentheses = true
+ij_c_space_between_adjacent_brackets = false
+ij_c_space_between_operator_and_punctuator = false
+ij_c_space_within_empty_array_initializer_braces = false
+ij_c_spaces_around_additive_operators = true
+ij_c_spaces_around_assignment_operators = true
+ij_c_spaces_around_bitwise_operators = true
+ij_c_spaces_around_equality_operators = true
+ij_c_spaces_around_lambda_arrow = true
+ij_c_spaces_around_logical_operators = true
+ij_c_spaces_around_multiplicative_operators = true
+ij_c_spaces_around_pm_operators = false
+ij_c_spaces_around_relational_operators = true
+ij_c_spaces_around_shift_operators = true
+ij_c_spaces_around_unary_operator = false
+ij_c_spaces_within_array_initializer_braces = false
+ij_c_spaces_within_braces = true
+ij_c_spaces_within_brackets = false
+ij_c_spaces_within_cast_parentheses = false
+ij_c_spaces_within_catch_parentheses = false
+ij_c_spaces_within_category_parentheses = false
+ij_c_spaces_within_empty_braces = false
+ij_c_spaces_within_empty_function_call_parentheses = false
+ij_c_spaces_within_empty_function_declaration_parentheses = false
+ij_c_spaces_within_empty_lambda_capture_list_bracket = false
+ij_c_spaces_within_empty_template_call_ltgt = false
+ij_c_spaces_within_empty_template_declaration_ltgt = false
+ij_c_spaces_within_for_parentheses = false
+ij_c_spaces_within_function_call_parentheses = false
+ij_c_spaces_within_function_declaration_parentheses = false
+ij_c_spaces_within_if_parentheses = false
+ij_c_spaces_within_lambda_capture_list_bracket = false
+ij_c_spaces_within_method_parameter_type_parentheses = false
+ij_c_spaces_within_method_return_type_parentheses = false
+ij_c_spaces_within_parentheses = false
+ij_c_spaces_within_property_attributes_parentheses = false
+ij_c_spaces_within_protocols_brackets = false
+ij_c_spaces_within_send_message_brackets = false
+ij_c_spaces_within_structured_binding_list_bracket = false
+ij_c_spaces_within_switch_parentheses = false
+ij_c_spaces_within_template_call_ltgt = false
+ij_c_spaces_within_template_declaration_ltgt = false
+ij_c_spaces_within_template_double_gt = true
+ij_c_spaces_within_while_parentheses = false
+ij_c_special_else_if_treatment = true
+ij_c_structured_binding_list_align_multiline = false
+ij_c_structured_binding_list_align_multiline_bracket = false
+ij_c_structured_binding_list_comma_on_next_line = false
+ij_c_structured_binding_list_new_line_after_lbracket = false
+ij_c_structured_binding_list_new_line_before_rbracket = false
+ij_c_structured_binding_list_wrap = off
+ij_c_superclass_list_after_colon = never
+ij_c_superclass_list_align_multiline = true
+ij_c_superclass_list_before_colon = if_long
+ij_c_superclass_list_comma_on_next_line = false
+ij_c_superclass_list_wrap = on_every_item
+ij_c_tag_prefix_of_block_comment = at
+ij_c_tag_prefix_of_line_comment = back_slash
+ij_c_template_call_arguments_align_multiline = false
+ij_c_template_call_arguments_align_multiline_pars = false
+ij_c_template_call_arguments_comma_on_next_line = false
+ij_c_template_call_arguments_new_line_after_lt = false
+ij_c_template_call_arguments_new_line_before_gt = false
+ij_c_template_call_arguments_wrap = off
+ij_c_template_declaration_function_body_indent = false
+ij_c_template_declaration_function_wrap = split_into_lines
+ij_c_template_declaration_struct_body_indent = false
+ij_c_template_declaration_struct_wrap = split_into_lines
+ij_c_template_parameters_align_multiline = false
+ij_c_template_parameters_align_multiline_pars = false
+ij_c_template_parameters_comma_on_next_line = false
+ij_c_template_parameters_new_line_after_lt = false
+ij_c_template_parameters_new_line_before_gt = false
+ij_c_template_parameters_wrap = off
+ij_c_ternary_operation_signs_on_next_line = true
+ij_c_ternary_operation_wrap = normal
+ij_c_type_qualifiers_placement = before
+ij_c_use_modern_casts = true
+ij_c_use_setters_in_constructor = true
+ij_c_while_brace_force = never
+ij_c_while_on_new_line = false
+ij_c_wrap_property_declaration = off
+
+[{*.cmake,CMakeLists.txt}]
+ij_cmake_align_multiline_parameters_in_calls = false
+ij_cmake_force_commands_case = 2
+ij_cmake_keep_blank_lines_in_code = 2
+ij_cmake_space_before_for_parentheses = true
+ij_cmake_space_before_if_parentheses = true
+ij_cmake_space_before_method_call_parentheses = false
+ij_cmake_space_before_method_parentheses = false
+ij_cmake_space_before_while_parentheses = true
+ij_cmake_spaces_within_for_parentheses = false
+ij_cmake_spaces_within_if_parentheses = false
+ij_cmake_spaces_within_method_call_parentheses = false
+ij_cmake_spaces_within_method_parentheses = false
+ij_cmake_spaces_within_while_parentheses = false
+
+[{*.gant,*.groovy,*.gy}]
+ij_groovy_align_group_field_declarations = false
+ij_groovy_align_multiline_array_initializer_expression = false
+ij_groovy_align_multiline_assignment = false
+ij_groovy_align_multiline_binary_operation = false
+ij_groovy_align_multiline_chained_methods = false
+ij_groovy_align_multiline_extends_list = false
+ij_groovy_align_multiline_for = true
+ij_groovy_align_multiline_list_or_map = true
+ij_groovy_align_multiline_method_parentheses = false
+ij_groovy_align_multiline_parameters = true
+ij_groovy_align_multiline_parameters_in_calls = false
+ij_groovy_align_multiline_resources = true
+ij_groovy_align_multiline_ternary_operation = false
+ij_groovy_align_multiline_throws_list = false
+ij_groovy_align_named_args_in_map = true
+ij_groovy_align_throws_keyword = false
+ij_groovy_array_initializer_new_line_after_left_brace = false
+ij_groovy_array_initializer_right_brace_on_new_line = false
+ij_groovy_array_initializer_wrap = off
+ij_groovy_assert_statement_wrap = off
+ij_groovy_assignment_wrap = off
+ij_groovy_binary_operation_wrap = off
+ij_groovy_blank_lines_after_class_header = 0
+ij_groovy_blank_lines_after_imports = 1
+ij_groovy_blank_lines_after_package = 1
+ij_groovy_blank_lines_around_class = 1
+ij_groovy_blank_lines_around_field = 0
+ij_groovy_blank_lines_around_field_in_interface = 0
+ij_groovy_blank_lines_around_method = 1
+ij_groovy_blank_lines_around_method_in_interface = 1
+ij_groovy_blank_lines_before_imports = 1
+ij_groovy_blank_lines_before_method_body = 0
+ij_groovy_blank_lines_before_package = 0
+ij_groovy_block_brace_style = end_of_line
+ij_groovy_block_comment_add_space = false
+ij_groovy_block_comment_at_first_column = true
+ij_groovy_call_parameters_new_line_after_left_paren = false
+ij_groovy_call_parameters_right_paren_on_new_line = false
+ij_groovy_call_parameters_wrap = off
+ij_groovy_catch_on_new_line = false
+ij_groovy_class_annotation_wrap = split_into_lines
+ij_groovy_class_brace_style = end_of_line
+ij_groovy_class_count_to_use_import_on_demand = 5
+ij_groovy_do_while_brace_force = never
+ij_groovy_else_on_new_line = false
+ij_groovy_enable_groovydoc_formatting = true
+ij_groovy_enum_constants_wrap = off
+ij_groovy_extends_keyword_wrap = off
+ij_groovy_extends_list_wrap = off
+ij_groovy_field_annotation_wrap = split_into_lines
+ij_groovy_finally_on_new_line = false
+ij_groovy_for_brace_force = never
+ij_groovy_for_statement_new_line_after_left_paren = false
+ij_groovy_for_statement_right_paren_on_new_line = false
+ij_groovy_for_statement_wrap = off
+ij_groovy_ginq_general_clause_wrap_policy = 2
+ij_groovy_ginq_having_wrap_policy = 1
+ij_groovy_ginq_indent_having_clause = true
+ij_groovy_ginq_indent_on_clause = true
+ij_groovy_ginq_on_wrap_policy = 1
+ij_groovy_ginq_space_after_keyword = true
+ij_groovy_if_brace_force = never
+ij_groovy_import_annotation_wrap = 2
+ij_groovy_imports_layout = *,|,javax.**,java.**,|,$*
+ij_groovy_indent_case_from_switch = true
+ij_groovy_indent_label_blocks = true
+ij_groovy_insert_inner_class_imports = false
+ij_groovy_keep_blank_lines_before_right_brace = 2
+ij_groovy_keep_blank_lines_in_code = 2
+ij_groovy_keep_blank_lines_in_declarations = 2
+ij_groovy_keep_control_statement_in_one_line = true
+ij_groovy_keep_first_column_comment = true
+ij_groovy_keep_indents_on_empty_lines = false
+ij_groovy_keep_line_breaks = true
+ij_groovy_keep_multiple_expressions_in_one_line = false
+ij_groovy_keep_simple_blocks_in_one_line = false
+ij_groovy_keep_simple_classes_in_one_line = true
+ij_groovy_keep_simple_lambdas_in_one_line = true
+ij_groovy_keep_simple_methods_in_one_line = true
+ij_groovy_label_indent_absolute = false
+ij_groovy_label_indent_size = 0
+ij_groovy_lambda_brace_style = end_of_line
+ij_groovy_layout_static_imports_separately = true
+ij_groovy_line_comment_add_space = false
+ij_groovy_line_comment_add_space_on_reformat = false
+ij_groovy_line_comment_at_first_column = true
+ij_groovy_method_annotation_wrap = split_into_lines
+ij_groovy_method_brace_style = end_of_line
+ij_groovy_method_call_chain_wrap = off
+ij_groovy_method_parameters_new_line_after_left_paren = false
+ij_groovy_method_parameters_right_paren_on_new_line = false
+ij_groovy_method_parameters_wrap = off
+ij_groovy_modifier_list_wrap = false
+ij_groovy_names_count_to_use_import_on_demand = 3
+ij_groovy_packages_to_use_import_on_demand = java.awt.*,javax.swing.*
+ij_groovy_parameter_annotation_wrap = off
+ij_groovy_parentheses_expression_new_line_after_left_paren = false
+ij_groovy_parentheses_expression_right_paren_on_new_line = false
+ij_groovy_prefer_parameters_wrap = false
+ij_groovy_resource_list_new_line_after_left_paren = false
+ij_groovy_resource_list_right_paren_on_new_line = false
+ij_groovy_resource_list_wrap = off
+ij_groovy_space_after_assert_separator = true
+ij_groovy_space_after_colon = true
+ij_groovy_space_after_comma = true
+ij_groovy_space_after_comma_in_type_arguments = true
+ij_groovy_space_after_for_semicolon = true
+ij_groovy_space_after_quest = true
+ij_groovy_space_after_type_cast = true
+ij_groovy_space_before_annotation_parameter_list = false
+ij_groovy_space_before_array_initializer_left_brace = false
+ij_groovy_space_before_assert_separator = false
+ij_groovy_space_before_catch_keyword = true
+ij_groovy_space_before_catch_left_brace = true
+ij_groovy_space_before_catch_parentheses = true
+ij_groovy_space_before_class_left_brace = true
+ij_groovy_space_before_closure_left_brace = true
+ij_groovy_space_before_colon = true
+ij_groovy_space_before_comma = false
+ij_groovy_space_before_do_left_brace = true
+ij_groovy_space_before_else_keyword = true
+ij_groovy_space_before_else_left_brace = true
+ij_groovy_space_before_finally_keyword = true
+ij_groovy_space_before_finally_left_brace = true
+ij_groovy_space_before_for_left_brace = true
+ij_groovy_space_before_for_parentheses = true
+ij_groovy_space_before_for_semicolon = false
+ij_groovy_space_before_if_left_brace = true
+ij_groovy_space_before_if_parentheses = true
+ij_groovy_space_before_method_call_parentheses = false
+ij_groovy_space_before_method_left_brace = true
+ij_groovy_space_before_method_parentheses = false
+ij_groovy_space_before_quest = true
+ij_groovy_space_before_record_parentheses = false
+ij_groovy_space_before_switch_left_brace = true
+ij_groovy_space_before_switch_parentheses = true
+ij_groovy_space_before_synchronized_left_brace = true
+ij_groovy_space_before_synchronized_parentheses = true
+ij_groovy_space_before_try_left_brace = true
+ij_groovy_space_before_try_parentheses = true
+ij_groovy_space_before_while_keyword = true
+ij_groovy_space_before_while_left_brace = true
+ij_groovy_space_before_while_parentheses = true
+ij_groovy_space_in_named_argument = true
+ij_groovy_space_in_named_argument_before_colon = false
+ij_groovy_space_within_empty_array_initializer_braces = false
+ij_groovy_space_within_empty_method_call_parentheses = false
+ij_groovy_spaces_around_additive_operators = true
+ij_groovy_spaces_around_assignment_operators = true
+ij_groovy_spaces_around_bitwise_operators = true
+ij_groovy_spaces_around_equality_operators = true
+ij_groovy_spaces_around_lambda_arrow = true
+ij_groovy_spaces_around_logical_operators = true
+ij_groovy_spaces_around_multiplicative_operators = true
+ij_groovy_spaces_around_regex_operators = true
+ij_groovy_spaces_around_relational_operators = true
+ij_groovy_spaces_around_shift_operators = true
+ij_groovy_spaces_within_annotation_parentheses = false
+ij_groovy_spaces_within_array_initializer_braces = false
+ij_groovy_spaces_within_braces = true
+ij_groovy_spaces_within_brackets = false
+ij_groovy_spaces_within_cast_parentheses = false
+ij_groovy_spaces_within_catch_parentheses = false
+ij_groovy_spaces_within_for_parentheses = false
+ij_groovy_spaces_within_gstring_injection_braces = false
+ij_groovy_spaces_within_if_parentheses = false
+ij_groovy_spaces_within_list_or_map = false
+ij_groovy_spaces_within_method_call_parentheses = false
+ij_groovy_spaces_within_method_parentheses = false
+ij_groovy_spaces_within_parentheses = false
+ij_groovy_spaces_within_switch_parentheses = false
+ij_groovy_spaces_within_synchronized_parentheses = false
+ij_groovy_spaces_within_try_parentheses = false
+ij_groovy_spaces_within_tuple_expression = false
+ij_groovy_spaces_within_while_parentheses = false
+ij_groovy_special_else_if_treatment = true
+ij_groovy_ternary_operation_wrap = off
+ij_groovy_throws_keyword_wrap = off
+ij_groovy_throws_list_wrap = off
+ij_groovy_use_flying_geese_braces = false
+ij_groovy_use_fq_class_names = false
+ij_groovy_use_fq_class_names_in_javadoc = true
+ij_groovy_use_relative_indents = false
+ij_groovy_use_single_class_imports = true
+ij_groovy_variable_annotation_wrap = off
+ij_groovy_while_brace_force = never
+ij_groovy_while_on_new_line = false
+ij_groovy_wrap_chain_calls_after_dot = false
+ij_groovy_wrap_long_lines = false
+
+[{*.har,*.json}]
+indent_size = 2
+ij_json_array_wrapping = split_into_lines
+ij_json_keep_blank_lines_in_code = 0
+ij_json_keep_indents_on_empty_lines = false
+ij_json_keep_line_breaks = true
+ij_json_keep_trailing_comma = false
+ij_json_object_wrapping = split_into_lines
+ij_json_property_alignment = do_not_align
+ij_json_space_after_colon = true
+ij_json_space_after_comma = true
+ij_json_space_before_colon = false
+ij_json_space_before_comma = false
+ij_json_spaces_within_braces = false
+ij_json_spaces_within_brackets = false
+ij_json_wrap_long_lines = false
+
+[{*.htm,*.html,*.sht,*.shtm,*.shtml}]
+ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3
+ij_html_align_attributes = true
+ij_html_align_text = false
+ij_html_attribute_wrap = normal
+ij_html_block_comment_add_space = false
+ij_html_block_comment_at_first_column = true
+ij_html_do_not_align_children_of_min_lines = 0
+ij_html_do_not_break_if_inline_tags = title,h1,h2,h3,h4,h5,h6,p
+ij_html_do_not_indent_children_of_tags = html,body,thead,tbody,tfoot
+ij_html_enforce_quotes = false
+ij_html_inline_tags = a,abbr,acronym,b,basefont,bdo,big,br,cite,cite,code,dfn,em,font,i,img,input,kbd,label,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var
+ij_html_keep_blank_lines = 2
+ij_html_keep_indents_on_empty_lines = false
+ij_html_keep_line_breaks = true
+ij_html_keep_line_breaks_in_text = true
+ij_html_keep_whitespaces = false
+ij_html_keep_whitespaces_inside = span,pre,textarea
+ij_html_line_comment_at_first_column = true
+ij_html_new_line_after_last_attribute = never
+ij_html_new_line_before_first_attribute = never
+ij_html_quote_style = double
+ij_html_remove_new_line_before_tags = br
+ij_html_space_after_tag_name = false
+ij_html_space_around_equality_in_attribute = false
+ij_html_space_inside_empty_tag = false
+ij_html_text_wrap = normal
+
+[{*.kt,*.kts}]
+ij_kotlin_align_in_columns_case_branch = false
+ij_kotlin_align_multiline_binary_operation = false
+ij_kotlin_align_multiline_extends_list = false
+ij_kotlin_align_multiline_method_parentheses = false
+ij_kotlin_align_multiline_parameters = true
+ij_kotlin_align_multiline_parameters_in_calls = false
+ij_kotlin_allow_trailing_comma = false
+ij_kotlin_allow_trailing_comma_on_call_site = false
+ij_kotlin_assignment_wrap = off
+ij_kotlin_blank_lines_after_class_header = 0
+ij_kotlin_blank_lines_around_block_when_branches = 0
+ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
+ij_kotlin_block_comment_add_space = false
+ij_kotlin_block_comment_at_first_column = true
+ij_kotlin_call_parameters_new_line_after_left_paren = false
+ij_kotlin_call_parameters_right_paren_on_new_line = false
+ij_kotlin_call_parameters_wrap = off
+ij_kotlin_catch_on_new_line = false
+ij_kotlin_class_annotation_wrap = split_into_lines
+ij_kotlin_continuation_indent_for_chained_calls = true
+ij_kotlin_continuation_indent_for_expression_bodies = true
+ij_kotlin_continuation_indent_in_argument_lists = true
+ij_kotlin_continuation_indent_in_elvis = true
+ij_kotlin_continuation_indent_in_if_conditions = true
+ij_kotlin_continuation_indent_in_parameter_lists = true
+ij_kotlin_continuation_indent_in_supertype_lists = true
+ij_kotlin_else_on_new_line = false
+ij_kotlin_enum_constants_wrap = off
+ij_kotlin_extends_list_wrap = off
+ij_kotlin_field_annotation_wrap = split_into_lines
+ij_kotlin_finally_on_new_line = false
+ij_kotlin_if_rparen_on_new_line = false
+ij_kotlin_import_nested_classes = false
+ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
+ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
+ij_kotlin_keep_blank_lines_before_right_brace = 2
+ij_kotlin_keep_blank_lines_in_code = 2
+ij_kotlin_keep_blank_lines_in_declarations = 2
+ij_kotlin_keep_first_column_comment = true
+ij_kotlin_keep_indents_on_empty_lines = false
+ij_kotlin_keep_line_breaks = true
+ij_kotlin_lbrace_on_next_line = false
+ij_kotlin_line_break_after_multiline_when_entry = true
+ij_kotlin_line_comment_add_space = false
+ij_kotlin_line_comment_add_space_on_reformat = false
+ij_kotlin_line_comment_at_first_column = true
+ij_kotlin_method_annotation_wrap = split_into_lines
+ij_kotlin_method_call_chain_wrap = off
+ij_kotlin_method_parameters_new_line_after_left_paren = false
+ij_kotlin_method_parameters_right_paren_on_new_line = false
+ij_kotlin_method_parameters_wrap = off
+ij_kotlin_name_count_to_use_star_import = 2147483647
+ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
+ij_kotlin_packages_to_use_import_on_demand = java.util.*,kotlinx.android.synthetic.**,io.ktor.**
+ij_kotlin_parameter_annotation_wrap = off
+ij_kotlin_space_after_comma = true
+ij_kotlin_space_after_extend_colon = true
+ij_kotlin_space_after_type_colon = true
+ij_kotlin_space_before_catch_parentheses = true
+ij_kotlin_space_before_comma = false
+ij_kotlin_space_before_extend_colon = true
+ij_kotlin_space_before_for_parentheses = true
+ij_kotlin_space_before_if_parentheses = true
+ij_kotlin_space_before_lambda_arrow = true
+ij_kotlin_space_before_type_colon = false
+ij_kotlin_space_before_when_parentheses = true
+ij_kotlin_space_before_while_parentheses = true
+ij_kotlin_spaces_around_additive_operators = true
+ij_kotlin_spaces_around_assignment_operators = true
+ij_kotlin_spaces_around_equality_operators = true
+ij_kotlin_spaces_around_function_type_arrow = true
+ij_kotlin_spaces_around_logical_operators = true
+ij_kotlin_spaces_around_multiplicative_operators = true
+ij_kotlin_spaces_around_range = false
+ij_kotlin_spaces_around_relational_operators = true
+ij_kotlin_spaces_around_unary_operator = false
+ij_kotlin_spaces_around_when_arrow = true
+ij_kotlin_use_custom_formatting_for_modifiers = true
+ij_kotlin_variable_annotation_wrap = off
+ij_kotlin_while_on_new_line = false
+ij_kotlin_wrap_elvis_expressions = 1
+ij_kotlin_wrap_expression_body_functions = 0
+ij_kotlin_wrap_first_method_in_call_chain = false
+
+[{*.markdown,*.md}]
+ij_markdown_force_one_space_after_blockquote_symbol = true
+ij_markdown_force_one_space_after_header_symbol = true
+ij_markdown_force_one_space_after_list_bullet = true
+ij_markdown_force_one_space_between_words = true
+ij_markdown_format_tables = true
+ij_markdown_insert_quote_arrows_on_wrap = true
+ij_markdown_keep_indents_on_empty_lines = false
+ij_markdown_keep_line_breaks_inside_text_blocks = true
+ij_markdown_max_lines_around_block_elements = 1
+ij_markdown_max_lines_around_header = 1
+ij_markdown_max_lines_between_paragraphs = 1
+ij_markdown_min_lines_around_block_elements = 1
+ij_markdown_min_lines_around_header = 1
+ij_markdown_min_lines_between_paragraphs = 1
+ij_markdown_wrap_text_if_long = true
+ij_markdown_wrap_text_inside_blockquotes = true
+
+[{*.toml,Cargo.lock,Cargo.toml.orig,Gopkg.lock,Pipfile,poetry.lock}]
+ij_toml_keep_indents_on_empty_lines = false

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

CONTRIBUTING.md

@@ -1,18 +1,25 @@
 # How to contribute?
 
-## Testing 
+## Testing
 
-Just use OpenTracks and tell us what can be improved by opening an issue [here](https://github.com/OpenTracksApp/OpenTracks/issues/new/choose)
+Just use OpenTracks and tell us what can be improved by opening an
+issue [here](https://github.com/OpenTracksApp/OpenTracks/issues/new/choose)
 
 If we broke things (happens now and then), please tell us also.
 
+## Translations
+
+Translations are hosted on [hosted.weblate.org](https://hosted.weblate.org/engage/opentracks/).
+
 ## Coding new features
 
 You have a cool idea for a feature that is missing in OpenTracks?
 And you would like to help by implementing it?
-If not, you can just take a look at the [issue tracker](https://github.com/OpenTracksApp/OpenTracks/issues).
+If not, you can just take a look at
+the [issue tracker](https://github.com/OpenTracksApp/OpenTracks/issues).
 
 Advices:
+
 * creating an issue beforehand might be a good idea
   Sometimes it is helpful to discuss your idea and also your implementation approach first.
   We may be able to give you some hints on how to tackle the problem.

README_TESTED_SENSORS.md

@@ -59,16 +59,38 @@ We do not support type of movement (i.e., walking vs running).
 
 ## Tested Barometric Sensor Smartphones
 
-There are smartphones that have a barometric sensor that OpenTracks uses to compute altitude gain and loss.
+OpenTracks derives the altitude gain and altitude loss using the internal barometric sensor of a device (if present).
+However, barometric sensor seem to be prone to a lot of noise.
+This may either be a malfunctioning sensor, a case that prevents the device from measuring, or something else. 
 
-In our tests there are smartphones whose barometric sensor works well and others don't. Here is a list of the smartphones tested:
+To check if the barometric sensor of a device is working with OpenTracks:
+1. Record a track (ca. 1min) with the device stationary.
+   Expectation: 0m gain and 0m loss should.
+2. Record a track (ca. 1min) while shaking the device.
+   Expectation: 0m gain and 0m loss should.
+3. Record a track (ca. 1min) while moving the device up (less than 3m difference between highest and lowest point).
+   Expectation: 0m gain and 0m loss should.
+4. Record a track walking up some stairs or taking an elevator.
+   Expectation: some gain and some loss is recorded that seems realistic.
 
-| Brand  | Model              | Android Version | Tests                                                                          |
-|--------|--------------------|-----------------|--------------------------------------------------------------------------------|
-| Google | Pixel              | LineageOS 17.1  | Ok                                                                             |
-| Google | Pixel 2 XL         | LineageOS 17.1  | Ok on the bike handlebars but it fails when I carry it in a pocket or backpack |
-| Google | Pixel 3            | Android 11      | Failure                                                                        |
-| Google | Pixel 3a           | Android 11      | Ok                                                                             |
-| Google | Pixel 3a           | Lineage 18.1    | Ok                                                                             |
-| Google | Pixel 4a           | Android 11      | Ok                                                                             |
-| Sony   | Xperia XZ1 Compact | LineageOS 16.1  | Failure                                                                        |
+If any of these tests do **not** show expected values for gain/loss, OpenTracks will not show useful values.
+
+Please note that OpenTracks:
+* only records gain/loss if +/- 3m to the initial/previous of are measured to the previous
+* solely uses the barometric sensor for gain/loss; GPS is not used for this.
+
+In our tests there are smartphones whose barometric sensor works well and others don't. 
+
+Here is a list of the smartphones tested:
+
+| Brand   | Model              | Android Version | Tests                                                                          |
+|---------|--------------------|-----------------|--------------------------------------------------------------------------------|
+| Google  | Pixel              | LineageOS 17.1  | Ok                                                                             |
+| Google  | Pixel 2 XL         | LineageOS 17.1  | Ok on the bike handlebars but it fails when I carry it in a pocket or backpack |
+| Google  | Pixel 3            | Android 11      | Failure                                                                        |
+| Google  | Pixel 3a           | Android 11      | Ok                                                                             |
+| Google  | Pixel 3a           | Lineage 18.1    | Ok                                                                             |
+| Google  | Pixel 4a           | Android 11      | Ok                                                                             |
+| Google  | Nexus 4            | LineageOS 18.1  | Ok                                                                             |
+| Samsung | S4                 | Android 11      | Ok                                                                             |
+| Sony    | Xperia XZ1 Compact | LineageOS 16.1  | Failure                                                                        |

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0-beta04'
+        classpath 'com.android.tools.build:gradle:8.1.0'
     }
 }
 
@@ -64,12 +64,12 @@ android {
 
     defaultConfig {
         applicationId "de.dennisguse.opentracks"
-        versionCode 5262
-        versionName "v4.5.0"
+        versionCode 5313
+        versionName "v4.7.0"
 
         buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
 
-        minSdk 21
+        minSdk 24
         targetSdk 34
 
         testInstrumentationRunner "de.dennisguse.opentracks.TestRunner"
@@ -128,7 +128,7 @@ dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'androidx.preference:preference:1.2.1'
     implementation 'androidx.documentfile:documentfile:1.0.1'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'com.google.android.material:material:1.9.0'

fastlane/metadata/android/en-US/changelogs/5286.txt

@@ -0,0 +1,12 @@
+v4.6.0: OpenTracks
+
+Changes:
+- Voice announcements use ICU plural format (en, es, pt, zh, dr, de) due to fractional quanitites #1584
+- Requires Android 7.0 / SDK24+ due to ICU plurals
+- On Android 14+: use Android's AltitudeConverter instead of internal EGM2008
+
+Bugfix:
+- Android 13 couldn't select images from gallery
+
+Developer:
+- Split ActivityType and ActivityIcon

fastlane/metadata/android/en-US/changelogs/5289.txt

@@ -0,0 +1,5 @@
+v4.6.1: OpenTracks
+
+Bugfix:
+- Re-added aggregated statistics per selected tracks
+

fastlane/metadata/android/en-US/changelogs/5305.txt

@@ -0,0 +1,8 @@
+v4.6.2: OpenTracks
+
+Bugfix:
+- Crash on voice annoucement for imperial+meter
+- Crash on settings for imperial+meter
+- Fixed clipping of charts (Material3 upgrade)
+- Bluetooth settings handle missing permission
+- Aggregated stats didn't show imperial units for avg speed

fastlane/metadata/android/en-US/changelogs/5313.txt

@@ -0,0 +1,11 @@
+v4.7.0: OpenTracks
+
+Changes:
+- Statistics: distance, total time, and moving time are included between automatic segments (created due to distance too previous location too long)
+- Recorded tracks show sensor statistics again
+
+Bugfix:
+- GPX exporter: for automatic segments their might be no location
+- CSV exporter: distance didn't use decimal grouping
+
+

fastlane/metadata/android/gl-ES/changelogs/5222.txt

@@ -0,0 +1,4 @@
+v4.4.0: OpenTracks
+
+Cambios:
+- Exportar todas as rutas nun único ficheiro

fastlane/metadata/android/gl-ES/changelogs/5262.txt

@@ -0,0 +1,14 @@
+v4.5.0: OpenTracks
+
+Cambios:
+- Material3 
+- Atallo na app para estatísticas acumuladas
+- Nova unidade: millas con metros
+
+Arranxo:
+- avisos repetidos do GPS desactivado (#1429)
+
+Desenvolvemento:
+- Utilizar Java Records
+- Obxectivo API34
+- Refactorización da xestión dos sensores

fastlane/metadata/android/gl-ES/changelogs/5286.txt

@@ -0,0 +1,12 @@
+v4.6.0: OpenTracks
+
+Cambios:
+- Anuncios por voz usando o formato de plurais ICU (en, es, pt, zh, dr, de) debido ás cantidades en fraccións #1584
+- Require Android 7.0 / SDK24+ debido aos plurais ICU
+- En Android 14+: usar o conversor AltitudeConverter de Android no lugar do interno EGM2008
+
+Arrranxo:
+- Non se podía escoller unha imaxe da galería en Android 13
+
+Desenvolvemento:
+- Separamos ActivityType e ActivityIcon

fastlane/metadata/android/gl-ES/changelogs/5289.txt

@@ -0,0 +1,4 @@
+v4.6.1: OpenTracks
+
+Arranxo:
+- Volvemos a engadir estatísticas conxuntas para as rutas seleccionadas

fastlane/metadata/android/gl-ES/changelogs/next_release.txt

@@ -0,0 +1,10 @@
+(versionName): OpenTracks
+
+Cambios:
+-
+
+Arranxos:
+-
+
+Programadora:
+-

fastlane/metadata/android/gl-ES/full_description.txt

@@ -0,0 +1,22 @@
+Gravador de actividades deportivas que respecta a túa privacidade.
+
+As actividades deportivas e ao aire libre proporcionanche felicidade, destreza e confianza.
+
+Dalle valor á túa saúde facendo un seguimento dos teus adestramentos.
+Grava mentras saes a correr ou camiñar, e será un ciclocomputador cunha pantalla máis grande e clara.
+Marca as localizacións interesantes na ruta podendo engadir unha imaxe.
+Garda un rexistro das túas estatísticas con gran detalle e análise.
+Comparte só os datos que outras persoas poden ver.
+
+* Anuncios por voz.
+* Soporte para sensores Bluetooth LE: de frecuencia cardíaca, velocidade e distancia (ciclismo), cadencia (ciclismo), e de potencia (ciclismo).
+* Gañancia e perda de altitude: a través do sensor barométrico.
+* Altitude mostrada en EGM2008 (sobre o nivel do mar); exportada como WGS84.
+* Exporta os datos como rutas tanto como KMZ (inclúe fotos), KML, ou GPX.
+* Non precisa conexión a internet ou permisos extra.
+* Decorado escuro, claro, ou seguindo os axustes do sistema.
+* Sen publicidade.
+
+Software Libre / Free Software / Open Source
+significa que podes usar, estudar, cambiar e compartir o código fonte.
+Licenza Apache 2.0

fastlane/metadata/android/gl-ES/short_description.txt

@@ -0,0 +1 @@
+Gravador de actividades que respecta a túa privacidade.

fastlane/metadata/android/gl-ES/title.txt

@@ -0,0 +1 @@
+OpenTracks

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

src/androidTest/java/de/dennisguse/opentracks/EspressoEditTrackRecordingTest.java

@@ -15,8 +15,6 @@ import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.Matchers.allOf;
 import static de.dennisguse.opentracks.util.EspressoUtils.waitFor;
 
-import android.Manifest;
-
 import androidx.test.espresso.ViewInteraction;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;

src/androidTest/java/de/dennisguse/opentracks/EspressoUITest.java

@@ -13,8 +13,6 @@ import static org.hamcrest.Matchers.anything;
 import static de.dennisguse.opentracks.util.EspressoUtils.selectTabAtIndex;
 import static de.dennisguse.opentracks.util.EspressoUtils.waitFor;
 
-import android.Manifest;
-
 import androidx.test.espresso.ViewInteraction;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;

src/androidTest/java/de/dennisguse/opentracks/TestUtil.java

@@ -5,8 +5,6 @@ import android.os.Build;
 
 import androidx.test.rule.GrantPermissionRule;
 
-import de.dennisguse.opentracks.test.BuildConfig;
-
 public class TestUtil {
 
     public static GrantPermissionRule createGrantPermissionRule() {

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java

@@ -46,6 +46,7 @@ import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.TimezoneRule;
 import de.dennisguse.opentracks.content.data.TestDataUtil;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.Cadence;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.HeartRate;
@@ -95,8 +96,8 @@ public class ExportImportTest {
 
     private final ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);
 
-    private static final String TRACK_ICON = "the track icon";
-    private static final String TRACK_ACTIVITY_TYPE = "the activity type";
+    private static final ActivityType TRACK_ACTIVITY_TYPE = ActivityType.MOUNTAIN_BIKING;
+    private static final String TRACK_ACTIVITY_TYPE_LOCALIZED = "the activity type";
     private static final String TRACK_DESCRIPTION = "the description";
 
     private File tmpFile;
@@ -180,8 +181,8 @@ public class ExportImportTest {
         service.endCurrentTrack();
 
         Track track = contentProviderUtils.getTrack(trackId);
-        track.setIcon(TRACK_ICON);
         track.setActivityType(TRACK_ACTIVITY_TYPE);
+        track.setActivityTypeLocalized(TRACK_ACTIVITY_TYPE_LOCALIZED);
         track.setDescription(TRACK_DESCRIPTION);
         contentProviderUtils.updateTrack(track);
 
@@ -192,7 +193,7 @@ public class ExportImportTest {
         assertEquals(2, markers.size());
     }
 
-    //TODO Does not test images
+    //TODO Does not test marker images
     @LargeTest
     @Test
     public void kmz_with_trackdetail_and_sensordata() throws TimeoutException, IOException {
@@ -201,7 +202,7 @@ public class ExportImportTest {
         // given
         Track track = contentProviderUtils.getTrack(trackId);
 
-        TrackExporter trackExporter = TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA.createTrackExporter(context, contentProviderUtils);
+        TrackExporter trackExporter = TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES.createTrackExporter(context, contentProviderUtils);
 
         // when
         // 1. export
@@ -216,10 +217,10 @@ public class ExportImportTest {
         // 1. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals(track.getActivityType(), importedTrack.getActivityType());
+        assertEquals(track.getActivityTypeLocalized(), importedTrack.getActivityTypeLocalized());
         assertEquals(track.getDescription(), importedTrack.getDescription());
         assertEquals(track.getName(), importedTrack.getName());
-        assertEquals(track.getIcon(), importedTrack.getIcon());
+        assertEquals(track.getActivityType(), importedTrack.getActivityType());
 
         // 2. trackpoints
         TrackPointAssert a = new TrackPointAssert();
@@ -237,24 +238,24 @@ public class ExportImportTest {
         TrackStatistics originalTrackStatistics = track.getTrackStatistics();
 
         assertEquals(originalTrackStatistics.getTotalTime(), importedTrackStatistics.getTotalTime());
-        assertEquals(Duration.ofSeconds(19), importedTrackStatistics.getTotalTime());
+        assertEquals(Duration.ofSeconds(20), importedTrackStatistics.getTotalTime());
 
         assertEquals(originalTrackStatistics.getMovingTime(), importedTrackStatistics.getMovingTime());
-        assertEquals(Duration.ofSeconds(3), importedTrackStatistics.getMovingTime());
+        assertEquals(Duration.ofSeconds(4), importedTrackStatistics.getMovingTime());
 
         // Distance
         assertEquals(originalTrackStatistics.getTotalDistance(), importedTrackStatistics.getTotalDistance());
-        assertEquals(125.16, importedTrackStatistics.getTotalDistance().toM(), 0.01);
+        assertEquals(222238.70, importedTrackStatistics.getTotalDistance().toM(), 0.01);
 
         // Speed
         assertEquals(originalTrackStatistics.getMaxSpeed(), importedTrackStatistics.getMaxSpeed());
-        assertEquals(41.72, importedTrackStatistics.getMaxSpeed().toMPS(), 0.01);
+        assertEquals(55559.67, importedTrackStatistics.getMaxSpeed().toMPS(), 0.01);
 
         assertEquals(originalTrackStatistics.getAverageSpeed(), importedTrackStatistics.getAverageSpeed());
-        assertEquals(6.58, importedTrackStatistics.getAverageSpeed().toMPS(), 0.01);
+        assertEquals(11111.93, importedTrackStatistics.getAverageSpeed().toMPS(), 0.01);
 
         assertEquals(originalTrackStatistics.getAverageMovingSpeed(), importedTrackStatistics.getAverageMovingSpeed());
-        assertEquals(41.72, importedTrackStatistics.getMaxSpeed().toMPS(), 0.01);
+        assertEquals(55559.67, importedTrackStatistics.getMaxSpeed().toMPS(), 0.01);
 
         // Altitude
         assertEquals(originalTrackStatistics.getMinAltitude(), importedTrackStatistics.getMinAltitude(), 0.01);
@@ -323,7 +324,7 @@ public class ExportImportTest {
         // 1. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals(track.getActivityType(), importedTrack.getActivityType());
+        assertEquals(track.getActivityTypeLocalized(), importedTrack.getActivityTypeLocalized());
         assertEquals(track.getDescription(), importedTrack.getDescription());
         assertEquals(track.getName(), importedTrack.getName());
 
@@ -393,16 +394,16 @@ public class ExportImportTest {
         assertEquals(Instant.parse("2020-02-02T02:02:03Z"), importedTrackStatistics.getStartTime());
         assertEquals(Instant.parse("2020-02-02T02:03:23Z"), importedTrackStatistics.getStopTime());
 
-        assertEquals(Duration.ofSeconds(15), importedTrackStatistics.getTotalTime());
-        assertEquals(Duration.ofSeconds(15), importedTrackStatistics.getMovingTime());
+        assertEquals(Duration.ofSeconds(80), importedTrackStatistics.getTotalTime());
+        assertEquals(Duration.ofSeconds(80), importedTrackStatistics.getMovingTime());
 
         // Distance
-        assertEquals(125.16, importedTrackStatistics.getTotalDistance().toM(), 0.01);
+        assertEquals(222349.85, importedTrackStatistics.getTotalDistance().toM(), 0.01);
 
         // Speed
-        assertEquals(8.34, importedTrackStatistics.getMaxSpeed().toMPS(), 0.01);
-        assertEquals(8.34, importedTrackStatistics.getAverageSpeed().toMPS(), 0.01);
-        assertEquals(8.34, importedTrackStatistics.getAverageMovingSpeed().toMPS(), 0.01);
+        assertEquals(2779.37, importedTrackStatistics.getMaxSpeed().toMPS(), 0.01);
+        assertEquals(2779.37, importedTrackStatistics.getAverageSpeed().toMPS(), 0.01);
+        assertEquals(2779.37, importedTrackStatistics.getAverageMovingSpeed().toMPS(), 0.01);
 
         // Altitude
         assertEquals(10, importedTrackStatistics.getMinAltitude(), 0.01);

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporterTest.java

@@ -28,6 +28,7 @@ import java.util.stream.Collectors;
 
 import de.dennisguse.opentracks.content.data.TestDataUtil;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.data.models.Track;
@@ -79,10 +80,10 @@ public class GPXTrackImporterTest {
         // 2. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals("the category", importedTrack.getActivityType());
+        assertEquals("the category", importedTrack.getActivityTypeLocalized());
         assertEquals("the description", importedTrack.getDescription());
         assertEquals("2021-01-07 22:51", importedTrack.getName());
-        assertEquals("UNKNOWN", importedTrack.getIcon());
+        assertEquals(ActivityType.UNKNOWN, importedTrack.getActivityType());
 
         //TODO Check trackstatistics
 
@@ -133,10 +134,10 @@ public class GPXTrackImporterTest {
         // 2. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals("", importedTrack.getActivityType());
+        assertEquals("", importedTrack.getActivityTypeLocalized());
         assertEquals("", importedTrack.getDescription());
         assertEquals("20210907_213924.gpx", importedTrack.getName());
-        assertEquals("", importedTrack.getIcon());
+        assertEquals(ActivityType.UNKNOWN, importedTrack.getActivityType());
 
         // 3. trackstatistics
         TrackStatistics trackStatistics = importedTrack.getTrackStatistics();
@@ -181,10 +182,10 @@ public class GPXTrackImporterTest {
         // 2. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals("", importedTrack.getActivityType());
+        assertEquals("", importedTrack.getActivityTypeLocalized());
         assertEquals("", importedTrack.getDescription());
         assertEquals("20210907_213924.gpx", importedTrack.getName());
-        assertEquals("", importedTrack.getIcon());
+        assertEquals(ActivityType.UNKNOWN, importedTrack.getActivityType());
 
         // 3. trackstatistics
         TrackStatistics trackStatistics = importedTrack.getTrackStatistics();

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporterTest.java

@@ -22,6 +22,7 @@ import java.util.List;
 
 import de.dennisguse.opentracks.content.data.TestDataUtil;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.data.models.Track;
@@ -70,10 +71,10 @@ public class KMLTrackImporterTest {
         // 1. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals("", importedTrack.getActivityType());
+        assertEquals("", importedTrack.getActivityTypeLocalized());
         assertEquals("", importedTrack.getDescription());
         assertEquals("", importedTrack.getName());
-        assertEquals("", importedTrack.getIcon());
+        assertEquals(ActivityType.UNKNOWN, importedTrack.getActivityType());
 
         // 2. markers
         assertEquals(0, contentProviderUtils.getMarkers(importTrackId).size());
@@ -119,10 +120,10 @@ public class KMLTrackImporterTest {
         // 1. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals("", importedTrack.getActivityType());
+        assertEquals("", importedTrack.getActivityTypeLocalized());
         assertEquals("", importedTrack.getDescription());
         assertEquals("", importedTrack.getName());
-        assertEquals("", importedTrack.getIcon());
+        assertEquals(ActivityType.UNKNOWN, importedTrack.getActivityType());
 
         // 2. markers
         assertEquals(0, contentProviderUtils.getMarkers(importTrackId).size());
@@ -159,10 +160,10 @@ public class KMLTrackImporterTest {
         // 1. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals("unknown", importedTrack.getActivityType());
+        assertEquals("unknown", importedTrack.getActivityTypeLocalized());
         assertEquals("Test Track", importedTrack.getDescription());
         assertEquals("2020-11-28 18:06", importedTrack.getName());
-        assertEquals("UNKNOWN", importedTrack.getIcon());
+        assertEquals(ActivityType.UNKNOWN, importedTrack.getActivityType());
 
         // 2. markers
         assertEquals(0, contentProviderUtils.getMarkers(importTrackId).size());

src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestRecording.java

@@ -765,7 +765,7 @@ public class TrackRecordingServiceTestRecording {
         TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps2, 45.1, 35.0, 1, 15);
 
         // then
-        assertEquals(new TrackStatistics(startTime, gps2, 0, 1, 0, 0, 0f, 0f), contentProviderUtils.getTrack(trackId).getTrackStatistics());
+        assertEquals(new TrackStatistics(startTime, gps2, 11113.275390625, 4, 3, 3704.4251302083335f, 0f, 0f).toString(), contentProviderUtils.getTrack(trackId).getTrackStatistics().toString());
 
 
         // when
@@ -774,8 +774,7 @@ public class TrackRecordingServiceTestRecording {
         service.endCurrentTrack();
 
         // then
-        assertEquals(new TrackStatistics(startTime, stopTime, 0, 7, 0, 0, 0f, 0f)
-                , contentProviderUtils.getTrack(trackId).getTrackStatistics());
+        assertEquals(new TrackStatistics(startTime, stopTime, 11113.275390625, 10, 3, 3704.4251302083335f, 0f, 0f).toString(), contentProviderUtils.getTrack(trackId).getTrackStatistics().toString());
 
 
         // then

src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestUtils.java

@@ -5,8 +5,6 @@ import android.location.Location;
 
 import androidx.test.rule.ServiceTestRule;
 
-import java.util.concurrent.TimeoutException;
-
 import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 
@@ -16,7 +14,7 @@ public class TrackRecordingServiceTestUtils {
     //TODO Workaround as service is not stopped on API23; thus sharedpreferences are not reset between tests.
     //TODO Anyhow, the service should re-create all it's resources if a recording starts and makes sure that there is no leftovers from previous recordings.
     @Deprecated
-    public static void resetService(ServiceTestRule mServiceRule, Context context) throws TimeoutException {
+    public static void resetService(ServiceTestRule mServiceRule, Context context) {
         // Let's use default values.
         PreferencesUtils.clear();
     }

src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java

@@ -3,6 +3,7 @@ package de.dennisguse.opentracks.services.announcement;
 import static org.junit.Assert.assertEquals;
 
 import android.content.Context;
+import android.icu.text.MessageFormat;
 import android.util.Pair;
 
 import androidx.test.core.app.ApplicationProvider;
@@ -15,6 +16,7 @@ import org.junit.runner.RunWith;
 
 import java.time.Duration;
 import java.util.Locale;
+import java.util.Map;
 
 import de.dennisguse.opentracks.LocaleRule;
 import de.dennisguse.opentracks.content.data.TestDataUtil;
@@ -191,6 +193,48 @@ public class VoiceAnnouncementUtilsTest {
         assertEquals("Total distance 12.4 miles. 1 hour 5 minutes 10 seconds. Average moving speed 11.4 miles per hour.", announcement);
     }
 
+    @Test
+    public void getAnnouncement_imperial_speed_1() {
+        TrackStatistics stats = new TrackStatistics();
+        stats.setTotalDistance(Distance.ofMile(1.1));
+        stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10));
+        stats.setMovingTime(Duration.ofHours(1));
+
+        // when
+        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL_FEET, true, null, null).toString();
+
+        // then
+        assertEquals("Total distance 1.1 miles. 1 hour. Average moving speed 1.1 miles per hour.", announcement);
+    }
+
+    @Test
+    public void getAnnouncement_imperial_meter_speed_1() {
+        TrackStatistics stats = new TrackStatistics();
+        stats.setTotalDistance(Distance.ofMile(1.1));
+        stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10));
+        stats.setMovingTime(Duration.ofHours(1));
+
+        // when
+        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL_METER, true, null, null).toString();
+
+        // then
+        assertEquals("Total distance 1.1 miles. 1 hour. Average moving speed 1.1 miles per hour.", announcement);
+    }
+
+    @Test
+    public void getAnnouncement_metric_speed_1() {
+        TrackStatistics stats = new TrackStatistics();
+        stats.setTotalDistance(Distance.ofKilometer(1.1));
+        stats.setTotalTime(Duration.ofHours(2).plusMinutes(5).plusSeconds(10));
+        stats.setMovingTime(Duration.ofHours(1));
+
+        // when
+        String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString();
+
+        // then
+        assertEquals("Total distance 1.1 kilometers. 1 hour. Average moving speed 1.1 kilometers per hour.", announcement);
+    }
+
     @Test
     public void getAnnouncement_withInterval_imperial_speed() {
         // given
@@ -306,4 +350,19 @@ public class VoiceAnnouncementUtilsTest {
         // then
         assertEquals(" Current heart rate 133 bpm.", announcement);
     }
+
+    @Test
+    public void ICUMessageDemo() {
+        // Android 7's ICU MessageFormat; working
+        String template = """
+                {n, plural,
+                one {1 mile}
+                other {{n,number,#.#} miles}
+                }""";
+
+        assertEquals("1.1 miles", MessageFormat.format(template, Map.of("n", 1.1)));
+        assertEquals("1 mile", MessageFormat.format(template, Map.of("n", 1)));
+        assertEquals("1.1 miles", MessageFormat.format(template, Map.of("n", 1.11)));
+        assertEquals("1.2 miles", MessageFormat.format(template, Map.of("n", 1.18)));
+    }
 }

src/androidTest/java/de/dennisguse/opentracks/share/DescriptionGeneratorTest.java

@@ -80,7 +80,7 @@ public class DescriptionGeneratorTest {
         stats.setTotalAltitudeLoss(6000f);
         stats.setStartTime(START_TIME);
         track.setTrackStatistics(stats);
-        track.setActivityType("hiking");
+        track.setActivityTypeLocalized("hiking");
         String expected = //"Created by"
                 "<a href='https://github.com/OpenTracksApp/OpenTracks'>OpenTracks (Debug)</a><p>"
                         + "Name: -<br>"
@@ -118,7 +118,7 @@ public class DescriptionGeneratorTest {
         stats.setTotalAltitudeLoss(6000f);
         stats.setStartTime(START_TIME);
         track.setTrackStatistics(stats);
-        track.setActivityType("hiking");
+        track.setActivityTypeLocalized("hiking");
         String expected = //"Created by"
                 "<a href='https://github.com/OpenTracksApp/OpenTracks'>OpenTracks (Debug)</a><p>"
                         + "Name: -<br>"

src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdaterTest.java

@@ -5,7 +5,6 @@ import static org.junit.Assert.assertNull;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -82,9 +81,9 @@ public class TrackStatisticsUpdaterTest {
 
         // then
         TrackStatistics statistics = subject.getTrackStatistics();
-        assertEquals(128.03, statistics.getTotalDistance().toM(), 0.01);
-        assertEquals(Duration.ofSeconds(13), statistics.getTotalTime());
-        assertEquals(Duration.ofSeconds(9), statistics.getMovingTime());
+        assertEquals(142.26, statistics.getTotalDistance().toM(), 0.01);
+        assertEquals(Duration.ofSeconds(14), statistics.getTotalTime());
+        assertEquals(Duration.ofSeconds(10), statistics.getMovingTime());
 
         assertEquals(2.5, statistics.getMinAltitude(), 0.01);
         assertEquals(32.5, statistics.getMaxAltitude(), 0.01);
@@ -93,8 +92,8 @@ public class TrackStatisticsUpdaterTest {
 
         assertEquals(14.226, statistics.getMaxSpeed().toMPS(), 0.01);
         assertEquals(14.226, statistics.getAverageMovingSpeed().toMPS(), 0.01);
-        assertEquals(9.84, statistics.getAverageSpeed().toMPS(), 0.01);
-        assertEquals(106.85f, statistics.getAverageHeartRate().getBPM(), 0.01);
+        assertEquals(10.16, statistics.getAverageSpeed().toMPS(), 0.01);
+        assertEquals(106.64f, statistics.getAverageHeartRate().getBPM(), 0.01);
     }
 
     @Test
@@ -226,25 +225,6 @@ public class TrackStatisticsUpdaterTest {
         assertEquals(59.18, subject.getTrackStatistics().getTotalDistance().toM(), 0.01);
     }
 
-    @Ignore("TODO: create a concept ont to compute speed from GPS and sensor")
-    @Test
-    public void addTrackPoint_speed_from_GPS_not_moving() {
-    }
-
-    @Ignore("TODO: create a concept ont to compute speed from GPS and sensor")
-    @Test
-    public void addTrackPoint_speed_from_GPS_moving() {
-    }
-
-    @Ignore("TODO: create a concept ont to compute speed from GPS and sensor")
-    @Test
-    public void addTrackPoint_speed_from_GPS_not_moving_and_sensor_speed() {
-    }
-
-    @Ignore("TODO: create a concept ont to compute speed from GPS and sensor")
-    @Test
-    public void addTrackPoint_speed_from_GPS_moving_and_sensor_speed() {
-    }
 
     @Test
     public void addTrackPoint_maxSpeed_ignore_above_acceleration() {

src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java

@@ -16,18 +16,18 @@ import java.time.Instant;
 import java.util.List;
 
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.stats.TrackStatistics;
-import de.dennisguse.opentracks.util.TrackIconUtils;
 
 @RunWith(JUnit4.class)
 public class AggregatedStatisticsTest {
 
     private final Context context = ApplicationProvider.getApplicationContext();
 
-    private static Track createTrack(Context context, Distance totalDistance, Duration totalTime, String category) {
+    private static Track createTrack(Context context, Distance totalDistance, Duration totalTime, String activityTypeLocalized) {
         TrackStatistics statistics = new TrackStatistics();
         statistics.setStartTime(Instant.ofEpochMilli(1000L));  // Resulting start time
         statistics.setStopTime(statistics.getStartTime().plus(totalTime));
@@ -40,8 +40,8 @@ public class AggregatedStatisticsTest {
         statistics.setMinAltitude(1200.0);  // Resulting min altitude
 
         Track track = new Track();
-        track.setIcon(TrackIconUtils.getIconValue(context, category));
-        track.setActivityType(category);
+        track.setActivityType(ActivityType.findByLocalizedString(context, activityTypeLocalized));
+        track.setActivityTypeLocalized(activityTypeLocalized);
         track.setTrackStatistics(statistics);
         return track;
     }
@@ -243,8 +243,8 @@ public class AggregatedStatisticsTest {
         // Check order
 
         {
-            assertEquals(biking, aggregatedStatistics.getItem(0).getActivityType());
-            assertEquals(driving, aggregatedStatistics.getItem(3).getActivityType());
+            assertEquals(biking, aggregatedStatistics.getItem(0).getActivityTypeLocalized());
+            assertEquals(driving, aggregatedStatistics.getItem(3).getActivityTypeLocalized());
         }
     }
 }

src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/EspressoAggregatedFilterTest.java

@@ -51,7 +51,7 @@ public class EspressoAggregatedFilterTest {
     @Before
     public void setUp() {
         Pair<Track, List<TrackPoint>> pair = TestDataUtil.createTrack(new Track.Id(System.currentTimeMillis()), 20);
-        pair.first.setActivityType(CATEGORY);
+        pair.first.setActivityTypeLocalized(CATEGORY);
         TestDataUtil.insertTrackWithLocations(new ContentProviderUtils(ApplicationProvider.getApplicationContext()), pair.first, pair.second);
     }
 

src/main/java/de/dennisguse/opentracks/TrackEditActivity.java

@@ -29,7 +29,6 @@ import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.databinding.TrackEditBinding;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
-import de.dennisguse.opentracks.util.TrackIconUtils;
 import de.dennisguse.opentracks.util.TrackUtils;
 
 /**
@@ -48,7 +47,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
     private TrackRecordingServiceConnection trackRecordingServiceConnection;
     private ContentProviderUtils contentProviderUtils;
     private Track track;
-    private String iconValue;
+    private ActivityType activityType;
 
     private TrackEditBinding viewBinding;
 
@@ -74,28 +73,31 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
 
         viewBinding.fields.trackEditName.setText(track.getName());
 
-        viewBinding.fields.trackEditActivityType.setText(track.getActivityType());
+        viewBinding.fields.trackEditActivityType.setText(track.getActivityTypeLocalized());
 
         ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_dropdown_item_1line, ActivityType.getLocalizedStrings(this));
         viewBinding.fields.trackEditActivityType.setAdapter(adapter);
-        viewBinding.fields.trackEditActivityType.setOnItemClickListener((parent, view, position, id) -> setActivityTypeIcon(TrackIconUtils.getIconValue(this, (String) viewBinding.fields.trackEditActivityType.getAdapter().getItem(position))));
+        viewBinding.fields.trackEditActivityType.setOnItemClickListener((parent, view, position, id) -> {
+            String localizedActivityType = (String) viewBinding.fields.trackEditActivityType.getAdapter().getItem(position);
+            setActivityTypeIcon(ActivityType.findByLocalizedString(this, localizedActivityType));
+        });
         viewBinding.fields.trackEditActivityType.setOnFocusChangeListener((v, hasFocus) -> {
             if (!hasFocus) {
-                setActivityTypeIcon(TrackIconUtils.getIconValue(
-                        TrackEditActivity.this, viewBinding.fields.trackEditActivityType.getText().toString()));
+                String localizedActivityType = viewBinding.fields.trackEditActivityType.getText().toString();
+                setActivityTypeIcon(ActivityType.findByLocalizedString(this, localizedActivityType));
             }
         });
 
-        iconValue = null;
+        activityType = null;
         if (bundle != null) {
-            iconValue = bundle.getString(ICON_VALUE_KEY);
+            activityType = (ActivityType) bundle.getSerializable(ICON_VALUE_KEY);
         }
-        if (iconValue == null) {
-            iconValue = track.getIcon();
+        if (activityType == null) {
+            activityType = track.getActivityType();
         }
 
-        setActivityTypeIcon(iconValue);
-        viewBinding.fields.trackEditActivityTypeIcon.setOnClickListener(v -> ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), viewBinding.fields.trackEditActivityType.getText().toString()));
+        setActivityTypeIcon(activityType);
+        viewBinding.fields.trackEditActivityTypeIcon.setOnClickListener(v -> ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), this, viewBinding.fields.trackEditActivityType.getText().toString()));
 
         viewBinding.fields.trackEditDescription.setText(track.getDescription());
 
@@ -127,7 +129,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
     @Override
     public void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putString(ICON_VALUE_KEY, iconValue);
+        outState.putSerializable(ICON_VALUE_KEY, activityType);
     }
 
     @Override
@@ -136,14 +138,14 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
         return viewBinding.getRoot();
     }
 
-    private void setActivityTypeIcon(String iconValue) {
-        this.iconValue = iconValue;
-        viewBinding.fields.trackEditActivityTypeIcon.setImageResource(TrackIconUtils.getIconDrawable(iconValue));
+    private void setActivityTypeIcon(ActivityType activityType) {
+        this.activityType = activityType;
+        viewBinding.fields.trackEditActivityTypeIcon.setImageResource(activityType.getIconDrawableId());
     }
 
     @Override
-    public void onChooseActivityTypeDone(String value) {
-        setActivityTypeIcon(value);
-        viewBinding.fields.trackEditActivityType.setText(getString(TrackIconUtils.getIconActivityType(value)));
+    public void onChooseActivityTypeDone(ActivityType activityType) {
+        setActivityTypeIcon(activityType);
+        viewBinding.fields.trackEditActivityType.setText(getString(activityType.getLocalizedStringId()));
     }
 }

src/main/java/de/dennisguse/opentracks/TrackListActivity.java

@@ -49,7 +49,10 @@ import java.time.Duration;
 import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.Arrays;
 
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.DistanceFormatter;
 import de.dennisguse.opentracks.data.models.Track;
@@ -72,7 +75,6 @@ import de.dennisguse.opentracks.util.IntentDashboardUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.PermissionRequester;
 import de.dennisguse.opentracks.util.StringUtils;
-import de.dennisguse.opentracks.util.TrackIconUtils;
 
 /**
  * An activity displaying a list of tracks.
@@ -212,14 +214,15 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
                 int totalDistanceIndex = cursor.getColumnIndexOrThrow(TracksColumns.TOTALDISTANCE);
                 int startTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME);
                 int startTimeOffsetIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME_OFFSET);
-                int activityTypeIndex = cursor.getColumnIndexOrThrow(TracksColumns.ACTIVITY_TYPE);
+                int activityTypeIndex = cursor.getColumnIndexOrThrow(TracksColumns.ACTIVITY_TYPE_LOCALIZED);
                 int descriptionIndex = cursor.getColumnIndexOrThrow(TracksColumns.DESCRIPTION);
                 int markerCountIndex = cursor.getColumnIndexOrThrow(TracksColumns.MARKER_COUNT);
 
                 Track.Id trackId = new Track.Id(cursor.getLong(idIndex));
                 boolean isRecording = trackId.equals(recordingStatus.getTrackId());
                 String icon = cursor.getString(iconIndex);
-                int iconId = TrackIconUtils.getIconDrawable(icon);
+                int iconId = ActivityType.findBy(icon)
+                        .getIconDrawableId();
                 String name = cursor.getString(nameIndex);
                 String totalTime = StringUtils.formatElapsedTime(Duration.ofMillis(cursor.getLong(totalTimeIndex)));
                 String totalDistance = DistanceFormatter.Builder()
@@ -484,6 +487,13 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
             return true;
         }
 
+        if (itemId == R.id.list_context_menu_aggregated_stats) {
+            Intent intent = IntentUtils.newIntent(this, AggregatedStatisticsActivity.class)
+                    .putParcelableArrayListExtra(AggregatedStatisticsActivity.EXTRA_TRACK_IDS, new ArrayList<>(Arrays.asList(trackIds)));
+            startActivity(intent);
+            return true;
+        }
+
         if (itemId == R.id.list_context_menu_select_all) {
             for (int i = 0; i < viewBinding.trackList.getCount(); i++) {
                 viewBinding.trackList.setItemChecked(i, true);
@@ -516,7 +526,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
         @Override
         public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
             final String[] PROJECTION = new String[]{TracksColumns._ID, TracksColumns.NAME,
-                    TracksColumns.DESCRIPTION, TracksColumns.ACTIVITY_TYPE, TracksColumns.STARTTIME, TracksColumns.STARTTIME_OFFSET,
+                    TracksColumns.DESCRIPTION, TracksColumns.ACTIVITY_TYPE_LOCALIZED, TracksColumns.STARTTIME, TracksColumns.STARTTIME_OFFSET,
                     TracksColumns.TOTALDISTANCE, TracksColumns.TOTALTIME, TracksColumns.ICON, TracksColumns.MARKER_COUNT};
 
             final String sortOrder = TracksColumns.STARTTIME + " DESC";
@@ -526,7 +536,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
             } else {
                 final String SEARCH_QUERY = TracksColumns.NAME + " LIKE ? OR " +
                         TracksColumns.DESCRIPTION + " LIKE ? OR " +
-                        TracksColumns.ACTIVITY_TYPE + " LIKE ?";
+                        TracksColumns.ACTIVITY_TYPE_LOCALIZED + " LIKE ?";
                 final String[] selectionArgs = new String[]{"%" + searchQuery + "%", "%" + searchQuery + "%", "%" + searchQuery + "%"};
                 return new CursorLoader(TrackListActivity.this, TracksColumns.CONTENT_URI, PROJECTION, SEARCH_QUERY, selectionArgs, sortOrder);
             }

src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java

@@ -30,6 +30,7 @@ import de.dennisguse.opentracks.chart.ChartFragment;
 import de.dennisguse.opentracks.chart.TrackDataHubInterface;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.TrackDataHub;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.databinding.TrackRecordingBinding;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
@@ -46,7 +47,6 @@ import de.dennisguse.opentracks.ui.markers.MarkerListActivity;
 import de.dennisguse.opentracks.ui.util.ActivityUtils;
 import de.dennisguse.opentracks.util.IntentDashboardUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
-import de.dennisguse.opentracks.util.TrackIconUtils;
 import de.dennisguse.opentracks.util.TrackUtils;
 
 /**
@@ -317,10 +317,10 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
     }
 
     @Override
-    public void onChooseActivityTypeDone(String iconValue) {
+    public void onChooseActivityTypeDone(ActivityType activityType) {
         Track track = contentProviderUtils.getTrack(trackId);
-        String activityType = getString(TrackIconUtils.getIconActivityType(iconValue));
-        TrackUtils.updateTrack(this, track, null, activityType, null, contentProviderUtils);
+        String activityTypeLocalized = getString(activityType.getLocalizedStringId());
+        TrackUtils.updateTrack(this, track, null, activityTypeLocalized, null, contentProviderUtils);
     }
 
     private class CustomFragmentPagerAdapter extends FragmentStateAdapter {

src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java

@@ -20,7 +20,6 @@ import de.dennisguse.opentracks.ui.aggregatedStatistics.ConfirmDeleteDialogFragm
 import de.dennisguse.opentracks.util.ExportUtils;
 import de.dennisguse.opentracks.util.IntentUtils;
 import de.dennisguse.opentracks.util.StringUtils;
-import de.dennisguse.opentracks.util.TrackIconUtils;
 import de.dennisguse.opentracks.util.TrackUtils;
 
 public class TrackStoppedActivity extends AbstractTrackDeleteActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller {
@@ -50,22 +49,23 @@ public class TrackStoppedActivity extends AbstractTrackDeleteActivity implements
 
         viewBinding.trackEditName.setText(track.getName());
 
-        viewBinding.trackEditActivityType.setText(track.getActivityType());
+        viewBinding.trackEditActivityType.setText(track.getActivityTypeLocalized());
 
         ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_dropdown_item_1line, ActivityType.getLocalizedStrings(this));
         viewBinding.trackEditActivityType.setAdapter(adapter);
-        viewBinding.trackEditActivityType.setOnItemClickListener((parent, view, position, id) -> setActivityTypeIcon(TrackIconUtils.getIconValue(this, (String) viewBinding.trackEditActivityType.getAdapter().getItem(position))));
+        viewBinding.trackEditActivityType.setOnItemClickListener((parent, view, position, id) -> {
+            String localizedActivityType = (String) viewBinding.trackEditActivityType.getAdapter().getItem(position);
+            setActivityTypeIcon(ActivityType.findByLocalizedString(this, localizedActivityType));
+        });
         viewBinding.trackEditActivityType.setOnFocusChangeListener((v, hasFocus) -> {
             if (!hasFocus) {
-                setActivityTypeIcon(TrackIconUtils.getIconValue(
-                        TrackStoppedActivity.this, viewBinding.trackEditActivityType.getText().toString()));
+                String localizedActivityType = viewBinding.trackEditActivityType.getText().toString();
+                setActivityTypeIcon(ActivityType.findByLocalizedString(this, localizedActivityType));
             }
         });
 
-        String iconValue = track.getIcon();
-
-        setActivityTypeIcon(iconValue);
-        viewBinding.trackEditActivityTypeIcon.setOnClickListener(v -> ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), viewBinding.trackEditActivityType.getText().toString()));
+        setActivityTypeIcon(track.getActivityType());
+        viewBinding.trackEditActivityTypeIcon.setOnClickListener(v -> ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), this, viewBinding.trackEditActivityType.getText().toString()));
 
         viewBinding.trackEditDescription.setText(track.getDescription());
 
@@ -74,7 +74,7 @@ public class TrackStoppedActivity extends AbstractTrackDeleteActivity implements
         {
             Pair<String, String> parts = SpeedFormatter.Builder()
                     .setUnit(PreferencesUtils.getUnitSystem())
-                    .setReportSpeedOrPace(PreferencesUtils.isReportSpeed(track.getActivityType()))
+                    .setReportSpeedOrPace(PreferencesUtils.isReportSpeed(track))
                     .build(this)
                     .getSpeedParts(track.getTrackStatistics().getAverageMovingSpeed());
             viewBinding.speed.setText(parts.first);
@@ -125,14 +125,14 @@ public class TrackStoppedActivity extends AbstractTrackDeleteActivity implements
         return viewBinding.getRoot();
     }
 
-    private void setActivityTypeIcon(String iconValue) {
-        viewBinding.trackEditActivityTypeIcon.setImageResource(TrackIconUtils.getIconDrawable(iconValue));
+    private void setActivityTypeIcon(ActivityType activityType) {
+        viewBinding.trackEditActivityTypeIcon.setImageResource(activityType.getIconDrawableId());
     }
 
     @Override
-    public void onChooseActivityTypeDone(String iconValue) {
-        setActivityTypeIcon(iconValue);
-        viewBinding.trackEditActivityType.setText(getString(TrackIconUtils.getIconActivityType(iconValue)));
+    public void onChooseActivityTypeDone(ActivityType activityType) {
+        setActivityTypeIcon(activityType);
+        viewBinding.trackEditActivityType.setText(getString(activityType.getLocalizedStringId()));
     }
 
     private void resumeTrackAndFinish() {

src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java

@@ -65,7 +65,7 @@ public class ChartFragment extends Fragment implements TrackDataHub.Listener {
 
     // Stats gathered from the received data
     private final List<ChartPoint> pendingPoints = new ArrayList<>();
-    private String category = "";
+    private String activityTypeLocalized = "";
 
     // Modes of operation
     private boolean chartByDistance;
@@ -87,7 +87,7 @@ public class ChartFragment extends Fragment implements TrackDataHub.Listener {
                 }
             }
             if (PreferencesUtils.isKey(R.string.stats_rate_key, key)) {
-                boolean reportSpeed = PreferencesUtils.isReportSpeed(category);
+                boolean reportSpeed = PreferencesUtils.isReportSpeed(activityTypeLocalized);
                 if (reportSpeed != viewBinding.chartView.getReportSpeed()) {
                     viewBinding.chartView.setReportSpeed(reportSpeed);
                     viewBinding.chartView.applyReportSpeed();
@@ -160,12 +160,12 @@ public class ChartFragment extends Fragment implements TrackDataHub.Listener {
     public void onTrackUpdated(Track track) {
         if (isResumed()) {
             if (track == null) {
-                category = "";
+                activityTypeLocalized = "";
                 return;
             }
 
-            category = track.getActivityType();
-            boolean reportSpeed = PreferencesUtils.isReportSpeed(category);
+            activityTypeLocalized = track.getActivityTypeLocalized();
+            boolean reportSpeed = PreferencesUtils.isReportSpeed(activityTypeLocalized);
             if (reportSpeed != viewBinding.chartView.getReportSpeed()) {
                 viewBinding.chartView.setReportSpeed(reportSpeed);
                 viewBinding.chartView.applyReportSpeed();

src/main/java/de/dennisguse/opentracks/chart/ChartView.java

@@ -946,7 +946,7 @@ public class ChartView extends View {
      */
     private void updateEffectiveDimensions() {
         effectiveWidth = Math.max(0, width - leftBorder - rightBorder);
-        effectiveHeight = Math.max(0, height - topBorder - bottomBorder);
+        effectiveHeight = Math.max(0, height - topBorder - bottomBorder - spacer);
     }
 
     /**

src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java

@@ -40,6 +40,7 @@ import java.util.List;
 import java.util.UUID;
 
 import de.dennisguse.opentracks.BuildConfig;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.Altitude;
 import de.dennisguse.opentracks.data.models.Cadence;
 import de.dennisguse.opentracks.data.models.Distance;
@@ -100,7 +101,7 @@ public class ContentProviderUtils {
         int uuidIndex = cursor.getColumnIndexOrThrow(TracksColumns.UUID);
         int nameIndex = cursor.getColumnIndexOrThrow(TracksColumns.NAME);
         int descriptionIndex = cursor.getColumnIndexOrThrow(TracksColumns.DESCRIPTION);
-        int categoryIndex = cursor.getColumnIndexOrThrow(TracksColumns.ACTIVITY_TYPE);
+        int activityTypeLocalizedIndex = cursor.getColumnIndexOrThrow(TracksColumns.ACTIVITY_TYPE_LOCALIZED);
         int startTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME);
         int startTimeOffsetIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME_OFFSET);
         int stopTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.STOPTIME);
@@ -128,8 +129,8 @@ public class ContentProviderUtils {
         if (!cursor.isNull(descriptionIndex)) {
             track.setDescription(cursor.getString(descriptionIndex));
         }
-        if (!cursor.isNull(categoryIndex)) {
-            track.setActivityType(cursor.getString(categoryIndex));
+        if (!cursor.isNull(activityTypeLocalizedIndex)) {
+            track.setActivityTypeLocalized(cursor.getString(activityTypeLocalizedIndex));
         }
 
         if (!cursor.isNull(startTimeIndex)) {
@@ -163,7 +164,7 @@ public class ContentProviderUtils {
             trackStatistics.setTotalAltitudeLoss(cursor.getFloat(altitudeLossIndex));
         }
         if (!cursor.isNull(iconIndex)) {
-            track.setIcon(cursor.getString(iconIndex));
+            track.setActivityType(ActivityType.findBy(cursor.getString(iconIndex)));
         }
         return track;
     }
@@ -290,7 +291,7 @@ public class ContentProviderUtils {
         values.put(TracksColumns.UUID, UUIDUtils.toBytes(track.getUuid()));
         values.put(TracksColumns.NAME, track.getName());
         values.put(TracksColumns.DESCRIPTION, track.getDescription());
-        values.put(TracksColumns.ACTIVITY_TYPE, track.getActivityType());
+        values.put(TracksColumns.ACTIVITY_TYPE_LOCALIZED, track.getActivityTypeLocalized());
         values.put(TracksColumns.STARTTIME_OFFSET, track.getZoneOffset().getTotalSeconds());
         if (trackStatistics.getStartTime() != null) {
             values.put(TracksColumns.STARTTIME, trackStatistics.getStartTime().toEpochMilli());
@@ -308,7 +309,7 @@ public class ContentProviderUtils {
         values.put(TracksColumns.MAX_ALTITUDE, trackStatistics.getMaxAltitude());
         values.put(TracksColumns.ALTITUDE_GAIN, trackStatistics.getTotalAltitudeGain());
         values.put(TracksColumns.ALTITUDE_LOSS, trackStatistics.getTotalAltitudeLoss());
-        values.put(TracksColumns.ICON, track.getIcon());
+        values.put(TracksColumns.ICON, track.getActivityType() != null ? track.getActivityType().getIconId() : "");
 
         return values;
     }

src/main/java/de/dennisguse/opentracks/data/TrackDataHub.java

@@ -39,7 +39,7 @@ import de.dennisguse.opentracks.data.tables.TrackPointsColumns;
 import de.dennisguse.opentracks.data.tables.TracksColumns;
 import de.dennisguse.opentracks.services.RecordingStatus;
 import de.dennisguse.opentracks.services.TrackRecordingService;
-import de.dennisguse.opentracks.services.handlers.EGM2008CorrectionManager;
+import de.dennisguse.opentracks.services.handlers.AltitudeCorrectionManager;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.stats.TrackStatisticsUpdater;
 
@@ -73,7 +73,7 @@ public class TrackDataHub {
     private final ContentProviderUtils contentProviderUtils;
     private final int targetNumPoints;
 
-    private final EGM2008CorrectionManager egm2008Correction = new EGM2008CorrectionManager();
+    private final AltitudeCorrectionManager egm2008Correction = new AltitudeCorrectionManager();
 
     //TODO Check if this is needed.
     private HandlerThread handlerThread;

src/main/java/de/dennisguse/opentracks/data/TrackSelection.java

@@ -53,7 +53,7 @@ public class TrackSelection implements ContentProviderUtils.ContentProviderSelec
         }
         if (!categories.isEmpty()) {
             selection += selection.isEmpty() ? "" : " AND ";
-            selection += String.format(TracksColumns.ACTIVITY_TYPE + " IN (%s)", TextUtils.join(",", Collections.nCopies(categories.size(), "?")));
+            selection += String.format(TracksColumns.ACTIVITY_TYPE_LOCALIZED + " IN (%s)", TextUtils.join(",", Collections.nCopies(categories.size(), "?")));
         }
         if (from != null && to != null) {
             selection += selection.isEmpty() ? "" : " AND ";

src/main/java/de/dennisguse/opentracks/data/models/ActivityIcon.java

@@ -0,0 +1,35 @@
+package de.dennisguse.opentracks.data.models;
+
+import de.dennisguse.opentracks.R;
+
+public enum ActivityIcon {
+    AIRPLANE("AIRPLANE", R.drawable.ic_activity_flight_24dp),
+    BIKE("BIKE", R.drawable.ic_activity_bike_24dp),
+    MOUNTAIN_BIKE("MOUNTAIN_BIKE", R.drawable.ic_activity_mtb_24dp),
+    MOTOR_BIKE("MOTOR_BIKE", R.drawable.ic_activity_motorbike_24dp),
+    KAYAK("KAYAK", R.drawable.ic_activity_kayaking_24dp),
+    BOAT("BOAT", R.drawable.ic_activity_boat_24dp),
+    SAILING("SAILING", R.drawable.ic_activity_sailing_24dp),
+    DRIVE("DRIVE", R.drawable.ic_activity_drive_24dp),
+    RUN("RUN", R.drawable.ic_activity_run_24dp),
+    SKI("SKI", R.drawable.ic_activity_skiing_24dp),
+    SNOW_BOARDING("SNOW_BOARDING", R.drawable.ic_activity_snowboarding_24dp),
+    UNKNOWN("UNKNOWN", R.drawable.ic_logo_24dp),
+    WALK("WALK", R.drawable.ic_activity_walk_24dp),
+    ESCOOTER("ESCOOTER", R.drawable.ic_activity_escooter_24dp),
+    INLINE_SKATING("INLINES_SKATING", R.drawable.ic_activity_inline_skating_24dp),
+    SKATE_BOARDING("SKATE_BOARDING", R.drawable.ic_activity_skateboarding_24dp),
+    CLIMBING("CLIMBING", R.drawable.ic_activity_climbing_24dp),
+    SWIMMING("SWIMMING", R.drawable.ic_activity_swimming_24dp),
+    SWIMMING_OPEN("SWIMMING_OPEN", R.drawable.ic_activity_swimming_open_24dp),
+    WORKOUT("WORKOUT", R.drawable.ic_activity_workout_24dp);
+
+    @Deprecated //TODO should be removed.
+    final String iconId;
+    final int iconDrawableId;
+
+    ActivityIcon(String iconId, int iconDrawableId) {
+        this.iconId = iconId;
+        this.iconDrawableId = iconDrawableId;
+    }
+}

src/main/java/de/dennisguse/opentracks/data/models/ActivityType.java

@@ -1,8 +1,10 @@
 package de.dennisguse.opentracks.data.models;
 
 import android.content.Context;
+import android.content.res.Resources;
+
+import androidx.annotation.NonNull;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -10,70 +12,138 @@ import java.util.stream.Collectors;
 import de.dennisguse.opentracks.R;
 
 public enum ActivityType {
-    AIRPLANE("AIRPLANE", R.drawable.ic_activity_flight_24dp, true, R.string.activity_type_airplane, R.string.activity_type_commercial_airplane, R.string.activity_type_rc_airplane),
-    BIKE("BIKE", R.drawable.ic_activity_bike_24dp, true, R.string.activity_type_biking, R.string.activity_type_cycling, R.string.activity_type_dirt_bike, R.string.activity_type_road_biking, R.string.activity_type_track_cycling),
-    MOUNTAIN_BIKE("MOUNTAIN_BIKE", R.drawable.ic_activity_mtb_24dp, true, R.string.activity_type_mountain_biking),
-    MOTOR_BIKE("MOTOR_BIKE", R.drawable.ic_activity_motorbike_24dp, true, R.string.activity_type_motor_bike),
-    KAYAK("KAYAK", R.drawable.ic_activity_kayaking_24dp, true, R.string.activity_type_kayaking),
-    BOAT("BOAT", R.drawable.ic_activity_boat_24dp, true, R.string.activity_type_boat, R.string.activity_type_ferry, R.string.activity_type_motor_boating, R.string.activity_type_rc_boat),
-    SAILING("SAILING", R.drawable.ic_activity_sailing_24dp, true, R.string.activity_type_sailing),
-    DRIVE("DRIVE", R.drawable.ic_activity_drive_24dp, true, R.string.activity_type_atv, R.string.activity_type_driving, R.string.activity_type_driving_bus, R.string.activity_type_driving_car),
-    RUN("RUN", R.drawable.ic_activity_run_24dp, false, R.string.activity_type_running, R.string.activity_type_street_running, R.string.activity_type_track_running, R.string.activity_type_trail_running),
-    SKI("SKI", R.drawable.ic_activity_skiing_24dp, true, R.string.activity_type_cross_country_skiing, R.string.activity_type_skiing),
-    SNOW_BOARDING("SNOW_BOARDING", R.drawable.ic_activity_snowboarding_24dp, true, R.string.activity_type_snow_boarding),
-    UNKNOWN("UNKNOWN", R.drawable.ic_logo_24dp, true, R.string.activity_type_unknown),
-    WALK("WALK", R.drawable.ic_activity_walk_24dp, false, R.string.activity_type_hiking, R.string.activity_type_off_trail_hiking, R.string.activity_type_speed_walking, R.string.activity_type_trail_hiking, R.string.activity_type_walking),
-    ESCOOTER("ESCOOTER", R.drawable.ic_activity_escooter_24dp, true, R.string.activity_type_escooter),
-    INLINE_SKATING("INLINES_SKATING", R.drawable.ic_activity_inline_skating_24dp, true, R.string.activity_type_inline_skating),
-    SKATE_BOARDING("SKATE_BOARDING", R.drawable.ic_activity_skateboarding_24dp, true, R.string.activity_type_skate_boarding),
-    CLIMBING("CLIMBING", R.drawable.ic_activity_climbing_24dp, false, R.string.activity_type_climbing),
-    SWIMMING("SWIMMING", R.drawable.ic_activity_swimming_24dp, false, R.string.activity_type_swimming),
-    SWIMMING_OPEN("SWIMMING_OPEN", R.drawable.ic_activity_swimming_open_24dp, false, R.string.activity_type_swimming_open),
-    WORKOUT("WORKOUT", R.drawable.ic_activity_workout_24dp, false, R.string.activity_type_workout);
+
+    AIRPLANE("airplane", R.string.activity_type_airplane, ActivityIcon.AIRPLANE, true),
+    ATV("ATV", R.string.activity_type_atv, ActivityIcon.DRIVE, true),
+    BIKING("biking", R.string.activity_type_biking, ActivityIcon.BIKE, true),
+    BLIMP("blimp", R.string.activity_type_blimp, ActivityIcon.UNKNOWN, true),
+    BOAT("boat", R.string.activity_type_boat, ActivityIcon.BOAT, true),
+    CLIMBING("climbing", R.string.activity_type_climbing, ActivityIcon.CLIMBING, false),
+    COMMERCIAL_AIRPLANE("commercial airplane", R.string.activity_type_commercial_airplane, ActivityIcon.AIRPLANE, true),
+    CROSS_COUNTRY_SKIING("cross-country skiing", R.string.activity_type_cross_country_skiing, ActivityIcon.SKI, true),
+    CYCLING("cycling", R.string.activity_type_cycling, ActivityIcon.BIKE, true),
+    DIRT_BIKE("dirt bike", R.string.activity_type_dirt_bike, ActivityIcon.MOTOR_BIKE, true),
+    DONKEY_BACK_RIDING("donkey back riding", R.string.activity_type_donkey_back_riding, ActivityIcon.UNKNOWN, true),
+    DRIVING("driving", R.string.activity_type_driving, ActivityIcon.DRIVE, true),
+    DRIVING_BUS("driving bus", R.string.activity_type_driving_bus, ActivityIcon.DRIVE, true),
+    DRIVING_CAR("driving car", R.string.activity_type_driving_car, ActivityIcon.DRIVE, true),
+    ESCOOTER("escooter", R.string.activity_type_escooter, ActivityIcon.ESCOOTER, true),
+    FERRY("ferry", R.string.activity_type_ferry, ActivityIcon.BOAT, true),
+    FRISBEE("frisbee", R.string.activity_type_frisbee, ActivityIcon.UNKNOWN, true),
+    GLIDING("gliding", R.string.activity_type_gliding, ActivityIcon.UNKNOWN, true),
+    HANG_GLIDING("hang gliding", R.string.activity_type_hang_gliding, ActivityIcon.UNKNOWN, true),
+    HELICOPTER("helicopter", R.string.activity_type_helicopter, ActivityIcon.UNKNOWN, true),
+    HIKING("hiking", R.string.activity_type_hiking, ActivityIcon.WALK, false),
+    HORSE_BACK_RIDING("horse back riding", R.string.activity_type_horse_back_riding, ActivityIcon.UNKNOWN, true),
+    HOT_AIR_BALLOON("hot air balloon", R.string.activity_type_hot_air_balloon, ActivityIcon.UNKNOWN, true),
+    ICE_SAILING("ice sailing", R.string.activity_type_ice_sailing, ActivityIcon.UNKNOWN, true),
+    INLINE_SKATING("inline skating", R.string.activity_type_inline_skating, ActivityIcon.INLINE_SKATING, true),
+    KAYAKING("kayaking", R.string.activity_type_kayaking, ActivityIcon.KAYAK, true),
+    KITE_SURFING("kite surfing", R.string.activity_type_kite_surfing, ActivityIcon.UNKNOWN, true),
+    LAND_SAILING("land sailing", R.string.activity_type_land_sailing, ActivityIcon.UNKNOWN, true),
+    MIXED_TYPE("mixed type", R.string.activity_type_mixed_type, ActivityIcon.UNKNOWN, true),
+    MOTOR_BIKE("motor bike", R.string.activity_type_motor_bike, ActivityIcon.MOTOR_BIKE, true),
+    MOTOR_BOATING("motor boating", R.string.activity_type_motor_boating, ActivityIcon.BOAT, true),
+    MOUNTAIN_BIKING("mountain biking", R.string.activity_type_mountain_biking, ActivityIcon.MOUNTAIN_BIKE, true),
+    OFF_TRAIL_HIKING("off trail hiking", R.string.activity_type_hiking, ActivityIcon.WALK, false),
+    OTHER("other", R.string.activity_type_other, ActivityIcon.UNKNOWN, true),
+    PADDLING("paddling", R.string.activity_type_paddling, ActivityIcon.UNKNOWN, true),
+    PARA_GLIDING("para gliding", R.string.activity_type_para_gliding, ActivityIcon.UNKNOWN, true),
+    RC_AIRPLANE("RC airplane", R.string.activity_type_rc_airplane, ActivityIcon.AIRPLANE, true),
+    RC_BOAT("RC boat", R.string.activity_type_rc_boat, ActivityIcon.BOAT, true),
+    RC_HELICOPTER("RC helicopter", R.string.activity_type_rc_helicopter, ActivityIcon.UNKNOWN, true),
+    RIDING("riding", R.string.activity_type_horse_back_riding, ActivityIcon.UNKNOWN, true),
+    ROAD_BIKING("road biking", R.string.activity_type_road_biking, ActivityIcon.BIKE, true),
+    ROLLER_SKIING("roller skiing", R.string.activity_type_roller_skiing, ActivityIcon.UNKNOWN, true),
+    ROWING("rowing", R.string.activity_type_rowing, ActivityIcon.UNKNOWN, true),
+    RUNNING("running", R.string.activity_type_running, ActivityIcon.RUN, false),
+    SAILING("sailing", R.string.activity_type_sailing, ActivityIcon.SAILING, true),
+    SEAPLANE("seaplane", R.string.activity_type_seaplane, ActivityIcon.AIRPLANE, true),
+    SKATE_BOARDING("skate boarding", R.string.activity_type_skate_boarding, ActivityIcon.SKATE_BOARDING, true),
+    SKATING("skating", R.string.activity_type_skating, ActivityIcon.UNKNOWN, true),
+    SKIING("skiing", R.string.activity_type_skiing, ActivityIcon.SKI, true),
+    SKY_JUMPING("sky jumping", R.string.activity_type_sky_jumping, ActivityIcon.UNKNOWN, true),
+    SLED("sled", R.string.activity_type_sled, ActivityIcon.UNKNOWN, true),
+    SNOW_BOARDING("snow boarding", R.string.activity_type_snow_boarding, ActivityIcon.SNOW_BOARDING, true),
+    SNOW_SHOEING("snow shoeing", R.string.activity_type_snow_shoeing, ActivityIcon.UNKNOWN, true),
+    SPEED_WALKING("speed walking", R.string.activity_type_speed_walking, ActivityIcon.WALK, false),
+    STREET_RUNNING("street running", R.string.activity_type_street_running, ActivityIcon.RUN, false),
+    SURFING("surfing", R.string.activity_type_surfing, ActivityIcon.UNKNOWN, true),
+    TRACK_CYCLING("track cycling", R.string.activity_type_track_cycling, ActivityIcon.BIKE, true),
+    TRACK_RUNNING("track running", R.string.activity_type_trail_running, ActivityIcon.RUN, false),
+    TRAIL_HIKING("trail hiking", R.string.activity_type_trail_hiking, ActivityIcon.WALK, false),
+    TRAIL_RUNNING("trail running", R.string.activity_type_trail_running, ActivityIcon.RUN, false),
+    TRAIN("train", R.string.activity_type_train, ActivityIcon.UNKNOWN, true),
+    ULTIMATE_FRISBEE("ultimate frisbee", R.string.activity_type_ultimate_frisbee, ActivityIcon.UNKNOWN, true),
+    WAKEBOARDING("wakeboarding", R.string.activity_type_wakeboarding, ActivityIcon.UNKNOWN, true),
+    WALKING("walking", R.string.activity_type_walking, ActivityIcon.WALK, false),
+    WATER_SKIING("water skiing", R.string.activity_type_water_skiing, ActivityIcon.UNKNOWN, true),
+    WIND_SURFING("wind surfing", R.string.activity_type_wind_surfing, ActivityIcon.UNKNOWN, true),
+    SWIMMING("swimming", R.string.activity_type_swimming, ActivityIcon.SWIMMING, false),
+    SWIMMING_OPEN("swimming in open water", R.string.activity_type_swimming_open, ActivityIcon.SWIMMING_OPEN, false),
+    WORKOUT("workout", R.string.activity_type_workout, ActivityIcon.WORKOUT, false),
+    UNKNOWN("unknown", R.string.activity_type_unknown, ActivityIcon.UNKNOWN, true);
 
     final String id;
-    final int iconId;
+
+    final ActivityIcon icon;
     final boolean showSpeedPreferred;
-    final int[] localizedStringIds;
+    final int localizedStringId;
 
-    //isSpeed?
-
-    ActivityType(String id, int iconId, boolean showSpeedPreferred, int... localizedStringIds) {
+    ActivityType(String id, int localizedStringId, ActivityIcon icon, boolean showSpeedPreferred) {
         this.id = id;
-        this.iconId = iconId;
+        this.localizedStringId = localizedStringId;
+        this.icon = icon;
         this.showSpeedPreferred = showSpeedPreferred;
-        this.localizedStringIds = localizedStringIds;
     }
 
     public String getId() {
         return id;
     }
 
-    public int getIconId() {
-        return iconId;
+    @Deprecated
+    public String getIconId() {
+        return icon.iconId;
+    }
+
+    public int getIconDrawableId() {
+        return icon.iconDrawableId;
+    }
+
+    public int getLocalizedStringId() {
+        return localizedStringId;
     }
 
     public boolean isShowSpeedPreferred() {
         return showSpeedPreferred;
     }
 
-    public int[] getLocalizedStringIds() {
-        return localizedStringIds;
-    }
-
-    public int getFirstLocalizedStringId() {
-        return localizedStringIds[0];
-    }
-
     public static List<String> getLocalizedStrings(Context context) {
-        List<String> result = new ArrayList<>();
-        for (ActivityType activityType : values()) {
-            List<String> strings = Arrays.stream(activityType.localizedStringIds)
-                    .mapToObj(context::getString)
-                    .collect(Collectors.toList());
-            result.addAll(strings);
-        }
+        return Arrays.stream(values())
+                .map(ActivityType::getLocalizedStringId)
+                .map(context::getString)
+                .collect(Collectors.toList());
+    }
 
-        return result;
+    @NonNull
+    public static ActivityType findBy(String iconId) {
+        if (ActivityIcon.UNKNOWN.iconId.equals(iconId)) {
+            return ActivityType.UNKNOWN;
+        }
+        return Arrays.stream(ActivityType.values()).filter(
+                        it -> it.icon.iconId.equals(iconId)
+                ).findFirst()
+                .orElse(ActivityType.UNKNOWN);
+    }
+
+    public static ActivityType findByLocalizedString(Context context, String localizedActivityType) {
+        return findByLocalizedString(context.getResources(), localizedActivityType);
+    }
+
+    public static ActivityType findByLocalizedString(Resources resources, String localizedActivityType) {
+        return Arrays.stream(ActivityType.values())
+                .filter(it -> resources.getString(it.getLocalizedStringId()).equals(localizedActivityType))
+                .findFirst()
+                .orElse(ActivityType.UNKNOWN);
     }
 }

src/main/java/de/dennisguse/opentracks/data/models/AtmosphericPressure.java

@@ -1,7 +1,5 @@
 package de.dennisguse.opentracks.data.models;
 
-import java.util.Objects;
-
 public record AtmosphericPressure(float value) {
 
     public static AtmosphericPressure ofPA(float value_Pa) {

src/main/java/de/dennisguse/opentracks/data/models/Cadence.java

@@ -1,9 +1,6 @@
 package de.dennisguse.opentracks.data.models;
 
-import androidx.annotation.NonNull;
-
 import java.time.Duration;
-import java.util.Objects;
 
 public record Cadence(float value_rpm) {
 

src/main/java/de/dennisguse/opentracks/data/models/HeartRate.java

@@ -1,9 +1,5 @@
 package de.dennisguse.opentracks.data.models;
 
-import androidx.annotation.NonNull;
-
-import java.util.Objects;
-
 public record HeartRate(float value) {
 
     public static HeartRate of(float value) {

src/main/java/de/dennisguse/opentracks/data/models/Power.java

@@ -1,9 +1,5 @@
 package de.dennisguse.opentracks.data.models;
 
-import androidx.annotation.NonNull;
-
-import java.util.Objects;
-
 public record Power(float value) {
 
     public static Power of(float value) {

src/main/java/de/dennisguse/opentracks/data/models/Track.java

@@ -44,9 +44,9 @@ public class Track {
 
     private String name = "";
     private String description = "";
-    private String activityType = "";
+    private String activityTypeLocalized = "";
 
-    private String icon = "";
+    private ActivityType activityType;
 
     private final ZoneOffset zoneOffset;
 
@@ -54,7 +54,7 @@ public class Track {
 
     @VisibleForTesting
     public Track() {
-        this.zoneOffset = ZoneOffset.UTC;
+        this(ZoneOffset.UTC);
     }
 
     public Track(@NonNull ZoneOffset zoneOffset) {
@@ -97,22 +97,22 @@ public class Track {
         this.description = description;
     }
 
-    public String getActivityType() {
+    public String getActivityTypeLocalized() {
+        return activityTypeLocalized;
+    }
+
+    public void setActivityTypeLocalized(String activityType) {
+        this.activityTypeLocalized = activityType;
+    }
+
+    public ActivityType getActivityType() {
         return activityType;
     }
 
-    public void setActivityType(String activityType) {
+    public void setActivityType(ActivityType activityType) {
         this.activityType = activityType;
     }
 
-    public String getIcon() {
-        return icon;
-    }
-
-    public void setIcon(String icon) {
-        this.icon = icon;
-    }
-
     public ZoneOffset getZoneOffset() {
         return zoneOffset;
     }

src/main/java/de/dennisguse/opentracks/data/models/TrackPoint.java

@@ -130,11 +130,11 @@ public class TrackPoint {
         return this;
     }
 
-    public boolean isSegmentStart() {
-        return type == Type.SEGMENT_START_AUTOMATIC || type == Type.SEGMENT_START_MANUAL;
+    public boolean isSegmentManualStart() {
+        return type == Type.SEGMENT_START_MANUAL;
     }
 
-    public boolean isSegmentEnd() {
+    public boolean isSegmentManualEnd() {
         return type == Type.SEGMENT_END_MANUAL;
     }
 

src/main/java/de/dennisguse/opentracks/data/tables/TracksColumns.java

@@ -39,7 +39,7 @@ public interface TracksColumns extends BaseColumns {
     String UUID = "uuid"; // identifier to make tracks globally unique (prevent re-import)
     String NAME = "name"; // track name
     String DESCRIPTION = "description"; // track description
-    String ACTIVITY_TYPE = "category"; // track activity type
+    String ACTIVITY_TYPE_LOCALIZED = "category"; // track activity type
     String STARTTIME = "starttime"; // track start time
     String STARTTIME_OFFSET = "starttime_offset"; // in plus/minus in seconds
     String STOPTIME = "stoptime"; // track stop time
@@ -57,13 +57,13 @@ public interface TracksColumns extends BaseColumns {
     String MAX_ALTITUDE = "maxelevation"; // maximum altitude //TODO RENAME column
     String ALTITUDE_GAIN = "elevationgain"; // altitude gain //TODO RENAME column
     String ALTITUDE_LOSS = "elevationloss"; // altitude loss //TODO RENAME column
-    String ICON = "icon"; // track activity type icon
+    String ICON = "icon"; // track activity type icon //TODO DEPRECATED
 
     String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " ("
             + _ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
             + NAME + " TEXT, "
             + DESCRIPTION + " TEXT, "
-            + ACTIVITY_TYPE + " TEXT, "
+            + ACTIVITY_TYPE_LOCALIZED + " TEXT, "
             + STARTTIME + " INTEGER, "
             + STOPTIME + " INTEGER, "
             + NUMPOINTS + " INTEGER, "

src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java

@@ -16,37 +16,62 @@ import java.util.ArrayList;
 import java.util.List;
 
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.databinding.ChooseActivityTypeBinding;
-import de.dennisguse.opentracks.util.TrackIconUtils;
 
-/**
- * A DialogFragment to choose an activity type.
- */
 public class ChooseActivityTypeDialogFragment extends DialogFragment implements AdapterView.OnItemClickListener {
 
     private static final String CHOOSE_ACTIVITY_TYPE_DIALOG_TAG = "chooseActivityType";
 
-    public static void showDialog(FragmentManager fragmentManager, String preselectedCategory) {
-        new ChooseActivityTypeDialogFragment(preselectedCategory).show(fragmentManager, ChooseActivityTypeDialogFragment.CHOOSE_ACTIVITY_TYPE_DIALOG_TAG);
+    @Deprecated
+    public static void showDialog(FragmentManager fragmentManager, Context context, String activityTypeLocalized) {
+        ActivityType activityType = ActivityType.findByLocalizedString(context, activityTypeLocalized);
+        showDialog(fragmentManager, activityType);
     }
 
-    private static int getPosition(Context context, String category) {
-        if (category == null) {
+    public static void showDialog(FragmentManager fragmentManager, ActivityType activityType) {
+        new ChooseActivityTypeDialogFragment(activityType).show(fragmentManager, ChooseActivityTypeDialogFragment.CHOOSE_ACTIVITY_TYPE_DIALOG_TAG);
+    }
+
+    private static final List<ActivityType> activityTypes = List.of(
+            ActivityType.UNKNOWN,
+            ActivityType.AIRPLANE,
+            ActivityType.BIKING,
+            ActivityType.MOUNTAIN_BIKING,
+            ActivityType.MOTOR_BIKE,
+            ActivityType.KAYAKING,
+            ActivityType.BOAT,
+            ActivityType.SAILING,
+            ActivityType.DRIVING,
+            ActivityType.RUNNING,
+            ActivityType.SNOW_BOARDING,
+            ActivityType.SKIING,
+            ActivityType.WALKING,
+            ActivityType.ESCOOTER,
+            ActivityType.INLINE_SKATING,
+            ActivityType.SKATE_BOARDING,
+            ActivityType.CLIMBING,
+            ActivityType.SWIMMING,
+            ActivityType.SWIMMING_OPEN,
+            ActivityType.WORKOUT
+    );
+
+    private static int getPosition(Context context, ActivityType activityType) {
+        if (activityType == null) {
             return -1;
         }
-        String iconValue = TrackIconUtils.getIconValue(context, category);
 
-        return TrackIconUtils.getAllIconValues().indexOf(iconValue);
+        return activityTypes.indexOf(activityType);
     }
 
     private ChooseActivityTypeBinding viewBinding;
 
-    private final String preselectedCategory;
+    private final ActivityType preselectedActivityType;
 
     private ChooseActivityTypeCaller chooseActivityTypeCaller;
 
-    private ChooseActivityTypeDialogFragment(String preselectedCategory) {
-        this.preselectedCategory = preselectedCategory;
+    private ChooseActivityTypeDialogFragment(ActivityType activityType) {
+        this.preselectedActivityType = activityType;
     }
 
     @NonNull
@@ -61,13 +86,13 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment implements
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         viewBinding = ChooseActivityTypeBinding.inflate(inflater, container, false);
 
-        List<Integer> imageIds = new ArrayList<>();
-        for (String iconValue : TrackIconUtils.getAllIconValues()) {
-            imageIds.add(TrackIconUtils.getIconDrawable(iconValue));
+        List<Integer> iconDrawableIds = new ArrayList<>();
+        for (ActivityType activityType : activityTypes) {
+            iconDrawableIds.add(activityType.getIconDrawableId());
         }
 
-        final ChooseActivityTypeImageAdapter imageAdapter = new ChooseActivityTypeImageAdapter(imageIds);
-        int position = getPosition(getContext(), preselectedCategory);
+        final ChooseActivityTypeImageAdapter imageAdapter = new ChooseActivityTypeImageAdapter(iconDrawableIds);
+        int position = getPosition(getContext(), preselectedActivityType);
         if (position != -1) {
             imageAdapter.setSelected(position);
         }
@@ -94,7 +119,7 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment implements
 
     @Override
     public void onItemClick(AdapterView<?> adapterView, View view, int position, long id) {
-        chooseActivityTypeCaller.onChooseActivityTypeDone(TrackIconUtils.getAllIconValues().get(position));
+        chooseActivityTypeCaller.onChooseActivityTypeDone(activityTypes.get(position));
         dismiss();
     }
 
@@ -103,6 +128,6 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment implements
      */
     public interface ChooseActivityTypeCaller {
 
-        void onChooseActivityTypeDone(String iconValue);
+        void onChooseActivityTypeDone(ActivityType activityType);
     }
 }

src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java

@@ -16,6 +16,7 @@
 
 package de.dennisguse.opentracks.fragments;
 
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
@@ -28,12 +29,11 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.TrackRecordedActivity;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.DistanceFormatter;
 import de.dennisguse.opentracks.data.models.SpeedFormatter;
 import de.dennisguse.opentracks.data.models.Track;
@@ -43,7 +43,6 @@ import de.dennisguse.opentracks.settings.UnitSystem;
 import de.dennisguse.opentracks.stats.SensorStatistics;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.StringUtils;
-import de.dennisguse.opentracks.util.TrackIconUtils;
 
 /**
  * A fragment to display track statistics to the user for a recorded {@link Track}.
@@ -89,7 +88,7 @@ public class StatisticsRecordedFragment extends Fragment {
 
         if (PreferencesUtils.isKey(R.string.stats_rate_key, key) && track != null) {
             updateUInecessary = true;
-            preferenceReportSpeed = PreferencesUtils.isReportSpeed(track.getActivityType());
+            preferenceReportSpeed = PreferencesUtils.isReportSpeed(track);
         }
 
         if (key != null && updateUInecessary && isResumed()) {
@@ -113,10 +112,6 @@ public class StatisticsRecordedFragment extends Fragment {
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         viewBinding = StatisticsRecordedBinding.inflate(inflater, container, false);
 
-        RecyclerView sensorsRecyclerView = viewBinding.statsSensorsRecyclerView;
-        sensorsRecyclerView.setLayoutManager(new GridLayoutManager(getContext(), 2));
-//        sensorsRecyclerView.setAdapter(sensorsAdapter);
-
         return viewBinding.getRoot();
     }
 
@@ -155,7 +150,7 @@ public class StatisticsRecordedFragment extends Fragment {
 
                     sensorStatistics = contentProviderUtils.getSensorStats(trackId);
 
-                    boolean prefsChanged = this.track == null || (!this.track.getActivityType().equals(track.getActivityType()));
+                    boolean prefsChanged = this.track == null || (!this.track.getActivityTypeLocalized().equals(track.getActivityTypeLocalized()));
                     this.track = track;
                     if (prefsChanged) {
                         sharedPreferenceChangeListener.onSharedPreferenceChanged(null, getString(R.string.stats_rate_key));
@@ -191,8 +186,12 @@ public class StatisticsRecordedFragment extends Fragment {
 
         // Set activity type
         {
-            String trackIconValue = TrackIconUtils.getIconValue(getContext(), track.getActivityType());
-            viewBinding.statsActivityTypeIcon.setImageDrawable(ContextCompat.getDrawable(getContext(), TrackIconUtils.getIconDrawable(trackIconValue)));
+            Context context = getContext();
+            String localizedActivityType = track.getActivityTypeLocalized();
+            String trackIconValue = ActivityType.findByLocalizedString(context, localizedActivityType)
+                    .getIconId();
+            viewBinding.statsActivityTypeIcon.setImageDrawable(ContextCompat.getDrawable(getContext(), ActivityType.findBy(trackIconValue)
+                    .getIconDrawableId()));
         }
 
         // Set time and start datetime
@@ -253,6 +252,28 @@ public class StatisticsRecordedFragment extends Fragment {
         if (sensorStatistics == null) {
             return;
         }
-        //TODO
+
+        if (sensorStatistics.hasHeartRate()) {
+            String maxBPM = String.valueOf(Math.round(sensorStatistics.getMaxHeartRate().getBPM()));
+            String avgBPM = String.valueOf(Math.round(sensorStatistics.getAvgHeartRate().getBPM()));
+
+            viewBinding.statsHeartRateGroup.setVisibility(View.VISIBLE);
+            viewBinding.statsMaxHeartRateValue.setText(maxBPM);
+            viewBinding.statsAvgHeartRateValue.setText(avgBPM);
+        }
+        if (sensorStatistics.hasCadence()) {
+            String maxRPM = String.valueOf(Math.round(sensorStatistics.getMaxCadence().getRPM()));
+            String avgRPM = String.valueOf(Math.round(sensorStatistics.getAvgCadence().getRPM()));
+
+            viewBinding.statsCadenceGroup.setVisibility(View.VISIBLE);
+            viewBinding.statsMaxCadenceValue.setText(maxRPM);
+            viewBinding.statsAvgCadenceValue.setText(avgRPM);
+        }
+        if (sensorStatistics.hasPower()) {
+            String W = String.valueOf(Math.round(sensorStatistics.getAvgPower().getW()));
+
+            viewBinding.statsPowerGroup.setVisibility(View.VISIBLE);
+            viewBinding.statsPowerValue.setText(W);
+        }
     }
 }

src/main/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator.java

@@ -44,7 +44,7 @@ public class TrackFilenameGenerator {
 
         values.put(UUID_KEY, track.getUuid().toString().substring(0, 8));
         values.put(TRACKNAME_KEY, track.getName());
-        values.put(ACTIVITY_TYPE_KEY, track.getActivityType());
+        values.put(ACTIVITY_TYPE_KEY, track.getActivityTypeLocalized());
         values.put(STARTTIME_TIME_KEY, track.getStartTime().toLocalTime().toString());
         values.put(STARTTIME_DATE_KEY, track.getStartTime().toLocalDate().toString());
 

src/main/java/de/dennisguse/opentracks/io/file/exporter/CSVTrackExporter.java

@@ -66,6 +66,9 @@ public class CSVTrackExporter implements TrackExporter {
         SPEED_FORMAT.setMaximumFractionDigits(2);
         SPEED_FORMAT.setGroupingUsed(false);
 
+        DISTANCE_FORMAT.setMaximumFractionDigits(0);
+        DISTANCE_FORMAT.setGroupingUsed(false);
+
         HEARTRATE_FORMAT.setMaximumFractionDigits(0);
         HEARTRATE_FORMAT.setGroupingUsed(false);
 

src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java

@@ -151,8 +151,12 @@ public class GPXTrackExporter implements TrackExporter {
                         if (wroteSegment) writeCloseSegment();
                         writeOpenSegment();
                         wroteSegment = true;
-                        trackDistance = trackDistance.plus(writeTrackPoint(track.getZoneOffset(), trackPoint, sensorPoints, trackDistance));
-                        sensorPoints.clear();
+                        if (trackPoint.hasLocation()) {
+                            trackDistance = trackDistance.plus(writeTrackPoint(track.getZoneOffset(), trackPoint, sensorPoints, trackDistance));
+                            sensorPoints.clear();
+                        } else {
+                            sensorPoints.add(trackPoint);
+                        }
                     }
                     case SENSORPOINT -> sensorPoints.add(trackPoint);
                     case TRACKPOINT -> {
@@ -268,7 +272,7 @@ public class GPXTrackExporter implements TrackExporter {
             printWriter.println("<trk>");
             printWriter.println("<name>" + StringUtils.formatCData(track.getName()) + "</name>");
             printWriter.println("<desc>" + StringUtils.formatCData(track.getDescription()) + "</desc>");
-            printWriter.println("<type>" + StringUtils.formatCData(track.getActivityType()) + "</type>");
+            printWriter.println("<type>" + StringUtils.formatCData(track.getActivityTypeLocalized()) + "</type>");
 
             printWriter.println("<extensions>");
             printWriter.println("<topografix:color>c0c0c0</topografix:color>");

src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java

@@ -45,7 +45,7 @@ import de.dennisguse.opentracks.util.StringUtils;
 
 /**
  * Convert {@link Track} incl. {@link Marker} and {@link TrackPoint} to KML version 2.3.
- * https://docs.opengeospatial.org/is/12-007r2/12-007r2.html
+ * <a href="https://docs.opengeospatial.org/is/12-007r2/12-007r2.html">...</a>
  *
  * @author Sandor Dornbush
  * @author Rodrigo Damazio
@@ -307,11 +307,11 @@ public class KMLTrackExporter implements TrackExporter {
 
             printWriter.println("<name>" + StringUtils.formatCData(track.getName()) + "</name>");
             printWriter.println("<description>" + StringUtils.formatCData(track.getDescription()) + "</description>");
-            printWriter.println("<icon>" + StringUtils.formatCData(track.getIcon()) + "</icon>");
+            printWriter.println("<icon>" + StringUtils.formatCData(track.getActivityType().getIconId()) + "</icon>");
             printWriter.println("<opentracks:trackid>" + track.getUuid() + "</opentracks:trackid>");
 
             printWriter.println("<styleUrl>#" + TRACK_STYLE + "</styleUrl>");
-            writeActivityType(track.getActivityType());
+            writeActivityType(track.getActivityTypeLocalized());
             printWriter.println("<MultiTrack>");
             printWriter.println("<altitudeMode>absolute</altitudeMode>");
             printWriter.println("<interpolate>1</interpolate>");
@@ -514,12 +514,12 @@ public class KMLTrackExporter implements TrackExporter {
         return result;
     }
 
-    private void writeActivityType(String actiivtyType) {
-        if (actiivtyType == null || actiivtyType.equals("")) {
+    private void writeActivityType(String activityTypeLocalized) {
+        if (activityTypeLocalized == null || activityTypeLocalized.equals("")) {
             return;
         }
         printWriter.println("<ExtendedData>");
-        printWriter.println("<Data name=\"" + EXTENDED_DATA_TYPE_ACTIVITYTYPE + "\"><value>" + StringUtils.formatCData(actiivtyType) + "</value></Data>");
+        printWriter.println("<Data name=\"" + EXTENDED_DATA_TYPE_ACTIVITYTYPE + "\"><value>" + StringUtils.formatCData(activityTypeLocalized) + "</value></Data>");
         printWriter.println("</ExtendedData>");
     }
 

src/main/java/de/dennisguse/opentracks/io/file/importer/GpxTrackImporter.java

@@ -41,8 +41,8 @@ import de.dennisguse.opentracks.util.StringUtils;
 /**
  * Imports a GPX file.
  * Uses:
- * * https://www8.garmin.com/xmlschemas/TrackPointExtensionv2.xsd
- * * https://www8.garmin.com/xmlschemas/PowerExtensionv1.xsd
+ * * <a href="https://www8.garmin.com/xmlschemas/TrackPointExtensionv2.xsd">...</a>
+ * * <a href="https://www8.garmin.com/xmlschemas/PowerExtensionv1.xsd">...</a>
  * <p>
  * {@link de.dennisguse.opentracks.io.file.exporter.GPXTrackExporter} does not export information if a segment was started automatic or manually.
  * Therefore, all segments starts are marked as SEGMENT_START_AUTOMATIC.

src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java

@@ -20,6 +20,7 @@ import java.util.stream.Collectors;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.Marker;
 import de.dennisguse.opentracks.data.models.Speed;
@@ -30,7 +31,6 @@ import de.dennisguse.opentracks.stats.TrackStatisticsUpdater;
 import de.dennisguse.opentracks.ui.markers.MarkerUtils;
 import de.dennisguse.opentracks.util.FileUtils;
 import de.dennisguse.opentracks.util.LocationUtils;
-import de.dennisguse.opentracks.util.TrackIconUtils;
 
 /**
  * Handles logic to import:
@@ -90,7 +90,7 @@ public class TrackImporter {
         this.markers.addAll(markers);
     }
 
-    void setTrack(Context context, String name, String uuid, String description, String activityType, String icon, @Nullable ZoneOffset zoneOffset) {
+    void setTrack(Context context, String name, String uuid, String description, String activityTypeLocalized, String activityTypeId, @Nullable ZoneOffset zoneOffset) {
         track = new Track(zoneOffset != null ? zoneOffset : ZoneOffset.UTC);
         track.setName(name != null ? name : "");
 
@@ -103,15 +103,17 @@ public class TrackImporter {
 
         track.setDescription(description != null ? description : "");
 
-        if (activityType != null) {
-            track.setActivityType(activityType);
-
-            if (icon == null) {
-                icon = TrackIconUtils.getIconValue(context, activityType);
-            }
+        if (activityTypeLocalized != null) {
+            track.setActivityTypeLocalized(activityTypeLocalized);
         }
 
-        track.setIcon(icon != null ? icon : "");
+        ActivityType activityType;
+        if (activityTypeId == null) {
+            activityType = ActivityType.findByLocalizedString(context, activityTypeId);
+        } else {
+            activityType = ActivityType.findBy(activityTypeId);
+        }
+        track.setActivityType(activityType);
     }
 
     void finish() {
@@ -135,7 +137,7 @@ public class TrackImporter {
             track.setUuid(UUID.randomUUID());
         }
 
-        Collections.sort(trackPoints, (o1, o2) -> {
+        trackPoints.sort((o1, o2) -> {
             if (o1.getTime().isBefore(o2.getTime())) {
                 return -1;
             }

src/main/java/de/dennisguse/opentracks/publicapi/StartRecording.java

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import androidx.annotation.NonNull;
 
 import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
@@ -14,8 +15,8 @@ import de.dennisguse.opentracks.util.TrackUtils;
 public class StartRecording extends AbstractAPIActivity {
 
     public static final String EXTRA_TRACK_NAME = "TRACK_NAME";
-    public static final String EXTRA_TRACK_CATEGORY = "TRACK_CATEGORY";
-    public static final String EXTRA_TRACK_ICON = "TRACK_ICON";
+    public static final String EXTRA_TRACK_ACTIVITY_TYPE_LOCALIZED = "TRACK_CATEGORY"; //TODO Update constant
+    public static final String EXTRA_TRACK_ACTIVITY_TYPE_ID = "TRACK_ICON"; //TODO Update constant
     public static final String EXTRA_TRACK_DESCRIPTION = "TRACK_DESCRIPTION";
 
     public static final String EXTRA_STATS_TARGET_PACKAGE = "STATS_TARGET_PACKAGE";
@@ -43,8 +44,8 @@ public class StartRecording extends AbstractAPIActivity {
 
         TrackUtils.updateTrack(this, track,
                 bundle.getString(EXTRA_TRACK_NAME, null),
-                bundle.getString(EXTRA_TRACK_CATEGORY, null),
-                bundle.getString(EXTRA_TRACK_ICON, null),
+                bundle.getString(EXTRA_TRACK_ACTIVITY_TYPE_LOCALIZED, null),
+                ActivityType.findBy(bundle.getString(EXTRA_TRACK_ACTIVITY_TYPE_ID, null)),
                 bundle.getString(EXTRA_TRACK_DESCRIPTION, null),
                 contentProviderUtils);
     }

src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManager.java

@@ -65,39 +65,36 @@ public class BluetoothRemoteSensorManager implements SensorConnector, AbstractBl
     private final BluetoothConnectionManagerCyclingPower cyclingPower = new BluetoothConnectionManagerCyclingPower(this);
     private final BluetoothConnectionRunningSpeedAndCadence runningSpeedAndCadence = new BluetoothConnectionRunningSpeedAndCadence(this);
 
-    private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
-        @Override
-        public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-            if (!started) return;
+    private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = (sharedPreferences, key) -> {
+        if (!started) return;
 
-            if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_heart_rate_key, key)) {
-                String address = PreferencesUtils.getBluetoothHeartRateSensorAddress();
-                connect(heartRate, address);
-            }
+        if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_heart_rate_key, key)) {
+            String address = PreferencesUtils.getBluetoothHeartRateSensorAddress();
+            connect(heartRate, address);
+        }
 
-            if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_cycling_cadence_key, key)) {
-                String address = PreferencesUtils.getBluetoothCyclingCadenceSensorAddress();
-                connect(cyclingCadence, address);
-            }
+        if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_cycling_cadence_key, key)) {
+            String address = PreferencesUtils.getBluetoothCyclingCadenceSensorAddress();
+            connect(cyclingCadence, address);
+        }
 
-            if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_cycling_speed_key, key)) {
-                String address = PreferencesUtils.getBluetoothCyclingSpeedSensorAddress();
+        if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_cycling_speed_key, key)) {
+            String address = PreferencesUtils.getBluetoothCyclingSpeedSensorAddress();
 
-                connect(cyclingSpeed, address);
-            }
+            connect(cyclingSpeed, address);
+        }
 
-            if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_cycling_power_key, key)) {
-                String address = PreferencesUtils.getBluetoothCyclingPowerSensorAddress();
+        if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_cycling_power_key, key)) {
+            String address = PreferencesUtils.getBluetoothCyclingPowerSensorAddress();
 
-                connect(cyclingPower, address);
-            }
+            connect(cyclingPower, address);
+        }
 
 
-            if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_running_speed_and_cadence_key, key)) {
-                String address = PreferencesUtils.getBluetoothRunningSpeedAndCadenceAddress();
+        if (PreferencesUtils.isKey(R.string.settings_sensor_bluetooth_running_speed_and_cadence_key, key)) {
+            String address = PreferencesUtils.getBluetoothRunningSpeedAndCadenceAddress();
 
-                connect(runningSpeedAndCadence, address);
-            }
+            connect(runningSpeedAndCadence, address);
         }
     };
 

src/main/java/de/dennisguse/opentracks/sensors/BluetoothUtils.java

@@ -23,8 +23,6 @@ import android.util.Log;
 
 import androidx.annotation.NonNull;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 

src/main/java/de/dennisguse/opentracks/sensors/ServiceMeasurementUUID.java

@@ -1,8 +1,5 @@
 package de.dennisguse.opentracks.sensors;
 
-import androidx.annotation.NonNull;
-
-import java.util.Objects;
 import java.util.UUID;
 
 public record ServiceMeasurementUUID(UUID serviceUUID, UUID measurementUUID) {

src/main/java/de/dennisguse/opentracks/services/RecordingData.java

@@ -16,7 +16,7 @@ public record RecordingData(Track track, TrackPoint latestTrackPoint, SensorData
         if (track == null) {
             return "";
         }
-        return track.getActivityType();
+        return track.getActivityTypeLocalized();
     }
 
     @NonNull

src/main/java/de/dennisguse/opentracks/services/RecordingStatus.java

@@ -1,9 +1,6 @@
 package de.dennisguse.opentracks.services;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
-
-import java.util.Objects;
 
 import de.dennisguse.opentracks.data.models.Track;
 

src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java

@@ -15,6 +15,7 @@ import java.time.ZoneOffset;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.Marker;
 import de.dennisguse.opentracks.data.models.Track;
@@ -24,7 +25,6 @@ import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.stats.TrackStatisticsUpdater;
-import de.dennisguse.opentracks.util.TrackIconUtils;
 import de.dennisguse.opentracks.util.TrackNameUtils;
 
 class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChangeListener {
@@ -72,9 +72,9 @@ class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChang
 
         onNewTrackPoint(segmentStartTrackPoint);
 
-        String category = PreferencesUtils.getDefaultActivity();
-        track.setActivityType(category);
-        track.setIcon(TrackIconUtils.getIconValue(context, category));
+        String activityTypeLocalized = PreferencesUtils.getDefaultActivityTypeLocalized();
+        track.setActivityTypeLocalized(activityTypeLocalized);
+        track.setActivityType(ActivityType.findByLocalizedString(context, activityTypeLocalized));
         track.setTrackStatistics(trackStatisticsUpdater.getTrackStatistics());
         //TODO Pass TrackPoint
         track.setName(TrackNameUtils.getTrackName(context, trackId, track.getStartTime()));

src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java

@@ -36,7 +36,7 @@ import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
 import de.dennisguse.opentracks.services.announcement.VoiceAnnouncementManager;
-import de.dennisguse.opentracks.services.handlers.EGM2008CorrectionManager;
+import de.dennisguse.opentracks.services.handlers.AltitudeCorrectionManager;
 import de.dennisguse.opentracks.services.handlers.GpsStatusValue;
 import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
 import de.dennisguse.opentracks.util.SystemUtils;
@@ -95,7 +95,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
     private VoiceAnnouncementManager voiceAnnouncementManager;
     private TrackRecordingServiceNotificationManager notificationManager;
 
-    private EGM2008CorrectionManager egm2008CorrectionManager;
+    private AltitudeCorrectionManager egm2008CorrectionManager;
 
     @Override
     public void onCreate() {
@@ -108,7 +108,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
         gpsStatusObservable = new MutableLiveData<>(STATUS_GPS_DEFAULT);
         recordingDataObservable = new MutableLiveData<>(NOT_RECORDING);
 
-        egm2008CorrectionManager = new EGM2008CorrectionManager();
+        egm2008CorrectionManager = new AltitudeCorrectionManager();
         trackRecordingManager = new TrackRecordingManager(this);
         trackRecordingManager.start();
         trackPointCreator = new TrackPointCreator(this, this, handler);

src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java

@@ -182,7 +182,7 @@ public class VoiceAnnouncement {
             sensorStatistics = contentProviderUtils.getSensorStats(track.getId());
         }
 
-        Spannable announcement = VoiceAnnouncementUtils.getAnnouncement(context, track.getTrackStatistics(), PreferencesUtils.getUnitSystem(), PreferencesUtils.isReportSpeed(track.getActivityType()), lastInterval, sensorStatistics);
+        Spannable announcement = VoiceAnnouncementUtils.getAnnouncement(context, track.getTrackStatistics(), PreferencesUtils.getUnitSystem(), PreferencesUtils.isReportSpeed(track), lastInterval, sensorStatistics);
 
         if (announcement.length() > 0) {
             // We don't care about the utterance id. It is supplied here to force onUtteranceCompleted to be called.

src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.java

@@ -9,6 +9,7 @@ import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnno
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldVoiceAnnounceTotalDistance;
 
 import android.content.Context;
+import android.icu.text.MessageFormat;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.style.TtsSpan;
@@ -17,6 +18,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.time.Duration;
+import java.util.Map;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.models.Distance;
@@ -45,22 +47,22 @@ class VoiceAnnouncementUtils {
         switch (unitSystem) {
             case METRIC -> {
                 perUnitStringId = R.string.voice_per_kilometer;
-                distanceId = R.plurals.voiceDistanceKilometers;
-                speedId = R.plurals.voiceSpeedKilometersPerHour;
+                distanceId = R.string.voiceDistanceKilometersPlural;
+                speedId = R.string.voiceSpeedKilometersPerHourPlural;
                 unitDistanceTTS = "kilometer";
                 unitSpeedTTS = "kilometer per hour";
             }
-            case IMPERIAL_FEET -> {
+            case IMPERIAL_FEET, IMPERIAL_METER -> {
                 perUnitStringId = R.string.voice_per_mile;
-                distanceId = R.plurals.voiceDistanceMiles;
-                speedId = R.plurals.voiceSpeedMilesPerHour;
+                distanceId = R.string.voiceDistanceMilesPlural;
+                speedId = R.string.voiceSpeedMilesPerHourPlural;
                 unitDistanceTTS = "mile";
                 unitSpeedTTS = "mile per hour";
             }
             case NAUTICAL_IMPERIAL -> {
                 perUnitStringId = R.string.voice_per_nautical_mile;
-                distanceId = R.plurals.voiceDistanceNauticalMiles;
-                speedId = R.plurals.voiceSpeedMKnots;
+                distanceId = R.string.voiceDistanceNauticalMilesPlural;
+                speedId = R.string.voiceSpeedMKnotsPlural;
                 unitDistanceTTS = "nautical mile";
                 unitSpeedTTS = "knots";
             }
@@ -73,7 +75,8 @@ class VoiceAnnouncementUtils {
             builder.append(context.getString(R.string.total_distance));
             // Units should always be english singular for TTS.
             // See https://developer.android.com/reference/android/text/style/TtsSpan?hl=en#TYPE_MEASURE
-            appendDecimalUnit(builder, context.getResources().getQuantityString(distanceId, getQuantityCount(distanceInUnit), distanceInUnit), distanceInUnit, 1, unitDistanceTTS);
+            String template = context.getResources().getString(distanceId);
+            appendDecimalUnit(builder, MessageFormat.format(template, Map.of("n", distanceInUnit)), distanceInUnit, 1, unitDistanceTTS);
             // Punctuation helps introduce natural pauses in TTS
             builder.append(".");
         }
@@ -93,7 +96,8 @@ class VoiceAnnouncementUtils {
                 double speedInUnit = averageMovingSpeed.to(unitSystem);
                 builder.append(" ")
                         .append(context.getString(R.string.speed));
-                appendDecimalUnit(builder, context.getResources().getQuantityString(speedId, getQuantityCount(speedInUnit), speedInUnit), speedInUnit, 1, unitSpeedTTS);
+                String template = context.getResources().getString(speedId);
+                appendDecimalUnit(builder, MessageFormat.format(template, Map.of("n", speedInUnit)), speedInUnit, 1, unitSpeedTTS);
                 builder.append(".");
             }
             if (shouldVoiceAnnounceLapSpeedPace() && currentDistancePerTime != null) {
@@ -101,7 +105,8 @@ class VoiceAnnouncementUtils {
                 if (currentDistancePerTimeInUnit > 0) {
                     builder.append(" ")
                             .append(context.getString(R.string.lap_speed));
-                    appendDecimalUnit(builder, context.getResources().getQuantityString(speedId, getQuantityCount(currentDistancePerTimeInUnit), currentDistancePerTimeInUnit), currentDistancePerTimeInUnit, 1, unitSpeedTTS);
+                    String template = context.getResources().getString(speedId);
+                    appendDecimalUnit(builder, MessageFormat.format(template, Map.of("n", currentDistancePerTimeInUnit)), currentDistancePerTimeInUnit, 1, unitSpeedTTS);
                     builder.append(".");
                 }
             }
@@ -147,23 +152,22 @@ class VoiceAnnouncementUtils {
         return builder;
     }
 
-    static int getQuantityCount(double d) {
-        return (int) d;
-    }
-
     private static void appendDuration(@NonNull Context context, @NonNull SpannableStringBuilder builder, @NonNull Duration duration) {
         int hours = (int) (duration.toHours());
         int minutes = (int) (duration.toMinutes() % 60);
         int seconds = (int) (duration.getSeconds() % 60);
 
         if (hours > 0) {
-            appendDecimalUnit(builder, context.getResources().getQuantityString(R.plurals.voiceHours, hours, hours), hours, 0, "hour");
+            String template = context.getResources().getString(R.string.voiceHoursPlural);
+            appendDecimalUnit(builder, MessageFormat.format(template, Map.of("n", hours)), hours, 0, "hour");
         }
         if (minutes > 0) {
-            appendDecimalUnit(builder, context.getResources().getQuantityString(R.plurals.voiceMinutes, minutes, minutes), minutes, 0, "minute");
+            String template = context.getResources().getString(R.string.voiceMinutesPlural);
+            appendDecimalUnit(builder, MessageFormat.format(template, Map.of("n", minutes)), minutes, 0, "minute");
         }
         if (seconds > 0 || duration.isZero()) {
-            appendDecimalUnit(builder, context.getResources().getQuantityString(R.plurals.voiceSeconds, seconds, seconds), seconds, 0, "second");
+            String template = context.getResources().getString(R.string.voiceSecondsPlural);
+            appendDecimalUnit(builder, MessageFormat.format(template, Map.of("n", seconds)), seconds, 0, "second");
         }
     }
 

src/main/java/de/dennisguse/opentracks/services/handlers/AltitudeCorrectionManager.java

@@ -0,0 +1,72 @@
+package de.dennisguse.opentracks.services.handlers;
+
+import android.content.Context;
+import android.location.Location;
+import android.location.altitude.AltitudeConverter;
+import android.os.Build;
+import android.util.Log;
+
+import java.io.IOException;
+
+import de.dennisguse.opentracks.data.models.Altitude;
+import de.dennisguse.opentracks.data.models.TrackPoint;
+import de.dennisguse.opentracks.util.EGM2008Utils;
+
+/**
+ * More infos regarding Android 34's <a href="https://issuetracker.google.com/issues/195660815#comment1">AltitudeConverter</a>.
+ */
+public class AltitudeCorrectionManager {
+
+    private static final String TAG = AltitudeCorrectionManager.class.getSimpleName();
+
+    private AltitudeConverter altitudeConverter;
+
+    private final EGM2008Internal altitudeConverterFallback;
+
+    public AltitudeCorrectionManager() {
+        this.altitudeConverterFallback = new EGM2008Internal();
+        this.altitudeConverter = Build.VERSION.SDK_INT >= 34 ? new AltitudeConverter() : null;
+    }
+
+    public void correctAltitude(Context context, TrackPoint trackPoint) {
+        if (Build.VERSION.SDK_INT >= 34 && altitudeConverter != null) {
+            try {
+                Location loc = trackPoint.getLocation();
+                altitudeConverter.addMslAltitudeToLocation(context, loc);
+                trackPoint.setAltitude(Altitude.EGM2008.of(loc.getMslAltitudeMeters()));
+                return;
+            } catch (IOException e) {
+                Log.w(TAG, "Android's AltitudeConverter crashed; falling back to internal.");
+                altitudeConverter = null;
+                // Should we fallback
+            }
+        }
+
+        altitudeConverterFallback.correctAltitude(context, trackPoint);
+    }
+
+    private static class EGM2008Internal {
+
+        private static final String TAG = EGM2008Internal.class.getSimpleName();
+
+        private EGM2008Utils.EGM2008Correction egm2008Correction;
+
+        public void correctAltitude(Context context, TrackPoint trackPoint) {
+            if (!trackPoint.hasLocation() || !trackPoint.hasAltitude()) {
+                Log.d(TAG, "No altitude correction necessary.");
+                return;
+            }
+
+            if (egm2008Correction == null || !egm2008Correction.canCorrect(trackPoint.getLocation())) {
+                try {
+                    egm2008Correction = EGM2008Utils.createCorrection(context, trackPoint.getLocation());
+                } catch (IOException e) {
+                    Log.e(TAG, "Could not load altitude correction for " + trackPoint, e);
+                    return;
+                }
+            }
+
+            trackPoint.setAltitude(egm2008Correction.correctAltitude(trackPoint.getLocation()));
+        }
+    }
+}

src/main/java/de/dennisguse/opentracks/services/handlers/EGM2008CorrectionManager.java

@@ -1,34 +0,0 @@
-package de.dennisguse.opentracks.services.handlers;
-
-import android.content.Context;
-import android.util.Log;
-
-import java.io.IOException;
-
-import de.dennisguse.opentracks.data.models.TrackPoint;
-import de.dennisguse.opentracks.util.EGM2008Utils;
-
-public class EGM2008CorrectionManager {
-
-    private static final String TAG = EGM2008CorrectionManager.class.getSimpleName();
-
-    private EGM2008Utils.EGM2008Correction egm2008Correction;
-
-    public void correctAltitude(Context context, TrackPoint trackPoint) {
-        if (!trackPoint.hasLocation() || !trackPoint.hasAltitude()) {
-            Log.d(TAG, "No altitude correction necessary.");
-            return;
-        }
-
-        if (egm2008Correction == null || !egm2008Correction.canCorrect(trackPoint.getLocation())) {
-            try {
-                egm2008Correction = EGM2008Utils.createCorrection(context, trackPoint.getLocation());
-            } catch (IOException e) {
-                Log.e(TAG, "Could not load altitude correction for " + trackPoint, e);
-                return;
-            }
-        }
-
-        trackPoint.setAltitude(egm2008Correction.correctAltitude(trackPoint.getLocation()));
-    }
-}

src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java

@@ -30,7 +30,6 @@ import androidx.preference.PreferenceDialogFragmentCompat;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
-import de.dennisguse.opentracks.util.TrackIconUtils;
 
 /**
  * For entering the default activity type.
@@ -47,7 +46,7 @@ public class ActivityTypePreference extends DialogPreference {
         setDialogIcon(null);
         setPersistent(true);
 
-        SummaryProvider<DialogPreference> summaryProvider = preference -> PreferencesUtils.getDefaultActivity();
+        SummaryProvider<DialogPreference> summaryProvider = preference -> PreferencesUtils.getDefaultActivityTypeLocalized();
         setSummaryProvider(summaryProvider);
     }
 
@@ -78,30 +77,32 @@ public class ActivityTypePreference extends DialogPreference {
             final Context context = getActivity();
 
             textView = view.findViewById(R.id.activity_type_preference_text_view);
-            String category = PreferencesUtils.getDefaultActivity();
-            textView.setText(category);
+            String activityTypeLocalized = PreferencesUtils.getDefaultActivityTypeLocalized();
+            textView.setText(activityTypeLocalized);
             ArrayAdapter<String> adapter = new ArrayAdapter<>(context, android.R.layout.simple_dropdown_item_1line, ActivityType.getLocalizedStrings(context));
             textView.setAdapter(adapter);
             textView.setOnItemClickListener((parent, v, position, id) -> {
-                String iconValue = TrackIconUtils.getIconValue(context, (String) textView.getAdapter().getItem(position));
-                updateIcon(iconValue);
+                String localizedActivityType = (String) textView.getAdapter().getItem(position);
+                ActivityType activityType = ActivityType.findByLocalizedString(context, localizedActivityType);
+                updateIcon(activityType);
             });
             textView.setOnFocusChangeListener((v, hasFocus) -> {
                 if (!hasFocus) {
-                    String iconValue = TrackIconUtils.getIconValue(context, textView.getText().toString());
-                    updateIcon(iconValue);
+                    String localizedActivityType = textView.getText().toString();
+                    ActivityType activityType = ActivityType.findByLocalizedString(context, localizedActivityType);
+                    updateIcon(activityType);
                 }
             });
 
             iconView = view.findViewById(R.id.activity_type_preference_spinner);
             iconView.setOnClickListener((it) -> showIconSelectDialog());
 
-            updateIcon(TrackIconUtils.getIconValue(context, category));
+            updateIcon(ActivityType.findByLocalizedString(context, activityTypeLocalized));
         }
 
         private void showIconSelectDialog() {
-            String category = PreferencesUtils.getDefaultActivity();
-            ChooseActivityTypeDialogFragment.showDialog(getActivity().getSupportFragmentManager(), category);
+            String category = PreferencesUtils.getDefaultActivityTypeLocalized();
+            ChooseActivityTypeDialogFragment.showDialog(getActivity().getSupportFragmentManager(), getContext(), category);
         }
 
         @Override
@@ -109,20 +110,20 @@ public class ActivityTypePreference extends DialogPreference {
             if (positiveResult) {
                 String newDefaultActivity = textView.getText().toString();
                 if (getPreference().callChangeListener(newDefaultActivity)) {
-                    PreferencesUtils.setDefaultActivity(newDefaultActivity);
+                    PreferencesUtils.setDefaultActivityLocalized(newDefaultActivity);
                     HackUtils.invalidatePreference(getPreference());
                 }
             }
         }
 
-        public void updateUI(String iconValue) {
-            updateIcon(iconValue);
-            textView.setText(getActivity().getString(TrackIconUtils.getIconActivityType(iconValue)));
+        public void updateUI(ActivityType activityType) {
+            updateIcon(activityType);
+            textView.setText(getActivity().getString(activityType.getLocalizedStringId()));
             textView.clearFocus();
         }
 
-        private void updateIcon(String iconValue) {
-            iconView.setImageResource(TrackIconUtils.getIconDrawable(iconValue));
+        private void updateIcon(ActivityType activityType) {
+            iconView.setImageResource(activityType.getIconDrawableId());
         }
     }
 }

src/main/java/de/dennisguse/opentracks/settings/DefaultsSettingsFragment.java

@@ -9,6 +9,7 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 
 public class DefaultsSettingsFragment extends PreferenceFragmentCompat implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller {
@@ -81,9 +82,9 @@ public class DefaultsSettingsFragment extends PreferenceFragmentCompat implement
     }
 
     @Override
-    public void onChooseActivityTypeDone(String iconValue) {
+    public void onChooseActivityTypeDone(ActivityType activityType) {
         if (activityPreferenceDialog != null) {
-            activityPreferenceDialog.updateUI(iconValue);
+            activityPreferenceDialog.updateUI(activityType);
         }
     }
 }

src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java

@@ -40,18 +40,19 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.DistanceFormatter;
 import de.dennisguse.opentracks.data.models.HeartRate;
 import de.dennisguse.opentracks.data.models.HeartRateZones;
 import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.io.file.TrackFilenameGenerator;
 import de.dennisguse.opentracks.ui.customRecordingLayout.CsvLayoutUtils;
 import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayout;
 import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayoutIO;
 import de.dennisguse.opentracks.util.IntentDashboardUtils;
-import de.dennisguse.opentracks.util.TrackIconUtils;
 
 /**
  * Utilities to access preferences stored in {@link SharedPreferences}.
@@ -90,11 +91,11 @@ public class PreferencesUtils {
         sharedPreferences.unregisterOnSharedPreferenceChangeListener(changeListener);
     }
 
-    public static String getDefaultActivity() {
+    public static String getDefaultActivityTypeLocalized() {
         return getString(R.string.default_activity_key, resources.getString(R.string.default_activity_default));
     }
 
-    public static void setDefaultActivity(String newDefaultActivity) {
+    public static void setDefaultActivityLocalized(String newDefaultActivity) {
         setString(R.string.default_activity_key, newDefaultActivity);
     }
 
@@ -233,16 +234,21 @@ public class PreferencesUtils {
         }
     }
 
-    public static boolean isReportSpeed(String category) {
+    public static boolean isReportSpeed(String activityTypeLocalized) {
         final String STATS_RATE_DEFAULT = resources.getString(R.string.stats_rate_default);
         String currentStatsRate = getString(R.string.stats_rate_key, STATS_RATE_DEFAULT);
         if (currentStatsRate.equals(getString(R.string.stats_rate_speed_or_pace_default, STATS_RATE_DEFAULT))) {
-            return TrackIconUtils.isSpeedIcon(resources, category);
+            return ActivityType.findByLocalizedString(resources, activityTypeLocalized)
+                    .isShowSpeedPreferred();
         }
 
         return currentStatsRate.equals(resources.getString(R.string.stats_rate_speed));
     }
 
+    public static boolean isReportSpeed(Track track) {
+        return isReportSpeed(track.getActivityTypeLocalized());
+    }
+
     private static String getBluetoothSensorAddressNone() {
         return resources.getString(R.string.sensor_type_value_none);
     }
@@ -448,7 +454,7 @@ public class PreferencesUtils {
 
             String displayValue = formatter.formatDistance(distance);
             switch (unitSystem) {
-                case METRIC -> {
+                case METRIC, IMPERIAL_METER -> {
                     if (value == recordingDistanceIntervalDefault) {
                         entries[i] = resources.getString(R.string.value_integer_meter_recommended, value);
                     } else {
@@ -492,7 +498,7 @@ public class PreferencesUtils {
 
             String displayValue = formatter.formatDistance(distance);
             switch (unitSystem) {
-                case METRIC -> {
+                case METRIC, IMPERIAL_METER -> {
                     if (value == maxRecordingDistanceDefault) {
                         entries[i] = resources.getString(R.string.value_integer_meter_recommended, value);
                     } else {
@@ -565,7 +571,7 @@ public class PreferencesUtils {
 
             String displayValue = formatter.formatDistance(distance);
             switch (unitSystem) {
-                case METRIC -> {
+                case METRIC, IMPERIAL_METER -> {
                     if (value == recordingGPSAccuracyDefault) {
                         entries[i] = resources.getString(R.string.value_integer_meter_recommended, value);
                     } else if (value == recordingGPSAccuracyExcellent) {
@@ -618,7 +624,7 @@ public class PreferencesUtils {
                         entries[i] = resources.getString(R.string.value_float_kilometer_hour, value);
                     }
                 }
-                case IMPERIAL_FEET -> {
+                case IMPERIAL_FEET, IMPERIAL_METER -> {
                     double valueMPH = Speed.ofKMH(value).toMPH();
                     if (value == idleSpeedDefault) {
                         entries[i] = resources.getString(R.string.value_float_mile_hour_recommended, valueMPH);

src/main/java/de/dennisguse/opentracks/settings/SensorsSettingsFragment.java

@@ -2,14 +2,17 @@ package de.dennisguse.opentracks.settings;
 
 import android.os.Bundle;
 import android.util.Log;
+import android.widget.Toast;
 
 import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentActivity;
 import androidx.preference.EditTextPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.settings.bluetooth.BluetoothLeSensorPreference;
+import de.dennisguse.opentracks.util.PermissionRequester;
 
 public class SensorsSettingsFragment extends PreferenceFragmentCompat {
 
@@ -30,6 +33,13 @@ public class SensorsSettingsFragment extends PreferenceFragmentCompat {
     @Override
     public void onDisplayPreferenceDialog(Preference preference) {
         if (preference instanceof BluetoothLeSensorPreference) {
+            if(!PermissionRequester.BLUETOOTH.hasPermission(preference.getContext())) {
+                // TODO: maybe use requestPermissionsIfNeeded here or disable preferences at all
+                FragmentActivity activity = getActivity();
+                Toast.makeText(activity, getString(R.string.permission_bluetooth_failed), Toast.LENGTH_LONG).show();
+                return;
+            }
+
             DialogFragment dialogFragment = ((BluetoothLeSensorPreference) preference).createInstance();
             dialogFragment.setTargetFragment(this, 0);
             dialogFragment.show(getParentFragmentManager(), getClass().getSimpleName());

src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java

@@ -10,6 +10,7 @@ import androidx.preference.PreferenceFragmentCompat;
 
 import de.dennisguse.opentracks.AbstractActivity;
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.databinding.SettingsBinding;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 
@@ -104,9 +105,9 @@ public class SettingsActivity extends AbstractActivity implements ChooseActivity
     }
 
     @Override
-    public void onChooseActivityTypeDone(String iconValue) {
+    public void onChooseActivityTypeDone(ActivityType activityType) {
         try {
-            ((ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller) this.fragment).onChooseActivityTypeDone(iconValue);
+            ((ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller) this.fragment).onChooseActivityTypeDone(activityType);
         } catch (ClassCastException e) {
             throw new ClassCastException(this.fragment.getClass().getSimpleName() + " must implement " + ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller.class.getSimpleName());
         }

src/main/java/de/dennisguse/opentracks/share/DescriptionGenerator.java

@@ -72,7 +72,7 @@ public class DescriptionGenerator {
         builder.append(paragraphSeparator);
 
         writeString(track.getName(), builder, R.string.generic_name_line, lineBreak);
-        writeString(track.getActivityType(), builder, R.string.description_activity_type, lineBreak);
+        writeString(track.getActivityTypeLocalized(), builder, R.string.description_activity_type, lineBreak);
         writeString(track.getDescription(), builder, R.string.generic_description_line, lineBreak);
         builder.append(generateTrackStatisticsDescription(track.getTrackStatistics(), html));
 

src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java

@@ -38,6 +38,7 @@ import de.dennisguse.opentracks.data.models.TrackPoint;
  */
 //TODO Use null instead of Double.isInfinite
 //TODO Check that data ranges are valid (not less than zero etc.)
+//TODO Should be a Java record
 public class TrackStatistics {
 
     // The min and max altitude (meters) seen on this track.
@@ -261,7 +262,7 @@ public class TrackStatistics {
      * This calculation only takes into account the displacement until the last point that was accounted for in statistics.
      */
     public Speed getAverageSpeed() {
-        if (totalDistance.isZero() && totalDistance.isZero()) {
+        if (totalTime.isZero()) {
             return Speed.of(0);
         }
         return Speed.of(totalDistance.toM() / totalTime.getSeconds());

src/main/java/de/dennisguse/opentracks/stats/TrackStatisticsUpdater.java

@@ -95,7 +95,7 @@ public class TrackStatisticsUpdater {
      *
      */
     public void addTrackPoint(TrackPoint trackPoint) {
-        if (trackPoint.isSegmentStart()) {
+        if (trackPoint.isSegmentManualStart()) {
             reset(trackPoint);
         }
 
@@ -154,7 +154,7 @@ public class TrackStatisticsUpdater {
             updateSpeed(trackPoint, lastTrackPoint);
         }
 
-        if (trackPoint.isSegmentEnd()) {
+        if (trackPoint.isSegmentManualEnd()) {
             reset(trackPoint);
             return;
         }

src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatistics.java

@@ -4,7 +4,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -24,9 +23,9 @@ public class AggregatedStatistics {
         }
 
         dataList.addAll(dataMap.values());
-        Collections.sort(dataList, (o1, o2) -> {
+        dataList.sort((o1, o2) -> {
             if (o1.getCountTracks() == o2.getCountTracks()) {
-                return o1.getActivityType().compareTo(o2.getActivityType());
+                return o1.getActivityTypeLocalized().compareTo(o2.getActivityTypeLocalized());
             }
             return (o1.getCountTracks() < o2.getCountTracks() ? 1 : -1);
         });
@@ -34,11 +33,11 @@ public class AggregatedStatistics {
 
     @VisibleForTesting
     public void aggregate(@NonNull Track track) {
-        String activityType = track.getActivityType();
-        if (dataMap.containsKey(activityType)) {
-            dataMap.get(activityType).add(track.getTrackStatistics());
+        String activityTypeLocalized = track.getActivityTypeLocalized();
+        if (dataMap.containsKey(activityTypeLocalized)) {
+            dataMap.get(activityTypeLocalized).add(track.getTrackStatistics());
         } else {
-            dataMap.put(activityType, new AggregatedStatistic(activityType, track.getTrackStatistics()));
+            dataMap.put(activityTypeLocalized, new AggregatedStatistic(activityTypeLocalized, track.getTrackStatistics()));
         }
     }
 
@@ -55,17 +54,17 @@ public class AggregatedStatistics {
     }
 
     public static class AggregatedStatistic {
-        private final String activityType;
+        private final String activityTypeLocalized;
         private final TrackStatistics trackStatistics;
         private int countTracks = 1;
 
-        public AggregatedStatistic(String activityType, TrackStatistics trackStatistics) {
-            this.activityType = activityType;
+        public AggregatedStatistic(String activityTypeLocalized, TrackStatistics trackStatistics) {
+            this.activityTypeLocalized = activityTypeLocalized;
             this.trackStatistics = trackStatistics;
         }
 
-        public String getActivityType() {
-            return activityType;
+        public String getActivityTypeLocalized() {
+            return activityTypeLocalized;
         }
 
         public TrackStatistics getTrackStatistics() {

src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java

@@ -1,6 +1,7 @@
 package de.dennisguse.opentracks.ui.aggregatedStatistics;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -13,12 +14,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.DistanceFormatter;
 import de.dennisguse.opentracks.data.models.SpeedFormatter;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.settings.UnitSystem;
 import de.dennisguse.opentracks.util.StringUtils;
-import de.dennisguse.opentracks.util.TrackIconUtils;
 
 public class AggregatedStatisticsAdapter extends BaseAdapter {
 
@@ -62,7 +63,10 @@ public class AggregatedStatisticsAdapter extends BaseAdapter {
             viewHolder = (ViewHolder) convertView.getTag();
         }
 
-        if (TrackIconUtils.isSpeedIcon(context.getResources(), aggregatedStatistic.getActivityType())) {
+        Resources resources = context.getResources();
+        String localizedActivityType = aggregatedStatistic.getActivityTypeLocalized();
+        if (ActivityType.findByLocalizedString(resources, localizedActivityType)
+                .isShowSpeedPreferred()) {
             viewHolder.setSpeed(aggregatedStatistic);
         } else {
             viewHolder.setPace(aggregatedStatistic);
@@ -80,7 +84,7 @@ public class AggregatedStatisticsAdapter extends BaseAdapter {
     public List<String> getCategories() {
         List<String> categories = new ArrayList<>();
         for (int i = 0; i < aggregatedStatistics.getCount(); i++) {
-            categories.add(aggregatedStatistics.getItem(i).getActivityType());
+            categories.add(aggregatedStatistics.getItem(i).getActivityTypeLocalized());
         }
         return categories;
     }
@@ -139,9 +143,9 @@ public class AggregatedStatisticsAdapter extends BaseAdapter {
         }
 
         public void setPace(AggregatedStatistics.AggregatedStatistic aggregatedStatistic) {
-            SpeedFormatter formatter = SpeedFormatter.Builder().setUnit(unitSystem).setReportSpeedOrPace(reportSpeed).build(context);
-
             setCommonValues(aggregatedStatistic);
+
+            SpeedFormatter formatter = SpeedFormatter.Builder().setUnit(unitSystem).setReportSpeedOrPace(reportSpeed).build(context);
             {
                 Pair<String, String> parts = formatter.getSpeedParts(aggregatedStatistic.getTrackStatistics().getAverageMovingSpeed());
                 avgSpeed.setText(parts.first);
@@ -159,7 +163,7 @@ public class AggregatedStatisticsAdapter extends BaseAdapter {
 
         //TODO Check preference handling.
         private void setCommonValues(AggregatedStatistics.AggregatedStatistic aggregatedStatistic) {
-            String activityType = aggregatedStatistic.getActivityType();
+            String activityType = aggregatedStatistic.getActivityTypeLocalized();
 
             reportSpeed = PreferencesUtils.isReportSpeed(activityType);
             unitSystem = PreferencesUtils.getUnitSystem();
@@ -178,8 +182,11 @@ public class AggregatedStatisticsAdapter extends BaseAdapter {
         }
 
         private int getIcon(AggregatedStatistics.AggregatedStatistic aggregatedStatistic) {
-            String iconValue = TrackIconUtils.getIconValue(context, aggregatedStatistic.getActivityType());
-            return TrackIconUtils.getIconDrawable(iconValue);
+            String localizedActivityType = aggregatedStatistic.getActivityTypeLocalized();
+            String iconValue = ActivityType.findByLocalizedString(context, localizedActivityType)
+                    .getIconId();
+            return ActivityType.findBy(iconValue)
+                    .getIconDrawableId();
         }
     }
 }

src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/CsvLayoutUtils.java

@@ -35,7 +35,6 @@ public final class CsvLayoutUtils {
 
     /**
      * @param csvField Layout's field in a CSV format.
-     * @return List of field parts or null if it's malformed.
      */
     @Nullable
     public static String[] getCsvFieldParts(@Nullable String csvField) {

src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalsFragment.java

@@ -151,7 +151,7 @@ public class IntervalsFragment extends Fragment {
         ContentProviderUtils contentProviderUtils = new ContentProviderUtils(getContext());
         Track track = contentProviderUtils.getTrack(trackId);
         if (track != null) {
-            isReportSpeed = PreferencesUtils.isReportSpeed(track.getActivityType());
+            isReportSpeed = PreferencesUtils.isReportSpeed(track);
         }
 
         viewModel = new ViewModelProvider(getActivity()).get(IntervalStatisticsModel.class);

src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java

@@ -22,10 +22,8 @@ import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.ParcelFileDescriptor;
-import android.provider.MediaStore;
 import android.util.Log;
 import android.util.Pair;
 import android.view.Menu;
@@ -35,6 +33,7 @@ import android.widget.ArrayAdapter;
 import android.widget.Toast;
 
 import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.PickVisualMediaRequest;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.lifecycle.ViewModelProvider;
@@ -71,7 +70,7 @@ public class MarkerEditActivity extends AbstractActivity {
     private Uri cameraPhotoUri;
 
     private ActivityResultLauncher<Intent> takePictureFromCamera;
-    private ActivityResultLauncher<Intent> takePictureFromGallery;
+    private ActivityResultLauncher<PickVisualMediaRequest> takePictureFromGallery;
 
     private MarkerEditViewModel viewModel;
 
@@ -139,10 +138,10 @@ public class MarkerEditActivity extends AbstractActivity {
         takePictureFromCamera = registerForActivityResult(
                 new ActivityResultContracts.StartActivityForResult(),
                 result -> {
-                    if (result.getResultCode() == RESULT_CANCELED) {
-                        Toast.makeText(this, R.string.marker_add_photo_canceled, Toast.LENGTH_LONG).show();
-                    } else if (result.getResultCode() == RESULT_OK) {
-                        viewModel.onNewCameraPhoto(cameraPhotoUri,
+                    switch (result.getResultCode()) {
+                        case RESULT_CANCELED ->
+                                Toast.makeText(this, R.string.marker_add_photo_canceled, Toast.LENGTH_LONG).show();
+                        case RESULT_OK -> viewModel.onNewCameraPhoto(cameraPhotoUri,
                                 viewBinding.markerEditName.getText().toString(),
                                 viewBinding.markerEditMarkerType.getText().toString(),
                                 viewBinding.markerEditDescription.getText().toString());
@@ -150,12 +149,12 @@ public class MarkerEditActivity extends AbstractActivity {
                 });
 
         takePictureFromGallery = registerForActivityResult(
-                new ActivityResultContracts.StartActivityForResult(),
-                result -> {
-                    if (result.getResultCode() == RESULT_CANCELED) {
+                new ActivityResultContracts.PickVisualMedia(),
+                uri -> {
+                    if (uri == null) {
                         Toast.makeText(this, R.string.marker_add_photo_canceled, Toast.LENGTH_LONG).show();
-                    } else if (result.getResultCode() == RESULT_OK) {
-                        viewModel.onNewGalleryPhoto(result.getData().getData(),
+                    } else {
+                        viewModel.onNewGalleryPhoto(uri,
                                 viewBinding.markerEditName.getText().toString(),
                                 viewBinding.markerEditMarkerType.getText().toString(),
                                 viewBinding.markerEditDescription.getText().toString());
@@ -256,16 +255,11 @@ public class MarkerEditActivity extends AbstractActivity {
     }
 
     private void createMarkerWithGalleryImage() {
-        Intent intent;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
-            intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, 1);
-        } else {
-            intent = new Intent(Intent.ACTION_GET_CONTENT);
-        }
-        intent.setType("image/*");
+        PickVisualMediaRequest request = new PickVisualMediaRequest.Builder()
+                .setMediaType(ActivityResultContracts.PickVisualMedia.ImageOnly.INSTANCE)
+                .build();
         try {
-            takePictureFromGallery.launch(intent);
+            takePictureFromGallery.launch(request);
         } catch (ActivityNotFoundException e) {
             Toast.makeText(this, R.string.no_compatible_gallery_installed, Toast.LENGTH_LONG).show();
         }

src/main/java/de/dennisguse/opentracks/util/EGM2008Utils.java

@@ -16,7 +16,7 @@ import de.dennisguse.opentracks.data.models.Altitude;
  * Converts WGS84 altitude to EGM2008 (should be close to height above sea level).
  * <p>
  * Uses <a href="https://geographiclib.sourceforge.io/">GeographicLib</a>] EGM2008 5minute undulation data.
- * https://geographiclib.sourceforge.io/html/geoid.html
+ * <a href="https://geographiclib.sourceforge.io/html/geoid.html">...</a>
  * <p>
  * File starts at 90N, 0E (North pole) and is encoded in parallel bands as unsigned shorts.
  */

src/main/java/de/dennisguse/opentracks/util/FileUtils.java

@@ -47,7 +47,7 @@ public class FileUtils {
 
     /**
      * The maximum FAT32 path length. See the FAT32 spec at
-     * http://msdn.microsoft.com/en-us/windows/hardware/gg463080
+     * <a href="http://msdn.microsoft.com/en-us/windows/hardware/gg463080">...</a>
      */
     static final int MAX_FAT32_PATH_LENGTH = 260;
 

src/main/java/de/dennisguse/opentracks/util/StringUtils.java

@@ -232,7 +232,7 @@ public class StringUtils {
     }
 
     /**
-     * Gets the time, in milliseconds, from an XML date time string (ISO8601) as defined at http://www.w3.org/TR/xmlschema-2/#dateTime
+     * Gets the time, in milliseconds, from an XML date time string (ISO8601) as defined at <a href="http://www.w3.org/TR/xmlschema-2/#dateTime">...</a>
      * Let's be lenient: if timezone information is not provided, UTC will be used.
      *
      * @param xmlDateTime the XML date time string

src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java

@@ -1,99 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package de.dennisguse.opentracks.util;
-
-import android.content.Context;
-import android.content.res.Resources;
-
-import androidx.annotation.NonNull;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import de.dennisguse.opentracks.data.models.ActivityType;
-
-/**
- * Utilities for track icon.
- *
- * @author Jimmy Shih
- */
-public class TrackIconUtils {
-
-    public static int getIconDrawable(String activityTypeId) {
-        Optional<ActivityType> found = Arrays.stream(ActivityType.values()).filter(
-                it -> it.getId().equals(activityTypeId)
-        ).findFirst();
-
-        return found.map(ActivityType::getIconId)
-                .orElseGet(ActivityType.UNKNOWN::getIconId);
-
-    }
-
-    public static int getIconActivityType(String activityTypeId) {
-        Optional<ActivityType> found = Arrays.stream(ActivityType.values()).filter(
-                it -> it.getId().equals(activityTypeId)
-        ).findFirst();
-
-        return found.map(ActivityType::getFirstLocalizedStringId)
-                .orElseGet(ActivityType.UNKNOWN::getFirstLocalizedStringId);
-
-    }
-
-    /**
-     * Gets all icon values.
-     */
-    public static List<String> getAllIconValues() {
-        return Arrays.stream(ActivityType.values())
-                .map(ActivityType::getId)
-                .collect(Collectors.toList());
-    }
-
-    /**
-     * Gets the icon value.
-     *
-     * @param context        the context
-     * @param activityTypeId the activity type
-     */
-    @NonNull
-    public static String getIconValue(Context context, String activityTypeId) {
-        Optional<ActivityType> selected = Arrays.stream(ActivityType.values())
-                .filter(
-                        it -> Arrays.stream(it.getLocalizedStringIds())
-                                .anyMatch(id -> context.getString(id).equals(activityTypeId))
-                )
-                .findFirst();
-        if (selected.isEmpty()) {
-            return ActivityType.UNKNOWN.getId();
-        }
-        return selected.get().getId();
-    }
-
-    public static boolean isSpeedIcon(Resources resources, String activityTypeId) {
-        Optional<ActivityType> selected = Arrays.stream(ActivityType.values())
-                .filter(
-                        it -> Arrays.stream(it.getLocalizedStringIds())
-                                .anyMatch(id -> resources.getString(id).equals(activityTypeId))
-                )
-                .findFirst();
-
-        return selected.map(ActivityType::isShowSpeedPreferred)
-                .orElse(false);
-
-    }
-}

src/main/java/de/dennisguse/opentracks/util/TrackUtils.java

@@ -19,6 +19,7 @@ package de.dennisguse.opentracks.util;
 import android.content.Context;
 
 import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.Track;
 
 /**
@@ -26,30 +27,32 @@ import de.dennisguse.opentracks.data.models.Track;
  *
  * @author Jimmy Shih
  */
+//TOOD Refactor ActivityType handling in here!
 @Deprecated //TODO Refactor: all this should happen somewhere else (ContentProviderUtils?)
 public class TrackUtils {
 
     private TrackUtils() {
     }
 
-    public static void updateTrack(Context context, Track track, String name, String activityType, String description, ContentProviderUtils contentProviderUtils) {
-        updateTrack(context, track, name, activityType, TrackIconUtils.getIconValue(context, activityType), description, contentProviderUtils);
+    public static void updateTrack(Context context, Track track, String name, String activityTypeLocalized, String description, ContentProviderUtils contentProviderUtils) {
+        updateTrack(context, track, name, activityTypeLocalized, ActivityType.findByLocalizedString(context, activityTypeLocalized), description, contentProviderUtils);
     }
 
-    public static void updateTrack(Context context, Track track, String name, String activityType, String iconValue, String description, ContentProviderUtils contentProviderUtils) {
+    public static void updateTrack(Context context, Track track, String name, String activityTypeLocalized, ActivityType activityType, String description, ContentProviderUtils contentProviderUtils) {
         boolean update = false;
         if (name != null) {
             track.setName(name);
             update = true;
         }
-        if (activityType != null) {
-            track.setActivityType(activityType);
+        if (activityTypeLocalized != null) {
+            track.setActivityTypeLocalized(activityTypeLocalized);
             update = true;
         }
-        if (iconValue != null) {
-            track.setIcon(iconValue);
-        } else if (activityType != null) {
-            track.setIcon(TrackIconUtils.getIconValue(context, activityType));
+        if (activityType != null) {
+            track.setActivityType(activityType);
+        } else if (activityTypeLocalized != null) {
+            track.setActivityType(ActivityType.findByLocalizedString(context, activityTypeLocalized)
+            );
         }
         if (description != null) {
             track.setDescription(description);

src/main/res/drawable/ic_help_24dp.xml

@@ -2,7 +2,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
     <path
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"
         android:fillColor="#000000" />

src/main/res/layout/help.xml

@@ -12,7 +12,7 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:navigationIcon="@drawable/ic_help_black_24dp"
+            app:navigationIcon="@drawable/ic_help_24dp"
             app:title="@string/menu_help" />
     </com.google.android.material.appbar.AppBarLayout>
 

src/main/res/layout/statistics_recorded.xml

@@ -397,23 +397,249 @@
             app:barrierDirection="bottom"
             app:constraint_referenced_ids="stats_altitude_gain_value,stats_altitude_loss_value" />
 
-        <!-- Horizontal line -->
+        <!-- Heart Rate -->
         <View
-            android:id="@+id/stats_end_horizontal_line"
+            android:id="@+id/stats_heart_rate_horizontal_line"
             style="@style/HorizontalLine"
             android:layout_margin="8dp"
             app:layout_constraintStart_toEndOf="@id/guideline"
             app:layout_constraintEnd_toStartOf="@id/guideline3"
             app:layout_constraintTop_toBottomOf="@id/stats_altitude_barrier" />
 
-        <!-- Sensors data -->
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/stats_sensors_recycler_view"
-            android:layout_width="0dp"
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/stats_heart_rate_group"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintEnd_toStartOf="@id/guideline3"
+            android:visibility="gone"
+            app:constraint_referenced_ids="stats_heart_rate_horizontal_line,stats_max_heart_rate_label,stats_max_heart_rate_value,stats_max_heart_rate_unit,stats_avg_heart_rate_label,stats_avg_heart_rate_value,stats_avg_heart_rate_unit" />
+
+        <TextView
+            android:id="@+id/stats_max_heart_rate_label"
+            style="@style/TextAppearance.OpenTracks.PrimaryHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/sensor_state_heart_rate_max"
+            app:layout_constrainedWidth="true"
             app:layout_constraintStart_toEndOf="@id/guideline"
-            app:layout_constraintTop_toBottomOf="@id/stats_end_horizontal_line" />
+            app:layout_constraintEnd_toStartOf="@id/guideline2"
+            app:layout_constraintTop_toBottomOf="@id/stats_heart_rate_horizontal_line" />
+
+        <TextView
+            android:id="@+id/stats_max_heart_rate_value"
+            style="@style/TextAppearance.OpenTracks.PrimaryValue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:value="@string/value_unknown"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toEndOf="@id/guideline"
+            app:layout_constraintEnd_toStartOf="@id/stats_max_heart_rate_unit"
+            app:layout_constraintTop_toBottomOf="@id/stats_max_heart_rate_label"
+            tools:text="100" />
+
+        <TextView
+            android:id="@+id/stats_max_heart_rate_unit"
+            style="@style/TextAppearance.OpenTracks.PrimaryUnit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/sensor_state_heart_rate_unit"
+            app:layout_constraintBottom_toBottomOf="@id/stats_max_heart_rate_value"
+            app:layout_constraintStart_toEndOf="@id/stats_max_heart_rate_value"
+            app:layout_constraintEnd_toStartOf="@id/guideline2" />
+
+        <TextView
+            android:id="@+id/stats_avg_heart_rate_label"
+            style="@style/TextAppearance.OpenTracks.PrimaryHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/sensor_state_heart_rate_avg"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/guideline2"
+            app:layout_constraintEnd_toEndOf="@id/guideline3"
+            app:layout_constraintTop_toBottomOf="@id/stats_heart_rate_horizontal_line" />
+
+        <TextView
+            android:id="@+id/stats_avg_heart_rate_value"
+            style="@style/TextAppearance.OpenTracks.PrimaryValue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:value="@string/value_unknown"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toEndOf="@id/guideline2"
+            app:layout_constraintEnd_toStartOf="@id/stats_avg_heart_rate_unit"
+            app:layout_constraintTop_toBottomOf="@id/stats_avg_heart_rate_label"
+            tools:text="100" />
+
+        <TextView
+            android:id="@+id/stats_avg_heart_rate_unit"
+            style="@style/TextAppearance.OpenTracks.PrimaryUnit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/sensor_state_heart_rate_unit"
+            app:layout_constraintBottom_toBottomOf="@id/stats_avg_heart_rate_value"
+            app:layout_constraintStart_toEndOf="@id/stats_avg_heart_rate_value"
+            app:layout_constraintEnd_toStartOf="@id/guideline3" />
+
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/stats_heart_rate_barrier"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="bottom"
+            app:constraint_referenced_ids="stats_max_heart_rate_value,stats_avg_heart_rate_value" />
+
+        <!-- Cadence -->
+        <View
+            android:id="@+id/stats_cadence_horizontal_line"
+            style="@style/HorizontalLine"
+            android:layout_margin="8dp"
+            app:layout_constraintStart_toEndOf="@id/guideline"
+            app:layout_constraintEnd_toStartOf="@id/guideline3"
+            app:layout_constraintTop_toBottomOf="@id/stats_heart_rate_barrier" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/stats_cadence_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:constraint_referenced_ids="stats_cadence_horizontal_line,stats_max_cadence_label,stats_max_cadence_value,stats_max_cadence_unit,stats_avg_cadence_label,stats_avg_cadence_value,stats_avg_cadence_unit" />
+
+        <TextView
+            android:id="@+id/stats_max_cadence_label"
+            style="@style/TextAppearance.OpenTracks.PrimaryHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/sensor_state_cadence_max"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/guideline"
+            app:layout_constraintEnd_toStartOf="@id/guideline2"
+            app:layout_constraintTop_toBottomOf="@id/stats_cadence_horizontal_line" />
+
+        <TextView
+            android:id="@+id/stats_max_cadence_value"
+            style="@style/TextAppearance.OpenTracks.PrimaryValue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:value="@string/value_unknown"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toEndOf="@id/guideline"
+            app:layout_constraintEnd_toStartOf="@id/stats_max_cadence_unit"
+            app:layout_constraintTop_toBottomOf="@id/stats_max_cadence_label"
+            tools:text="100" />
+
+        <TextView
+            android:id="@+id/stats_max_cadence_unit"
+            style="@style/TextAppearance.OpenTracks.PrimaryUnit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/sensor_state_cadence_unit"
+            app:layout_constraintBottom_toBottomOf="@id/stats_max_cadence_value"
+            app:layout_constraintStart_toEndOf="@id/stats_max_cadence_value"
+            app:layout_constraintEnd_toStartOf="@id/guideline2" />
+
+        <TextView
+            android:id="@+id/stats_avg_cadence_label"
+            style="@style/TextAppearance.OpenTracks.PrimaryHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/sensor_state_cadence_avg"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/guideline2"
+            app:layout_constraintEnd_toEndOf="@id/guideline3"
+            app:layout_constraintTop_toBottomOf="@id/stats_cadence_horizontal_line" />
+
+        <TextView
+            android:id="@+id/stats_avg_cadence_value"
+            style="@style/TextAppearance.OpenTracks.PrimaryValue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:value="@string/value_unknown"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toEndOf="@id/guideline2"
+            app:layout_constraintEnd_toStartOf="@id/stats_avg_cadence_unit"
+            app:layout_constraintTop_toBottomOf="@id/stats_avg_cadence_label"
+            tools:text="100" />
+
+        <TextView
+            android:id="@+id/stats_avg_cadence_unit"
+            style="@style/TextAppearance.OpenTracks.PrimaryUnit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/sensor_state_cadence_unit"
+            app:layout_constraintBottom_toBottomOf="@id/stats_avg_cadence_value"
+            app:layout_constraintStart_toEndOf="@id/stats_avg_cadence_value"
+            app:layout_constraintEnd_toStartOf="@id/guideline3" />
+
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/stats_cadence_barrier"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="bottom"
+            app:constraint_referenced_ids="stats_max_cadence_value,stats_avg_cadence_value" />
+
+        <!-- Power -->
+        <View
+            android:id="@+id/stats_power_horizontal_line"
+            style="@style/HorizontalLine"
+            android:layout_margin="8dp"
+            app:layout_constraintStart_toEndOf="@id/guideline"
+            app:layout_constraintEnd_toStartOf="@id/guideline3"
+            app:layout_constraintTop_toBottomOf="@id/stats_cadence_barrier" />
+
+        <!-- Sensors data -->
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/stats_power_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:constraint_referenced_ids="stats_power_horizontal_line,stats_power_label,stats_power_value,stats_power_unit" />
+
+        <TextView
+            android:id="@+id/stats_power_label"
+            style="@style/TextAppearance.OpenTracks.PrimaryHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/sensor_state_power_avg"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/guideline"
+            app:layout_constraintEnd_toStartOf="@id/guideline2"
+            app:layout_constraintTop_toBottomOf="@id/stats_power_horizontal_line" />
+
+        <TextView
+            android:id="@+id/stats_power_value"
+            style="@style/TextAppearance.OpenTracks.PrimaryValue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:value="@string/value_unknown"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toEndOf="@id/guideline"
+            app:layout_constraintEnd_toStartOf="@id/stats_power_unit"
+            app:layout_constraintTop_toBottomOf="@id/stats_power_label"
+            tools:text="100" />
+
+        <TextView
+            android:id="@+id/stats_power_unit"
+            style="@style/TextAppearance.OpenTracks.PrimaryUnit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/sensor_state_power_unit"
+            app:layout_constraintBottom_toBottomOf="@id/stats_power_value"
+            app:layout_constraintStart_toEndOf="@id/stats_power_value"
+            app:layout_constraintEnd_toStartOf="@id/guideline2" />
+
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/stats_power_barrier"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="bottom"
+            app:constraint_referenced_ids="stats_power_value" />
+
+        <!-- Horizontal Line -->
+        <View
+            android:id="@+id/stats_end_horizontal_line"
+            style="@style/HorizontalLine"
+            android:layout_margin="8dp"
+            app:layout_constraintStart_toEndOf="@id/guideline"
+            app:layout_constraintEnd_toStartOf="@id/guideline3"
+            app:layout_constraintTop_toBottomOf="@id/stats_power_barrier" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>

src/main/res/menu/list_context_menu.xml

@@ -35,6 +35,11 @@ limitations under the License.
         android:icon="@drawable/ic_delete_forever_24dp"
         android:title="@string/menu_delete"
         app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/list_context_menu_aggregated_stats"
+        android:icon="@drawable/ic_statistics_24dp"
+        android:title="@string/menu_aggregated_statistics"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/list_context_menu_select_all"
         android:icon="@drawable/ic_select_all_24dp"

src/main/res/menu/track_list.xml

@@ -32,7 +32,7 @@ limitations under the License.
         android:title="@string/menu_settings" />
     <item
         android:id="@+id/track_list_help"
-        android:icon="@drawable/ic_help_black_24dp"
+        android:icon="@drawable/ic_help_24dp"
         android:title="@string/menu_help" />
 
 </menu>

src/main/res/values-b+en+001/strings.xml

@@ -211,26 +211,6 @@
     <string name="value_none">None</string>
     <string name="value_off">Off</string>
     <string name="value_smallest_recommended">Smallest (recommended)</string>
-    <plurals name="voiceHours">
-        <item quantity="one">1 hour</item>
-        <item quantity="other">%1$d hours</item>
-    </plurals>
-    <plurals name="voiceMinutes">
-        <item quantity="one">1 minute</item>
-        <item quantity="other">%1$d minutes</item>
-    </plurals>
-    <plurals name="voiceSeconds">
-        <item quantity="one">1 second</item>
-        <item quantity="other">%1$d seconds</item>
-    </plurals>
-    <plurals name="voiceSpeedKilometersPerHour">
-        <item quantity="one">1 kilometer per hour</item>
-        <item quantity="other">%1$.1f kilometers per hour</item>
-    </plurals>
-    <plurals name="voiceSpeedMilesPerHour">
-        <item quantity="one">1 mile per hour</item>
-        <item quantity="other">%1$.1f miles per hour</item>
-    </plurals>
     <string name="waypoint_type_atm">Cashpoint</string>
     <string name="waypoint_type_bank">bank</string>
     <string name="waypoint_type_bar">bar/pub</string>

src/main/res/values-b+es+419/strings.xml

@@ -214,26 +214,6 @@
     <string name="value_none">Ninguno</string>
     <string name="value_off">Desactivado</string>
     <string name="value_smallest_recommended">Mínimo (recomendado)</string>
-    <plurals name="voiceHours">
-        <item quantity="one">1 hora</item>
-        <item quantity="other">%1$d horas</item>
-    </plurals>
-    <plurals name="voiceMinutes">
-        <item quantity="one">1 minuto</item>
-        <item quantity="other">%1$d minutos</item>
-    </plurals>
-    <plurals name="voiceSeconds">
-        <item quantity="one">1 segundo</item>
-        <item quantity="other">%1$d segundos</item>
-    </plurals>
-    <plurals name="voiceSpeedKilometersPerHour">
-        <item quantity="one">1 kilómetro por hora</item>
-        <item quantity="other">%1$.1f kilómetros por hora</item>
-    </plurals>
-    <plurals name="voiceSpeedMilesPerHour">
-        <item quantity="one">1 milla por hora</item>
-        <item quantity="other">%1$.1f millas por hora</item>
-    </plurals>
     <string name="waypoint_type_atm">cajero automático</string>
     <string name="waypoint_type_bank">banco</string>
     <string name="waypoint_type_bar">barra</string>
@@ -507,14 +487,6 @@
     <string name="lap_speed">Velocidad de vuelta</string>
     <string name="speed">Velocidad</string>
     <string name="total_distance">Distancia total</string>
-    <plurals name="voiceDistanceKilometers">
-        <item quantity="one">1 kilómetro</item>
-        <item quantity="other">%1$.1f kilómetros</item>
-    </plurals>
-    <plurals name="voiceDistanceMiles">
-        <item quantity="one">1 milla</item>
-        <item quantity="other">%1$.1f millas</item>
-    </plurals>
     <string name="average_heart_rate">Ritmo cardíaco promedio</string>
     <string name="current_heart_rate">Ritmo cardíaco actual</string>
     <string name="settings_export_filename_title">Formato del nombre del archivo</string>

src/main/res/values-cs/strings.xml

@@ -202,7 +202,7 @@ limitations under the License.
     <string name="menu_aggregated_statistics">Souhrnná statistika</string>
     <string name="menu_delete">Smazat</string>
     <string name="menu_edit">Upravit</string>
-    <string name="menu_export_all">Exportovat vše</string>
+    <string name="menu_export_all">Exportovat vše (jeden soubor na stopu)</string>
     <string name="menu_help">Nápověda</string>
     <string name="menu_import_all">Importovat vše</string>
     <string name="menu_insert_marker">Vložit značku</string>
@@ -406,7 +406,7 @@ limitations under the License.
     <string name="open_track_as_GPX">Otevřít jako GPX</string>
     <string name="open_track_as_trackfileformat">Otevřít jako %1$s</string>
     <string name="export_all_do_it_for_all">provést pro všechny konflikty</string>
-    <string name="export_track_errors">Trasa nebyla exportována</string>
+    <string name="export_track_errors">Soubory nebyly exportovány</string>
     <string name="generic_separator_done_total">/</string>
     <string name="generic_completed">Ukončeno</string>
     <string name="gps_disabled_msg">GPS vypnuto</string>
@@ -434,7 +434,7 @@ limitations under the License.
     <string name="description_altitude_loss">Převýšení: %1$d m (%2$d ft)</string>
     <string name="export_error_post_workout">Export po ukončení aktivity selhal, zkontrolujte prosím adresář pro export.</string>
     <string name="stats_loss">Ztráta</string>
-    <string name="export_track_already_exists_msg">Trasa %1$s již existuje v cílovém adresáři.</string>
+    <string name="export_track_already_exists_msg">Soubor %1$s již existuje v cílovém adresáři.</string>
     <string name="generic_overwrite">Přepsat</string>
     <string name="generic_show_errors">Zobrazit chyby</string>
     <string name="generic_click_twice_cancel">Opakovaně kliknout zpět pro ukončení</string>
@@ -453,9 +453,9 @@ limitations under the License.
     <string name="import_progress_summary_errors_msg">Chyba</string>
     <string name="settings_prevent_reimport_tracks_title">Zabraňte opětovnému importu aktivit</string>
     <string name="export_progress_summary_errors_msg">Chyba</string>
-    <string name="export_progress_summary_skip_msg">Stopy přeskočeny</string>
-    <string name="export_progress_summary_overwrite_msg">Skladby přepsány</string>
-    <string name="export_progress_summary_new_msg">Vyvezeny nové tratě</string>
+    <string name="export_progress_summary_skip_msg">Soubory přeskočeny</string>
+    <string name="export_progress_summary_overwrite_msg">Soubory přepsány</string>
+    <string name="export_progress_summary_new_msg">Nové soubory exportovány</string>
     <string name="import_progress_summary_exists_msg">Existovat</string>
     <string name="import_progress_summary_ok_msg">Importované soubory</string>
     <string name="generic_open_track">Otevřená trať</string>
@@ -617,4 +617,12 @@ limitations under the License.
     <string name="unit_minute_per_nautical_mile">min/NM</string>
     <string name="value_integer_knots">%1$d uzlů</string>
     <string name="value_float_knots_recommended">%1$.1f uzlů (doporučeno)</string>
+    <string name="settings_stats_units_imperial_meter">Imperiální (mi, m)</string>
+    <string name="menu_export_all_one_file">Exportovat vše (jeden soubor na všechny stopy)</string>
+    <string name="settings_recording_min_required_accuracy_summary">Poloha bude ignorována, pokud je její přesnost větší než %1$s</string>
+    <string name="settings_sensor_bluetooth_service_filter_title">Filtrovat zařízení Bluetooth</string>
+    <string name="settings_sensor_bluetooth_service_filter_off">Zobrazit všechna zjistitelná zařízení Bluetooth</string>
+    <string name="no_compatible_camera_installed">Není nainstalována kompatibilní aplikace fotoaparátu</string>
+    <string name="no_compatible_gallery_installed">Není nainstalována kompatibilní aplikace galerie obrázků</string>
+    <string name="show_on_dashboard">API OpenTracks Dashboard</string>
 </resources>

src/main/res/values-de/strings.xml

@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 --><resources>
     <string name="about_preference_title">Über OpenTracks</string>
-    <string name="about_description"><i>OpenTracks</i> ist eine Sport-Tracking-Anwendung, die Ihre Privatsphäre vollständig respektiert.</string>
+    <string name="about_description"><i>OpenTracks</i> ist eine Sport-Tracking-Anwendung, die Ihre Privatsphäre respektiert.</string>
     <string name="about_url">Projekt-Website: <a href="%1$s">%1$s</a></string>
     <string name="about_version_name">Version Name: %1$s</string>
     <string name="about_version_code">Version Code: %1$d</string>
@@ -208,7 +208,7 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka
     <string name="menu_aggregated_statistics">Gesammelte Statistiken</string>
     <string name="menu_delete">Löschen</string>
     <string name="menu_edit">Bearbeiten</string>
-    <string name="menu_export_all">Alle exportieren</string>
+    <string name="menu_export_all">Alle exportieren (Eine Datei je Track)</string>
     <string name="menu_help">Hilfe</string>
     <string name="menu_import_all">Alle importieren</string>
     <string name="menu_insert_marker">Markierung einfügen</string>
@@ -333,26 +333,36 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka
     <string name="value_off">Aus</string>
     <string name="value_smallest_recommended">Kleinster (empfohlen)</string>
     <!-- Voice -->
-    <plurals name="voiceHours">
-        <item quantity="one">1 Stunde</item>
-        <item quantity="other">%1$d Stunden</item>
-    </plurals>
-    <plurals name="voiceMinutes">
-        <item quantity="one">1 Minuten</item>
-        <item quantity="other">%1$d Minuten</item>
-    </plurals>
-    <plurals name="voiceSeconds">
-        <item quantity="one">1 Sekunde</item>
-        <item quantity="other">%1$d Sekunden</item>
-    </plurals>
-    <plurals name="voiceSpeedKilometersPerHour">
-        <item quantity="one">1 Kilometer pro Stunde</item>
-        <item quantity="other">%1$.1f Kilometer pro Stunde</item>
-    </plurals>
-    <plurals name="voiceSpeedMilesPerHour">
-        <item quantity="one">1 Meile pro Stunde</item>
-        <item quantity="other">%1$.1f Meilen pro Stunde</item>
-    </plurals>
+    <string name="voiceHoursPlural">
+        { n, plural,
+        =1 {1 Stunde}
+        other {{n,number,#.0} Stunden}
+        }
+    </string>
+    <string name="voiceMinutesPlural">
+        { n, plural,
+        =1 {1 Minuten}
+        other {{n} Minuten}
+        }
+    </string>
+    <string name="voiceSecondsPlural">
+        { n, plural,
+        =1 {1 Sekunde}
+        other {{n} Sekunden}
+        }
+    </string>
+    <string name="voiceSpeedKilometersPerHourPlural">
+        { n, plural,
+        =1 {1 Kilometer pro Stunde}
+        other {{n,number,#.0} Kilometer pro Stunde}
+        }
+    </string>
+    <string name="voiceSpeedMilesPerHourPlural">
+        { n, plural,
+        =1 {1 Meile pro Stunde}
+        other {{n,number,#.0} Meilen pro Stunde}
+        }
+    </string>
     <!-- Waypoint Type -->
     <string name="waypoint_type_atm">Geldautomat</string>
     <string name="waypoint_type_bank">Bank</string>
@@ -441,7 +451,7 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka
     <string name="generic_completed">Abgeschlossen</string>
     <string name="gps_disabled_msg">GPS deaktiviert</string>
     <string name="export_progress_summary_overwrite_msg">Streckenaufzeichnung überschrieben</string>
-    <string name="export_progress_summary_skip_msg">Strecke übersprungen</string>
+    <string name="export_progress_summary_skip_msg">Dateien übersprungen</string>
     <string name="export_progress_summary_errors_msg">Fehler</string>
     <string name="generic_click_twice_cancel">Klicke nochmal auf zurück, um abzubrechen</string>
     <string name="import_error_list_dialog_title">Dateien wurden nicht importiert</string>
@@ -537,10 +547,12 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka
     <string name="current_heart_rate">Aktueller Puls</string>
     <string name="export_cannot_write_to_dir">Kann nicht in Export-Verzeichnis schreiben.</string>
     <string name="stats_sensors_cadence">Trittfrequenz</string>
-    <plurals name="voiceDistanceMiles">
-        <item quantity="one">1 Meile</item>
-        <item quantity="other">%1$.1f Meilen</item>
-    </plurals>
+    <string name="voiceDistanceMilesPlural">
+        { n, plural,
+        =1 {1 Meile}
+        other {{n,number,#.0} Meilen}
+        }
+    </string>
     <string name="field_set_primary">Primär</string>
     <string name="voice_per_mile">pro Meile</string>
     <string name="lap_time">Rundenzeit</string>
@@ -549,10 +561,12 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka
     <string name="lap_speed">Rundengeschwindigkeit</string>
     <string name="speed">Geschwindigkeit</string>
     <string name="total_distance">Gesamtstrecke</string>
-    <plurals name="voiceDistanceKilometers">
-        <item quantity="one">1 Kilometer</item>
-        <item quantity="other">%1$.1f Kilometer</item>
-    </plurals>
+    <string name="voiceDistanceKilometersPlural">
+        { n, plural,
+        =1 {1 Kilometer}
+        other {{n,number,#.0} Kilometer}
+        }
+    </string>
     <string name="no_compatible_file_manager_installed">Kein kompatibler Dateimanager installiert</string>
     <string name="aggregated_stats_filter_no_results">Es gibt keine Aktivitäten für diesen Filter</string>
     <string name="settings_announcements_summary">Zeit, Entfernung, Sprachgeschwindigkeit</string>
@@ -574,4 +588,79 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka
     <string name="settings_gps_summary">Zeitintervall, Entfernungsintervall, Max Entfernung, Genauigkeit</string>
     <string name="description_speed_nautical">Geschwindigkeit (Knoten)</string>
     <string name="gps_recording_status">%1$s: %2$s</string>
+    <string name="settings_stats_units_imperial_meter">Imperiales Maß (mi, m)</string>
+    <string name="track_delete_number_of_tracks">%1$d Tracks</string>
+    <string name="unit_nautical_mile">NM</string>
+    <string name="value_float_kilometer_hour_recommended">%1$.1f km/h (empfohlen)</string>
+    <string name="value_integer_knots">%1$d Knoten</string>
+    <string name="no_compatible_camera_installed">Keine kompatible Kamera-Anwendung installiert</string>
+    <string name="no_compatible_gallery_installed">Keine kompatible Bildergalerie Anwendung installiert</string>
+    <plurals name="voiceDistanceNauticalMiles">
+        <item quantity="one">1 nautische Meile [Replaced by voiceDistanceNauticalMilesPlural]</item>
+        <item quantity="other">%1$.1f nautische Meilen [Replaced by voiceDistanceNauticalMilesPlural]</item>
+    </plurals>
+    <string name="show_on_dashboard_not_installed">Es ist keine Anwendung installiert, die die OpenTracks Dashboard API unterstützt.</string>
+    <string name="location_latitude_longitude">%1$s, %2$s</string>
+    <string name="show_on_map_format_ask">Frag</string>
+    <string name="settings_stats_units_nautical">Nautisches Maß (NM, ft)</string>
+    <string name="unit_minute_per_nautical_mile">min/NM</string>
+    <string name="voice_on_device_speaker_title">Verwende den Lautsprecher des Gerätes</string>
+    <string name="unit_knots">kn</string>
+    <string name="voice_per_nautical_mile">pro nautische Meile</string>
+    <string name="show_on_dashboard">OpenTracks Dashboard API</string>
+    <string name="introduction_osm_dashboard">OpenTracks selbst stellt keine Karte bereit. Bitte installieren Sie OSMDashboard, um Ihre Aufnahmen auf einer Karte anzuzeigen.</string>
+    <string name="location_coordinate">%1$s°</string>
+    <string name="value_float_mile_hour">%1$.1f mi/h</string>
+    <plurals name="voiceDistanceMiles">
+        <item quantity="one">1 Meile [Replaced by voiceDistanceMilesPlural]</item>
+        <item quantity="other">%1$.1f Meilen [Replaced by voiceDistanceMilesPlural]</item>
+    </plurals>
+    <string name="voiceDistanceNauticalMilesPlural">{n, plural, =1 {1 nautische Meile} other {{n,number,#.0} nautische Meilen} }</string>
+    <string name="value_float_knots">%1$.1f Knoten</string>
+    <string name="value_float_mile_hour_recommended">%1$.1f mi/h (empfohlen)</string>
+    <string name="value_float_kilometer_hour">%1$.1f km/h</string>
+    <string name="value_float_knots_recommended">%1$.1f Knoten (empfohlen)</string>
+    <string name="stats_sensors_power">Stärke</string>
+    <string name="menu_export_all_one_file">Alle exportieren (eine Datei für alle Aufzeichnungen)</string>
+    <string name="settings_generic_sensor">Generisch</string>
+    <string name="settings_public_api_package_title">Package name Öffentlichen API</string>
+    <string name="settings_api_summary">API zur Kontrolle und zum Abrufen von Statistiken für andere Apps bereitstellen</string>
+    <string name="settings_import_export_summary">Import, Export, automatischer Export</string>
+    <string name="settings_sensor_heart_rate_max">Zonen: maximaler Puls (bpm)</string>
+    <string name="custom_layout_list_edit_name">Gebe die layout-Bezeichnung ein, um sie hinzuzufügen</string>
+    <string name="settings_activity_defaults_category">Standards der Aktivität</string>
+    <string name="help_data_google_play_services_content">Nein</string>
+    <string name="description_pace_nautical">Geschwindigkeit (min/SM)</string>
+    <string name="settings_recording_min_required_accuracy_summary">Ort wird ignoriert wenn seine Genauigkeit über %1$s liegt</string>
+    <string name="settings_sensor_bluetooth_service_filter_title">Bluetooth Geräte filtern</string>
+    <string name="settings_sensor_bluetooth_service_filter_off">Alle verfügbaren Bluetooth Geräte anzeigen</string>
+    <plurals name="voiceSpeedMKnots">
+        <item quantity="one">1 Knoten [Replaced by voiceSpeedMKnotsPlural]</item>
+        <item quantity="other">%1$.1f Knoten [Replaced by voiceSpeedMKnotsPlural]</item>
+    </plurals>
+    <plurals name="voiceDistanceKilometers">
+        <item quantity="one">1 Kilometer [Replaced by voiceDistanceKilometersPlural]</item>
+        <item quantity="other">%1$.1f Kilometer [Replaced by voiceDistanceKilometersPlural]</item>
+    </plurals>
+    <plurals name="voiceHours">
+        <item quantity="one">1 Stunde [Replaced by VoiceHoursPlural]</item>
+        <item quantity="other">%1$d Stunden [Replaced by VoiceHoursPlural]</item>
+    </plurals>
+    <plurals name="voiceMinutes">
+        <item quantity="one">1 Minute [Replaced by VoiceMinutesPlural]</item>
+        <item quantity="other">%1$d Minuten [Replaced by VoiceMinutesPlural]</item>
+    </plurals>
+    <plurals name="voiceSeconds">
+        <item quantity="one">1 Sekunde [Replaced by voiceSecondsPlural]</item>
+        <item quantity="other">%1$d Sekunden [Replaced by voiceSecondsPlural]</item>
+    </plurals>
+    <string name="voiceSpeedMKnotsPlural">{n, plural, =1 {1 Knoten} other {{n,number,#.0} Knoten} }</string>
+    <plurals name="voiceSpeedMilesPerHour">
+        <item quantity="one">1 Meile pro Stunde [Replaced by voiceSpeedMilesPerHourPlural]</item>
+        <item quantity="other">%1$.1f Meilen pro Stunde [Replaced by voiceSpeedMilesPerHourPlural]</item>
+    </plurals>
+    <plurals name="voiceSpeedKilometersPerHour">
+        <item quantity="one">1 Kilometer pro Stunde [Replaced by voiceSpeedKilometersPerHourPlural]</item>
+        <item quantity="other">%1$.1f Kilometer pro Stunde [Replaced by voiceSpeedKilometersPerHourPlural]</item>
+    </plurals>
 </resources>

src/main/res/values-es/strings.xml

@@ -322,31 +322,41 @@ limitations under the License.
     <string name="value_off">Desactivado</string>
     <string name="value_smallest_recommended">Mínimo (recomendado)</string>
     <!-- Voice -->
-    <plurals name="voiceHours">
-        <item quantity="one">1 hora</item>
-        <item quantity="many">%1$d horas</item>
-        <item quantity="other">%1$d horas</item>
-    </plurals>
-    <plurals name="voiceMinutes">
-        <item quantity="one">1 minuto</item>
-        <item quantity="many">%1$d minutos</item>
-        <item quantity="other">%1$d minutos</item>
-    </plurals>
-    <plurals name="voiceSeconds">
-        <item quantity="one">1 segundo</item>
-        <item quantity="many">%1$d segundos</item>
-        <item quantity="other">%1$d segundos</item>
-    </plurals>
-    <plurals name="voiceSpeedKilometersPerHour">
-        <item quantity="one">1 kilómetro por hora</item>
-        <item quantity="many">%1$.1f kilómetros por hora</item>
-        <item quantity="other">%1$.1f kilómetros por hora</item>
-    </plurals>
-    <plurals name="voiceSpeedMilesPerHour">
-        <item quantity="one">1 milla por hora</item>
-        <item quantity="many">%1$.1f millas por hora</item>
-        <item quantity="other">%1$.1f millas por hora</item>
-    </plurals>
+    <string name="voiceHoursPlural">
+        { n, plural,
+        one {{n} hora}
+        many {{n} horas}
+        other {{n} horas}
+        }
+    </string>
+    <string name="voiceMinutesPlural">
+        { n, plural,
+        one {{n} minuto}
+        many {{n} minutos}
+        other {{n} minutos}
+        }
+    </string>
+    <string name="voiceSecondsPlural">
+        { n, plural,
+        one {{n} segundo}
+        many {{n} segundos}
+        other {{n} segundos}
+        }
+    </string>
+    <string name="voiceSpeedKilometersPerHourPlural">
+        { n, plural,
+        one {{n,number,#.0} kilómetro por hora}
+        many {{n,number,#.0} kilómetros por hora}
+        other {{n,number,#.0} kilómetros por hora}
+        }
+    </string>
+    <string name="voiceSpeedMilesPerHourPlural">
+        { n, plural,
+        one {{n,number,#.0} milla por hora}
+        many {{n,number,#.0} millas por hora}
+        other {{n,number,#.0} millas por hora}
+        }
+    </string>
     <!-- Waypoint Type -->
     <string name="waypoint_type_atm">cajero automático</string>
     <string name="waypoint_type_bank">banco</string>
@@ -564,16 +574,20 @@ limitations under the License.
     <string name="lap_speed">Velocidad de vuelta</string>
     <string name="speed">Velocidad</string>
     <string name="total_distance">Distancia total</string>
-    <plurals name="voiceDistanceKilometers">
-        <item quantity="one">1 kilómetro</item>
-        <item quantity="many">%1$.1f kilómetros</item>
-        <item quantity="other">%1$.1f kilómetros</item>
-    </plurals>
-    <plurals name="voiceDistanceMiles">
-        <item quantity="one">1 milla</item>
-        <item quantity="many">%1$.1f millas</item>
-        <item quantity="other">%1$.1f millas</item>
-    </plurals>
+    <string name="voiceDistanceKilometersPlural">
+        { n, plural,
+        one {{n,number,#.0} kilomètre}
+        many {{n,number,#.0} kilomètres}
+        other {{n,number,#.0} kilomètres}
+        }
+    </string>
+    <string name="voiceDistanceMilesPlural">
+        { n, plural,
+        one {{n,number,#.0} milla}
+        many {{n,number,#.0} millas}
+        other {{n,number,#.0} millas}
+        }
+    </string>
     <string name="average_heart_rate">Ritmo cardíaco promedio</string>
     <string name="current_heart_rate">Ritmo cardíaco actual</string>
     <string name="settings_export_filename_title">Formato del nombre del archivo</string>
@@ -602,16 +616,20 @@ limitations under the License.
     <string name="settings_announcements_lap_heart_rate">Frecuencia cardiaca por vuelta</string>
     <string name="settings_public_api_package_title">Nombre del paquete para el API público</string>
     <string name="unit_knots">Nudo</string>
-    <plurals name="voiceSpeedMKnots">
-        <item quantity="one">%1$.1f nudo</item>
-        <item quantity="many">%1$.1f nudos</item>
-        <item quantity="other">%1$.1f nudos</item>
-    </plurals>
-    <plurals name="voiceDistanceNauticalMiles">
-        <item quantity="one">%1$.1f milla náutica</item>
-        <item quantity="many">%1$.1f millas náuticas</item>
-        <item quantity="other">%1$.1f millas náuticas</item>
-    </plurals>
+    <string name="voiceSpeedMKnotsPlural">
+        { n, plural,
+        one {{n,number,#.0} nudo}
+        many {{n,number,#.0} nudos}
+        other {{n,number,#.0} nudos}
+        }
+    </string>
+    <string name="voiceDistanceNauticalMilesPlural">
+        { n, plural,
+        one {{n,number,#.0} milla náutica}
+        many {{n,number,#.0} millas náuticas}
+        other {{n,number,#.0} millas náuticas}
+        }
+    </string>
     <string name="select_show_on_map_behavior">Seleccionar el comportamiento de \"mostrar en el mapa\"</string>
     <string name="introduction_osm_dashboard">OpenTracks en sí no proporciona un mapa. Por favor, instale OSMDashboard para ver sus grabaciones en un mapa.</string>
     <string name="share_crash_report">Compartir informe de fallo</string>

src/main/res/values-fr-rCA/strings.xml

@@ -210,26 +210,6 @@
     <string name="value_none">Aucun</string>
     <string name="value_off">Désactivé</string>
     <string name="value_smallest_recommended">La plus petite (recommandé)</string>
-    <plurals name="voiceHours">
-        <item quantity="one">%1$d heure</item>
-        <item quantity="other">%1$d heures</item>
-    </plurals>
-    <plurals name="voiceMinutes">
-        <item quantity="one">%1$d minute</item>
-        <item quantity="other">%1$d minutes</item>
-    </plurals>
-    <plurals name="voiceSeconds">
-        <item quantity="one">%1$d seconde</item>
-        <item quantity="other">%1$d secondes</item>
-    </plurals>
-    <plurals name="voiceSpeedKilometersPerHour">
-        <item quantity="one">%1$.1f kilomètre à l\'heure</item>
-        <item quantity="other">%1$.1f kilomètres à l\'heure</item>
-    </plurals>
-    <plurals name="voiceSpeedMilesPerHour">
-        <item quantity="one">%1$.1f mille à l\'heure</item>
-        <item quantity="other">%1$.1f milles à l\'heure</item>
-    </plurals>
     <string name="waypoint_type_atm">guichet automatique bancaire</string>
     <string name="waypoint_type_bank">banque</string>
     <string name="waypoint_type_bar">bar</string>