From 1fb7881f1651c2980f5dc49b61bb8ed4ef6dd27e Mon Sep 17 00:00:00 2001 From: bontric <benjohnwie@gmail.com> Date: Fri, 14 Sep 2018 18:36:34 +0200 Subject: [PATCH] Add mailbox unpaired screen --- .../src/main/res/drawable/mailbox_logo.xml | 29 +++++++++ .../res/layout/fragment_mailbox_unpaired.xml | 60 +++++++++++++++++++ briar-android/src/main/res/values/strings.xml | 2 + 3 files changed, 91 insertions(+) create mode 100644 briar-android/src/main/res/drawable/mailbox_logo.xml create mode 100644 briar-android/src/main/res/layout/fragment_mailbox_unpaired.xml diff --git a/briar-android/src/main/res/drawable/mailbox_logo.xml b/briar-android/src/main/res/drawable/mailbox_logo.xml new file mode 100644 index 000000000..814c06bad --- /dev/null +++ b/briar-android/src/main/res/drawable/mailbox_logo.xml @@ -0,0 +1,29 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="235dp" + android:height="310dp" + android:viewportWidth="235" + android:viewportHeight="310"> + <path + android:pathData="m67.693,144.012c-2.835,0 -5.174,2.338 -5.174,5.173v6.576h12.744v-6.576c0,-2.835 -2.309,-5.173 -5.144,-5.173zM96.043,144.012c-2.835,0 -5.174,2.338 -5.174,5.173v34.927h12.744v-34.927c0,-2.835 -2.309,-5.173 -5.144,-5.173zM62.519,172.596v34.927c0,2.835 2.309,5.173 5.174,5.173h2.426c2.835,0 5.174,-2.338 5.174,-5.173L75.292,172.596ZM90.87,200.947v6.576c0,2.835 2.339,5.173 5.174,5.173h2.426c2.835,0 5.174,-2.338 5.174,-5.173v-6.576z" + android:strokeWidth="0.29227427" + android:fillColor="#87c214"/> + <path + android:pathData="m53.897,157.807c-2.835,0 -5.173,2.309 -5.173,5.174v2.426c0,2.835 2.309,5.174 5.173,5.174h34.927v-12.773zM105.659,157.807v12.773h6.576c2.835,0 5.173,-2.309 5.173,-5.174v-2.426c0,-2.864 -2.338,-5.174 -5.173,-5.174zM53.897,186.157c-2.835,0 -5.173,2.309 -5.173,5.174v2.425c0,2.835 2.309,5.174 5.173,5.174h6.576v-12.773zM77.309,186.157v12.773h34.927c2.835,0 5.173,-2.339 5.173,-5.174v-2.425c0,-2.864 -2.338,-5.174 -5.173,-5.174z" + android:strokeWidth="0.29227427" + android:fillColor="#95d220"/> + <path + android:strokeWidth="1" + android:pathData="m141.701,155.791c0,-33.089 -26.824,-59.913 -59.913,-59.913 -33.089,0 -59.904,26.728 -59.908,59.865l0.19,94.52c0.105,1.868 1.063,2.988 2.525,2.988l196.494,0.216c6.382,0.014 11.08,4.861 11.08,10.865 0,6.004 -4.867,10.872 -11.02,10.872l-198.446,-0.436c-11.366,0.019 -19.814,-9.1 -19.871,-20.617L2.893,156.099C2.898,112.276 45.086,77.346 82.351,77.448 119.716,77.55 161.586,112.933 161.586,156.636 162.988,116.595 123.195,78.779 82.389,77.42 82.427,77.381 175.67,34.88 175.67,34.88l2.361,200.258c-0.041,10.261 -8.107,18.625 -17.99,18.625 -9.883,0 -17.887,-7.677 -17.86,-17.735l-0.481,-80.236" + android:fillColor="#be3300" + android:strokeColor="#000000"/> + <path + android:strokeWidth="1" + android:pathData="m160.17,57.469 l-0.094,39.889 -35.814,-23.451 17.954,-8.219z" + android:fillColor="#202020" + android:strokeColor="#000000"/> + <path + android:strokeWidth="1" + android:pathData="m141.701,155.791c0,-33.089 -26.824,-59.913 -59.913,-59.913 -33.089,0 -59.904,26.728 -59.908,59.865l0.19,94.52c0.105,1.868 1.063,2.988 2.525,2.988l196.494,0.216c6.382,0.014 11.08,4.861 11.08,10.865 0,6.004 -4.867,10.872 -11.02,10.872l-198.446,-0.436c-11.366,0.019 -19.814,-9.1 -19.871,-20.617l0.062,-98.053C2.898,112.276 45.086,77.346 82.351,77.448 119.716,77.55 161.587,112.933 161.587,156.636 162.673,116.124 123.195,78.779 82.389,77.42c25.375,1.268 76.387,20.564 79.198,79.217 0.131,7.891 2.636,73.119 0.239,96.718l-4.129,0.075c-9.88,-0.247 -15.542,-7.344 -15.515,-17.402l-0.481,-80.236" + android:fillColor="#202020" + android:strokeColor="#000000"/> +</vector> diff --git a/briar-android/src/main/res/layout/fragment_mailbox_unpaired.xml b/briar-android/src/main/res/layout/fragment_mailbox_unpaired.xml new file mode 100644 index 000000000..404bf5ec4 --- /dev/null +++ b/briar-android/src/main/res/layout/fragment_mailbox_unpaired.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.constraint.ConstraintLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="0dp" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toTopOf="@+id/mailboxLogo"> + + + <TextView + android:id="@+id/mailboxStatus" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:gravity="center_horizontal" + android:padding="@dimen/margin_large" + android:text="@string/mailbox_description_short" + android:textColor="@color/briar_text_primary" + android:textSize="@dimen/text_size_large"/> + + </ScrollView> + + <ImageView + android:id="@+id/mailboxLogo" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:src="@drawable/mailbox_logo" + app:layout_constraintBottom_toTopOf="@id/pairButton" + /> + + + <Button + android:id="@+id/pairButton" + style="@style/BriarButtonFlat.Positive" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="10dp" + android:text="@string/mailbox_get_started" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toRightOf="@id/moreInfoButton" + app:layout_constraintRight_toRightOf="parent"/> + + <Button + android:id="@+id/moreInfoButton" + style="@style/BriarButtonFlat.Neutral" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="10dp" + android:text="@string/more_info" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toLeftOf="parent"/> + +</android.support.constraint.ConstraintLayout> \ No newline at end of file diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml index 15216a663..f8c2264c7 100644 --- a/briar-android/src/main/res/values/strings.xml +++ b/briar-android/src/main/res/values/strings.xml @@ -488,4 +488,6 @@ <string name="mailbox_unpaired">Your Briar account is not paired with a mailbox.\n Press + to pair with your Mailbox.</string> <string name="mailbox_connected">You are connected to to your mailbox.</string> <string name="mailbox_disconnected">You are not connected to your private Mailbox</string> + <string name="mailbox_description_short">A mailbox lets you and your peers communicate, even if someone is offline.</string> + <string name="mailbox_get_started">Get Started!</string> </resources> -- GitLab