Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated fonts for heading and body #222

Open
wants to merge 2 commits into
base: upgrade-jdk11
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>

</RelativeLayout>
1 change: 1 addition & 0 deletions tables_app/src/main/res/layout/color_rule_manager.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
</RelativeLayout>
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@
android:text="@string/use_survey_form"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat"
/>

<TextView
android:text="@string/title_form_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat"
/>

<EditText
Expand All @@ -22,6 +24,7 @@
android:layout_height="wrap_content"
android:paddingRight="35dip"
android:inputType="textNoSuggestions"
android:fontFamily="@font/sourcesanspro_regular"
android:autoText="false"
android:capitalize="none"
android:enabled="false"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<EditText
android:id="@+id/edit_view_name"
android:inputType="text"
android:fontFamily="@font/sourcesanspro_regular"
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>

Expand Down
5 changes: 3 additions & 2 deletions tables_app/src/main/res/layout/file_manager.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/open_new_spreadsheet"
/>
android:fontFamily="@font/montserrat"/>

<TextView
android:id="@+id/file_manager_path"
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat"/>

<ListView
android:id="@+id/file_manager_list"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
android:id="@android:id/empty"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fontFamily="@font/montserrat"
android:text="@string/no_color_rules"/>


Expand Down
1 change: 1 addition & 0 deletions tables_app/src/main/res/layout/fragment_table_list.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
</LinearLayout>
1 change: 1 addition & 0 deletions tables_app/src/main/res/layout/list_view_manager.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
</RelativeLayout>
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@
<TextView
android:id="@+id/message"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat"/>

<EditText
android:id="@+id/edit_field"
android:inputType="textNoSuggestions"
android:fontFamily="@font/sourcesanspro_regular"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

Expand Down
3 changes: 3 additions & 0 deletions tables_app/src/main/res/layout/navigate_fragment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>

</LinearLayout>
Expand Down Expand Up @@ -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"/>

<TextView
Expand All @@ -100,6 +102,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"/>
</LinearLayout>

Expand Down
2 changes: 2 additions & 0 deletions tables_app/src/main/res/layout/row_for_edit_view_entry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>

<TextView
Expand All @@ -47,6 +48,7 @@
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/row_label"
android:layout_below="@+id/row_label"
android:fontFamily="@font/montserrat"
android:text="@string/edit"
android:textAppearance="?android:attr/textAppearanceSmall"/>
</TwoLineListItem>
Expand Down
2 changes: 2 additions & 0 deletions tables_app/src/main/res/layout/row_for_view_entry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>

<TextView
Expand All @@ -37,6 +38,7 @@
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/row_label"
android:layout_below="@+id/row_label"
android:fontFamily="@font/montserrat"
android:text="@string/edit"
android:textAppearance="?android:attr/textAppearanceSmall"/>
</TwoLineListItem>
Expand Down
3 changes: 3 additions & 0 deletions tables_app/src/main/res/layout/security_activity.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>

Expand All @@ -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"/>

<Spinner
Expand All @@ -31,6 +33,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textColor="#000000"
android:fontFamily="@font/montserrat"
android:text="@string/write_access_control_group"/>

<Spinner
Expand Down
16 changes: 11 additions & 5 deletions tables_app/src/main/res/layout/shortcut_edit_dialog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,41 @@
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat"
android:text="@string/sms_shortcut_name"/>

<EditText
android:id="@+id/scedit_dialog_name"
android:inputType="text"
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:fontFamily="@font/sourcesanspro_regular"/>

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sms_shortcut_input"/>
android:text="@string/sms_shortcut_input"
android:fontFamily="@font/montserrat"/>

<EditText
android:id="@+id/scedit_dialog_input"
android:inputType="text"
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:fontFamily="@font/sourcesanspro_regular"/>

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/sms_shortcut_output"/>
android:text="@string/sms_shortcut_output"
android:fontFamily="@font/montserrat"/>

<EditText
android:id="@+id/scedit_dialog_output"
android:inputType="text"
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:fontFamily="@font/sourcesanspro_regular"/>

<LinearLayout
android:layout_width="fill_parent"
Expand Down
3 changes: 2 additions & 1 deletion tables_app/src/main/res/layout/shortcut_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:textColor="@color/black"
android:textAppearance="?android:attr/textAppearanceLarge"/>
android:textAppearance="?android:attr/textAppearanceLarge"
android:fontFamily="@font/montserrat"/>
</LinearLayout>
1 change: 1 addition & 0 deletions tables_app/src/main/res/layout/shortcut_list.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
</LinearLayout>
2 changes: 2 additions & 0 deletions tables_app/src/main/res/layout/shortcut_list_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat"
android:id="@+id/sc_item_desc"/>
</LinearLayout>
1 change: 1 addition & 0 deletions tables_app/src/main/res/layout/web_view_container.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>

</LinearLayout>
Expand Down