diff --git a/app/build.gradle b/app/build.gradle index e4eb465b33f21cee5bad3f8b6b0c68f1ea4616eb..1d28260598b18447fc6b7e1e68fff4818f9f5d46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -195,6 +195,9 @@ dependencies { compile 'com.github.chrisbanes:PhotoView:2.0.0' +// Fonts + compile 'uk.co.chrisjenx:calligraphy:2.3.0' + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) diff --git a/app/src/main/assets/fonts/avenir_black.otf b/app/src/main/assets/fonts/avenir_black.otf new file mode 100644 index 0000000000000000000000000000000000000000..714fdfb94ebdae24ed3f0eca2afe4480a072db4d Binary files /dev/null and b/app/src/main/assets/fonts/avenir_black.otf differ diff --git a/app/src/main/assets/fonts/avenir_light.otf b/app/src/main/assets/fonts/avenir_light.otf new file mode 100644 index 0000000000000000000000000000000000000000..37b6128683cedb096224f80223bf1a6f0878d0e8 Binary files /dev/null and b/app/src/main/assets/fonts/avenir_light.otf differ diff --git a/app/src/main/assets/fonts/avenir_roman.otf b/app/src/main/assets/fonts/avenir_roman.otf new file mode 100644 index 0000000000000000000000000000000000000000..de238e6b6b402d479422e18c0f5b273f5bd2f7f2 Binary files /dev/null and b/app/src/main/assets/fonts/avenir_roman.otf differ diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml index 8da36d0937ad6b84e7e79267795b5cc548476542..0d6dd5cf309e37f4dcc76723407eac093d6eefd4 100644 --- a/app/src/main/res/layout/activity_welcome.xml +++ b/app/src/main/res/layout/activity_welcome.xml @@ -5,7 +5,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.nynja.mobile.communicator.ui.activities.WelcomeActivity"> + tools:context="com.nynja.mobile.communicator.ui.activities.WelcomeActivity" + tools:ignore="MissingPrefix"> diff --git a/app/src/main/res/layout/fragment_welcome.xml b/app/src/main/res/layout/fragment_welcome.xml index 19c3a0689149018368fd171dbd41e2ddde6fa337..66ade9da8b26df7cbea2b984f8046ffdfe93dadb 100644 --- a/app/src/main/res/layout/fragment_welcome.xml +++ b/app/src/main/res/layout/fragment_welcome.xml @@ -4,18 +4,21 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + tools:ignore="MissingPrefix" tools:layout_editor_absoluteX="0dp" tools:layout_editor_absoluteY="25dp"> @@ -57,6 +60,7 @@ @null -