diff --git a/tables_app/src/main/res/layout/aggregate_choose_tables_activity.xml b/tables_app/src/main/res/layout/aggregate_choose_tables_activity.xml index 95dccd8c..e0a8c6b0 100644 --- a/tables_app/src/main/res/layout/aggregate_choose_tables_activity.xml +++ b/tables_app/src/main/res/layout/aggregate_choose_tables_activity.xml @@ -15,6 +15,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone" + android:fontFamily="@font/montserrat" android:text="@string/sync_no_tables_ready"/> \ No newline at end of file diff --git a/tables_app/src/main/res/layout/color_rule_manager.xml b/tables_app/src/main/res/layout/color_rule_manager.xml index f8f20812..af6f2ff9 100644 --- a/tables_app/src/main/res/layout/color_rule_manager.xml +++ b/tables_app/src/main/res/layout/color_rule_manager.xml @@ -27,5 +27,6 @@ android:layout_marginTop="6dip" android:layout_marginLeft="6dip" android:layout_height="wrap_content" + android:fontFamily="@font/montserrat" android:text="@string/press_to_add_color_rule"/> \ No newline at end of file diff --git a/tables_app/src/main/res/layout/copy_expansion_files_layout.xml b/tables_app/src/main/res/layout/copy_expansion_files_layout.xml index 086eb60d..bccb48c7 100644 --- a/tables_app/src/main/res/layout/copy_expansion_files_layout.xml +++ b/tables_app/src/main/res/layout/copy_expansion_files_layout.xml @@ -29,6 +29,7 @@ the License. android:paddingLeft="20dp" android:paddingRight="20dp" android:text="@string/initializing" + android:fontFamily="@font/montserrat" android:textColor="@color/black" android:textSize="21sp"/> diff --git a/tables_app/src/main/res/layout/edit_default_form_preference.xml b/tables_app/src/main/res/layout/edit_default_form_preference.xml index 45fd07b6..2e640e9d 100644 --- a/tables_app/src/main/res/layout/edit_default_form_preference.xml +++ b/tables_app/src/main/res/layout/edit_default_form_preference.xml @@ -8,12 +8,14 @@ android:text="@string/use_survey_form" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:fontFamily="@font/montserrat" /> diff --git a/tables_app/src/main/res/layout/file_manager.xml b/tables_app/src/main/res/layout/file_manager.xml index 32ac7627..35fb8064 100644 --- a/tables_app/src/main/res/layout/file_manager.xml +++ b/tables_app/src/main/res/layout/file_manager.xml @@ -10,12 +10,13 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/open_new_spreadsheet" - /> + android:fontFamily="@font/montserrat"/> + android:layout_height="wrap_content" + android:fontFamily="@font/montserrat"/> diff --git a/tables_app/src/main/res/layout/fragment_table_list.xml b/tables_app/src/main/res/layout/fragment_table_list.xml index cbf168cb..441d07a2 100644 --- a/tables_app/src/main/res/layout/fragment_table_list.xml +++ b/tables_app/src/main/res/layout/fragment_table_list.xml @@ -18,5 +18,6 @@ android:gravity="center" android:layout_width="match_parent" android:layout_height="match_parent" + android:fontFamily="@font/montserrat" android:text="@string/no_table_data"/> \ No newline at end of file diff --git a/tables_app/src/main/res/layout/list_view_manager.xml b/tables_app/src/main/res/layout/list_view_manager.xml index d942b87f..24947ddb 100644 --- a/tables_app/src/main/res/layout/list_view_manager.xml +++ b/tables_app/src/main/res/layout/list_view_manager.xml @@ -27,5 +27,6 @@ android:layout_marginTop="6dip" android:layout_marginLeft="6dip" android:layout_height="wrap_content" + android:fontFamily="@font/montserrat" android:text="@string/press_to_add_list_view"/> diff --git a/tables_app/src/main/res/layout/message_with_text_edit_field_dialog.xml b/tables_app/src/main/res/layout/message_with_text_edit_field_dialog.xml index c3a3841c..3a839799 100644 --- a/tables_app/src/main/res/layout/message_with_text_edit_field_dialog.xml +++ b/tables_app/src/main/res/layout/message_with_text_edit_field_dialog.xml @@ -7,11 +7,13 @@ + android:layout_height="wrap_content" + android:fontFamily="@font/montserrat"/> diff --git a/tables_app/src/main/res/layout/navigate_fragment.xml b/tables_app/src/main/res/layout/navigate_fragment.xml index f3a3a459..15597929 100644 --- a/tables_app/src/main/res/layout/navigate_fragment.xml +++ b/tables_app/src/main/res/layout/navigate_fragment.xml @@ -52,6 +52,7 @@ android:layout_height="wrap_content" android:textColor="@color/dark_blue" android:textSize="@dimen/nav_text_size" + android:fontFamily="@font/montserrat" android:textStyle="bold"/> @@ -92,6 +93,7 @@ android:layout_height="wrap_content" android:textColor="@color/dark_blue" android:textSize="@dimen/nav_text_size_small" + android:fontFamily="@font/montserrat" android:textStyle="bold"/> diff --git a/tables_app/src/main/res/layout/row_for_edit_view_entry.xml b/tables_app/src/main/res/layout/row_for_edit_view_entry.xml index 0806b568..9e29ccb9 100644 --- a/tables_app/src/main/res/layout/row_for_edit_view_entry.xml +++ b/tables_app/src/main/res/layout/row_for_edit_view_entry.xml @@ -39,6 +39,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="6dip" android:layout_marginTop="6dip" + android:fontFamily="@font/montserrat" android:textAppearance="?android:attr/textAppearanceLarge"/> diff --git a/tables_app/src/main/res/layout/row_for_view_entry.xml b/tables_app/src/main/res/layout/row_for_view_entry.xml index 8f5a110f..208e5ef0 100644 --- a/tables_app/src/main/res/layout/row_for_view_entry.xml +++ b/tables_app/src/main/res/layout/row_for_view_entry.xml @@ -29,6 +29,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="6dip" android:layout_marginTop="6dip" + android:fontFamily="@font/montserrat" android:textAppearance="?android:attr/textAppearanceLarge"/> diff --git a/tables_app/src/main/res/layout/security_activity.xml b/tables_app/src/main/res/layout/security_activity.xml index 7e78e78c..bdac10d4 100644 --- a/tables_app/src/main/res/layout/security_activity.xml +++ b/tables_app/src/main/res/layout/security_activity.xml @@ -11,6 +11,7 @@ android:layout_height="wrap_content" android:gravity="center" android:textSize="20sp" + android:fontFamily="@font/montserrat" android:textStyle="bold" android:textColor="#000000"/> @@ -19,6 +20,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:textColor="#000000" + android:fontFamily="@font/montserrat" android:text="@string/read_access_control_group"/> + android:layout_height="wrap_content" + android:fontFamily="@font/sourcesanspro_regular"/> + android:text="@string/sms_shortcut_input" + android:fontFamily="@font/montserrat"/> + android:layout_height="wrap_content" + android:fontFamily="@font/sourcesanspro_regular"/> + android:text="@string/sms_shortcut_output" + android:fontFamily="@font/montserrat"/> + android:layout_height="wrap_content" + android:fontFamily="@font/sourcesanspro_regular"/> + android:textAppearance="?android:attr/textAppearanceLarge" + android:fontFamily="@font/montserrat"/> diff --git a/tables_app/src/main/res/layout/shortcut_list.xml b/tables_app/src/main/res/layout/shortcut_list.xml index c8e7cddb..2803231f 100644 --- a/tables_app/src/main/res/layout/shortcut_list.xml +++ b/tables_app/src/main/res/layout/shortcut_list.xml @@ -14,5 +14,6 @@ android:id="@id/android:empty" android:layout_width="match_parent" android:layout_height="fill_parent" + android:fontFamily="@font/montserrat" android:text="@string/no_shortcuts"/> diff --git a/tables_app/src/main/res/layout/shortcut_list_item.xml b/tables_app/src/main/res/layout/shortcut_list_item.xml index c4dae239..340b4bd4 100644 --- a/tables_app/src/main/res/layout/shortcut_list_item.xml +++ b/tables_app/src/main/res/layout/shortcut_list_item.xml @@ -9,10 +9,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="20sp" + android:fontFamily="@font/montserrat" android:id="@+id/sc_item_name"/> diff --git a/tables_app/src/main/res/layout/web_view_container.xml b/tables_app/src/main/res/layout/web_view_container.xml index 95dc85d6..d8311f24 100644 --- a/tables_app/src/main/res/layout/web_view_container.xml +++ b/tables_app/src/main/res/layout/web_view_container.xml @@ -18,6 +18,7 @@ android:gravity="center" android:layout_width="match_parent" android:layout_height="match_parent" + android:fontFamily="@font/montserrat" android:text="@string/database_unavailable"/>