diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-10-13 12:17:20 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2016-10-13 12:17:20 +0200 |
commit | 2a73b8d76e0879b7d4e86fc863f95ec1325fd9c4 (patch) | |
tree | fe515040797524a268b73adcf2c8402637937507 /src/main | |
parent | f6cfa277414caf999a7180f921f7d040f6b0c3ff (diff) |
clarified fineprint a little bit
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/res/layout/magic_create.xml | 6 | ||||
-rw-r--r-- | src/main/res/layout/welcome.xml | 6 | ||||
-rw-r--r-- | src/main/res/values-w360dp/fineprint.xml | 2 | ||||
-rw-r--r-- | src/main/res/values-w384dp/dimens.xml | 1 | ||||
-rw-r--r-- | src/main/res/values/dimens.xml | 1 | ||||
-rw-r--r-- | src/main/res/values/fineprint.xml | 2 |
6 files changed, 10 insertions, 8 deletions
diff --git a/src/main/res/layout/magic_create.xml b/src/main/res/layout/magic_create.xml index a7f62747..02ba65bc 100644 --- a/src/main/res/layout/magic_create.xml +++ b/src/main/res/layout/magic_create.xml @@ -80,13 +80,13 @@ android:src="@drawable/main_logo"/> </RelativeLayout> <TextView - android:paddingLeft="16dp" - android:paddingRight="16dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:textColor="?attr/color_text_secondary" - android:textSize="12sp" + android:textSize="@dimen/fineprint_size" android:maxLines="1" android:text="@string/free_for_six_month" android:layout_centerHorizontal="true"/> diff --git a/src/main/res/layout/welcome.xml b/src/main/res/layout/welcome.xml index a8278187..228fe6b6 100644 --- a/src/main/res/layout/welcome.xml +++ b/src/main/res/layout/welcome.xml @@ -71,13 +71,13 @@ android:src="@drawable/main_logo"/> </RelativeLayout> <TextView - android:paddingLeft="16dp" - android:paddingRight="16dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:textColor="?attr/color_text_secondary" - android:textSize="12sp" + android:textSize="@dimen/fineprint_size" android:maxLines="1" android:text="@string/free_for_six_month" android:layout_centerHorizontal="true"/> diff --git a/src/main/res/values-w360dp/fineprint.xml b/src/main/res/values-w360dp/fineprint.xml index ca44db98..fa28fbed 100644 --- a/src/main/res/values-w360dp/fineprint.xml +++ b/src/main/res/values-w360dp/fineprint.xml @@ -1,4 +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> + <string name="free_for_six_month">¹ Optional conversations.im account €8/year. First 6 month free.</string> </resources>
\ No newline at end of file diff --git a/src/main/res/values-w384dp/dimens.xml b/src/main/res/values-w384dp/dimens.xml index 5026848e..441e1103 100644 --- a/src/main/res/values-w384dp/dimens.xml +++ b/src/main/res/values-w384dp/dimens.xml @@ -1,3 +1,4 @@ <resources> <dimen name="conversations_overview_width">336dp</dimen> + <dimen name="fineprint_size">12sp</dimen> </resources> diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index 95e80055..4ce44f22 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -5,4 +5,5 @@ <dimen name="infocard_padding">16dp</dimen> <dimen name="conversations_overview_width">288dp</dimen> <dimen name="image_button_padding">8dp</dimen> + <dimen name="fineprint_size">11sp</dimen> </resources> diff --git a/src/main/res/values/fineprint.xml b/src/main/res/values/fineprint.xml index bbe52fdd..55eeccb6 100644 --- a/src/main/res/values/fineprint.xml +++ b/src/main/res/values/fineprint.xml @@ -1,4 +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> + <string name="free_for_six_month">¹ Optional conversations.im account €8/year. 6 month free.</string> </resources>
\ No newline at end of file |