From 7b2029552523fa2496f11d059a3fb290c81dcc31 Mon Sep 17 00:00:00 2001 From: Motunrayo Ilawole Date: Mon, 7 Oct 2024 18:21:08 +0100 Subject: [PATCH 1/4] update fonts --- .../src/main/res/layout/copy_expansion_files_layout.xml | 3 ++- survey_app/src/main/res/layout/form_chooser_list.xml | 6 ++++-- survey_app/src/main/res/layout/shortcut_item.xml | 3 ++- survey_app/src/main/res/layout/splash_screen.xml | 6 ++++++ survey_app/src/main/res/layout/web_view_container.xml | 4 +++- survey_app/src/main/res/xml/preferences.xml | 2 +- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/survey_app/src/main/res/layout/copy_expansion_files_layout.xml b/survey_app/src/main/res/layout/copy_expansion_files_layout.xml index 83d5071c..55f247a0 100644 --- a/survey_app/src/main/res/layout/copy_expansion_files_layout.xml +++ b/survey_app/src/main/res/layout/copy_expansion_files_layout.xml @@ -28,6 +28,7 @@ the License. android:paddingRight="20dp" android:text="@string/initializing" android:textColor="@color/black" - android:textSize="21sp" /> + android:textSize="21sp" + android:fontFamily="@font/montserrat"/> \ No newline at end of file diff --git a/survey_app/src/main/res/layout/form_chooser_list.xml b/survey_app/src/main/res/layout/form_chooser_list.xml index d5cb8eca..809ae025 100644 --- a/survey_app/src/main/res/layout/form_chooser_list.xml +++ b/survey_app/src/main/res/layout/form_chooser_list.xml @@ -29,7 +29,8 @@ the License. android:paddingRight="8dip" android:paddingTop="4dip" android:text="@string/select_form_to_edit" - android:textSize="21sp" /> + android:textSize="21sp" + android:fontFamily="@font/montserrat"/> + android:textSize="21sp" + android:fontFamily="@font/montserrat"/> \ No newline at end of file diff --git a/survey_app/src/main/res/layout/shortcut_item.xml b/survey_app/src/main/res/layout/shortcut_item.xml index 48e48595..796108ba 100644 --- a/survey_app/src/main/res/layout/shortcut_item.xml +++ b/survey_app/src/main/res/layout/shortcut_item.xml @@ -23,5 +23,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" /> diff --git a/survey_app/src/main/res/layout/splash_screen.xml b/survey_app/src/main/res/layout/splash_screen.xml index cbfeffd6..2762504d 100644 --- a/survey_app/src/main/res/layout/splash_screen.xml +++ b/survey_app/src/main/res/layout/splash_screen.xml @@ -36,6 +36,8 @@ android:layout_height="wrap_content" android:gravity="center_vertical|left" android:paddingBottom="5dip"> + + + + diff --git a/survey_app/src/main/res/layout/web_view_container.xml b/survey_app/src/main/res/layout/web_view_container.xml index db891d18..12422c24 100644 --- a/survey_app/src/main/res/layout/web_view_container.xml +++ b/survey_app/src/main/res/layout/web_view_container.xml @@ -28,11 +28,13 @@ the License. android:visibility="gone" /> + + android:text="@string/database_unavailable" + android:fontFamily="@font/montserrat"/> diff --git a/survey_app/src/main/res/xml/preferences.xml b/survey_app/src/main/res/xml/preferences.xml index ae475a6b..67ac6137 100644 --- a/survey_app/src/main/res/xml/preferences.xml +++ b/survey_app/src/main/res/xml/preferences.xml @@ -33,7 +33,7 @@ android:key="common.username" android:title="@string/username" android:inputType="textNoSuggestions" - android:dialogTitle="@string/change_username" + android:dialogTitle="@string/change_username" android:persistent="false"/> Date: Mon, 14 Oct 2024 08:29:36 +0100 Subject: [PATCH 2/4] remove comments --- survey_app/src/main/res/layout/splash_screen.xml | 2 -- survey_app/src/main/res/layout/web_view_container.xml | 1 - 2 files changed, 3 deletions(-) diff --git a/survey_app/src/main/res/layout/splash_screen.xml b/survey_app/src/main/res/layout/splash_screen.xml index 2762504d..64dc4982 100644 --- a/survey_app/src/main/res/layout/splash_screen.xml +++ b/survey_app/src/main/res/layout/splash_screen.xml @@ -37,7 +37,6 @@ android:gravity="center_vertical|left" android:paddingBottom="5dip"> - - - Date: Mon, 14 Oct 2024 08:33:51 +0100 Subject: [PATCH 3/4] remove spaces --- survey_app/src/main/res/layout/splash_screen.xml | 1 - survey_app/src/main/res/xml/preferences.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/survey_app/src/main/res/layout/splash_screen.xml b/survey_app/src/main/res/layout/splash_screen.xml index 64dc4982..ba7426de 100644 --- a/survey_app/src/main/res/layout/splash_screen.xml +++ b/survey_app/src/main/res/layout/splash_screen.xml @@ -36,7 +36,6 @@ android:layout_height="wrap_content" android:gravity="center_vertical|left" android:paddingBottom="5dip"> - Date: Wed, 16 Oct 2024 15:10:59 +0100 Subject: [PATCH 4/4] update list font --- survey_app/src/main/res/layout/two_item.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/survey_app/src/main/res/layout/two_item.xml b/survey_app/src/main/res/layout/two_item.xml index 12f553c0..68261fc4 100644 --- a/survey_app/src/main/res/layout/two_item.xml +++ b/survey_app/src/main/res/layout/two_item.xml @@ -15,7 +15,8 @@ android:gravity="center_vertical" android:layout_alignParentTop="true" android:layout_alignParentLeft="true" - android:textAppearance="?android:attr/textAppearanceLarge"/> + android:textAppearance="?android:attr/textAppearanceLarge" + android:fontFamily="@font/montserrat"/> + android:textAppearance="?android:attr/textAppearanceSmall" + android:fontFamily="@font/montserrat"/> + android:textAppearance="?android:attr/textAppearanceSmall" + android:fontFamily="@font/sourcesanspro_regular"/>