diff options
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java | 6 | ||||
| -rw-r--r-- | src/main/res/layout/magic_create.xml | 13 | ||||
| -rw-r--r-- | src/main/res/layout/welcome.xml | 13 | ||||
| -rw-r--r-- | src/main/res/values-w360dp/fineprint.xml | 4 | ||||
| -rw-r--r-- | src/main/res/values/fineprint.xml | 4 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 4 |
6 files changed, 40 insertions, 4 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java b/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java index 3c837b94..59d58db5 100644 --- a/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java @@ -1,5 +1,6 @@ package eu.siacs.conversations.ui; +import android.app.ActionBar; import android.app.Activity; import android.content.Intent; import android.content.pm.ActivityInfo; @@ -16,6 +17,11 @@ public class WelcomeActivity extends Activity { if (getResources().getBoolean(R.bool.portrait_only)) { setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); } + final ActionBar ab = getActionBar(); + if (ab != null) { + ab.setDisplayShowHomeEnabled(false); + ab.setDisplayHomeAsUpEnabled(false); + } super.onCreate(savedInstanceState); setContentView(R.layout.welcome); final Button createAccount = (Button) findViewById(R.id.create_account); diff --git a/src/main/res/layout/magic_create.xml b/src/main/res/layout/magic_create.xml index e21ce5c0..a7f62747 100644 --- a/src/main/res/layout/magic_create.xml +++ b/src/main/res/layout/magic_create.xml @@ -17,7 +17,7 @@ android:layout_alignParentStart="true" android:minHeight="256dp" android:orientation="vertical" - android:paddingBottom="8dp" + android:paddingBottom="10dp" android:paddingLeft="16dp" android:paddingRight="16dp"> <Space @@ -79,5 +79,16 @@ android:padding="8dp" android:src="@drawable/main_logo"/> </RelativeLayout> + <TextView + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:textColor="?attr/color_text_secondary" + android:textSize="12sp" + android:maxLines="1" + android:text="@string/free_for_six_month" + android:layout_centerHorizontal="true"/> </RelativeLayout> </ScrollView>
\ No newline at end of file diff --git a/src/main/res/layout/welcome.xml b/src/main/res/layout/welcome.xml index 3d618675..a8278187 100644 --- a/src/main/res/layout/welcome.xml +++ b/src/main/res/layout/welcome.xml @@ -17,7 +17,7 @@ android:layout_alignParentStart="true" android:minHeight="256dp" android:orientation="vertical" - android:paddingBottom="8dp" + android:paddingBottom="10dp" android:paddingLeft="16dp" android:paddingRight="16dp"> <Space @@ -70,5 +70,16 @@ android:padding="8dp" android:src="@drawable/main_logo"/> </RelativeLayout> + <TextView + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:textColor="?attr/color_text_secondary" + android:textSize="12sp" + android:maxLines="1" + android:text="@string/free_for_six_month" + android:layout_centerHorizontal="true"/> </RelativeLayout> </ScrollView>
\ No newline at end of file diff --git a/src/main/res/values-w360dp/fineprint.xml b/src/main/res/values-w360dp/fineprint.xml new file mode 100644 index 00000000..ca44db98 --- /dev/null +++ b/src/main/res/values-w360dp/fineprint.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="free_for_six_month">¹ 8 Euro a year. First 6 month free. App remains free of charge.</string> +</resources>
\ No newline at end of file diff --git a/src/main/res/values/fineprint.xml b/src/main/res/values/fineprint.xml new file mode 100644 index 00000000..bbe52fdd --- /dev/null +++ b/src/main/res/values/fineprint.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="free_for_six_month">¹ 8 Euro a year. First 6 month free. App remains free.</string> +</resources>
\ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index c7c791df..170cbfff 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -629,8 +629,8 @@ <string name="no_application_to_share_uri">No application found to share URI</string> <string name="share_uri_with">Share URI with…</string> <string translatable="false" name="welcome_header">Join the Conversation</string> - <string name="welcome_text">XMPP is a provider independent protocol. You can use this client with what ever XMPP server you choose.\nHowever for your convenience we made it easy to create an account on conversations.im; a provider specially suited for the use with Conversations.</string> - <string name="magic_create_text">We will guide you through the process of creating an account on conversations.im.\nWhen picking conversations.im as a provider you will be able to communicate with users of other providers by giving them your full Jabber ID.</string> + <string name="welcome_text">XMPP is a provider independent protocol. You can use this client with what ever XMPP server you choose.\nHowever for your convenience we made it easy to create an account on conversations.im¹; a provider specially suited for the use with Conversations.</string> + <string name="magic_create_text">We will guide you through the process of creating an account on conversations.im.¹\nWhen picking conversations.im as a provider you will be able to communicate with users of other providers by giving them your full Jabber ID.</string> <string name="your_full_jid_will_be">Your full Jabber ID will be: %s</string> <string name="create_account">Create Account</string> <string name="use_own_provider">Use my own provider</string> |