From e6387e124f09bf1f320a46465be603e65b4ee1bc Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 29 Sep 2023 17:28:00 +0200 Subject: [PATCH] Updated welcome pages with proper content --- app/src/main/res/drawable/linphone.xml | 12 ++++++ app/src/main/res/drawable/open_source.xml | 13 +++++++ app/src/main/res/drawable/secured.xml | 22 +++++++++++ .../main/res/layout-land/welcome_page_1.xml | 28 +++++++++---- .../main/res/layout-land/welcome_page_2.xml | 28 +++++++++---- .../main/res/layout-land/welcome_page_3.xml | 28 +++++++++---- app/src/main/res/layout/welcome_page_1.xml | 39 ++++++++++--------- app/src/main/res/layout/welcome_page_2.xml | 39 ++++++++++--------- app/src/main/res/layout/welcome_page_3.xml | 39 ++++++++++--------- app/src/main/res/values/dimen.xml | 1 + app/src/main/res/values/strings.xml | 8 ++++ 11 files changed, 179 insertions(+), 78 deletions(-) create mode 100644 app/src/main/res/drawable/linphone.xml create mode 100644 app/src/main/res/drawable/open_source.xml create mode 100644 app/src/main/res/drawable/secured.xml diff --git a/app/src/main/res/drawable/linphone.xml b/app/src/main/res/drawable/linphone.xml new file mode 100644 index 000000000..e168f7ac0 --- /dev/null +++ b/app/src/main/res/drawable/linphone.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/open_source.xml b/app/src/main/res/drawable/open_source.xml new file mode 100644 index 000000000..f6406cba9 --- /dev/null +++ b/app/src/main/res/drawable/open_source.xml @@ -0,0 +1,13 @@ + + + diff --git a/app/src/main/res/drawable/secured.xml b/app/src/main/res/drawable/secured.xml new file mode 100644 index 000000000..415ac2475 --- /dev/null +++ b/app/src/main/res/drawable/secured.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/app/src/main/res/layout-land/welcome_page_1.xml b/app/src/main/res/layout-land/welcome_page_1.xml index e6099470e..320056335 100644 --- a/app/src/main/res/layout-land/welcome_page_1.xml +++ b/app/src/main/res/layout-land/welcome_page_1.xml @@ -4,14 +4,26 @@ android:layout_width="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto"> + + @@ -22,8 +34,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="15dp" - android:text="in Linphone" - android:textColor="@color/black" + android:text="@string/welcome_page_subtitle" + android:textColor="@color/white" android:textSize="26sp" app:layout_constraintBottom_toBottomOf="@id/title_first_line" app:layout_constraintStart_toEndOf="@id/title_first_line"/> @@ -31,9 +43,9 @@ + + @@ -22,8 +34,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="15dp" - android:text="in Linphone" - android:textColor="@color/black" + android:text="@string/welcome_page_subtitle" + android:textColor="@color/white" android:textSize="26sp" app:layout_constraintBottom_toBottomOf="@id/title_first_line" app:layout_constraintStart_toEndOf="@id/title_first_line"/> @@ -31,9 +43,9 @@ + + @@ -22,8 +34,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="15dp" - android:text="in Linphone" - android:textColor="@color/black" + android:text="@string/welcome_page_subtitle" + android:textColor="@color/white" android:textSize="26sp" app:layout_constraintBottom_toBottomOf="@id/title_first_line" app:layout_constraintStart_toEndOf="@id/title_first_line"/> @@ -31,9 +43,9 @@ + + - - diff --git a/app/src/main/res/layout/welcome_page_2.xml b/app/src/main/res/layout/welcome_page_2.xml index 3c8e599bd..96e79f389 100644 --- a/app/src/main/res/layout/welcome_page_2.xml +++ b/app/src/main/res/layout/welcome_page_2.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_marginStart="65dp" android:layout_marginTop="16dp" - android:text="Welcome" + android:text="@string/welcome_page_title" android:textColor="@color/white" android:textSize="36sp" app:layout_constraintTop_toTopOf="parent" @@ -36,36 +36,38 @@ android:layout_height="wrap_content" android:layout_marginEnd="65dp" android:paddingBottom="16dp" - android:text="in Linphone" + android:text="@string/welcome_page_subtitle" android:textColor="@color/white" android:textSize="26sp" app:layout_constraintTop_toBottomOf="@id/title_first_line" app:layout_constraintEnd_toEndOf="parent"/> + + - - diff --git a/app/src/main/res/layout/welcome_page_3.xml b/app/src/main/res/layout/welcome_page_3.xml index 44d2f13db..7c4821897 100644 --- a/app/src/main/res/layout/welcome_page_3.xml +++ b/app/src/main/res/layout/welcome_page_3.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_marginStart="65dp" android:layout_marginTop="16dp" - android:text="Welcome" + android:text="@string/welcome_page_title" android:textColor="@color/white" android:textSize="36sp" app:layout_constraintTop_toTopOf="parent" @@ -36,36 +36,38 @@ android:layout_height="wrap_content" android:layout_marginEnd="65dp" android:paddingBottom="16dp" - android:text="in Linphone" + android:text="@string/welcome_page_subtitle" android:textColor="@color/white" android:textSize="26sp" app:layout_constraintTop_toBottomOf="@id/title_first_line" app:layout_constraintEnd_toEndOf="parent"/> + + - - diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml index 8823a0dd7..d47827733 100644 --- a/app/src/main/res/values/dimen.xml +++ b/app/src/main/res/values/dimen.xml @@ -11,6 +11,7 @@ 300dp 24dp + 100dp 45dp 50dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9c9ef4de6..290ac39b4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -47,6 +47,14 @@ Mark as read Reply + Welcome + in Linphone + Une application de communication sécurisée, open source et française. + Sécurisé + Vos communications sont en sécurité grâce au chiffrement de bout en bout. + Open source + Une application open source et un service gratuit depuis 2001 + Contacts Calls Conversations