sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[BUGFIX] fine print label for six month

This commit is contained in:
genofire 2020-01-19 21:49:04 +01:00
parent f80eac3a38
commit ea2adcc4f5
No known key found for this signature in database
GPG Key ID: 9D7D3C6BFF600C6A
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conversations/java/eu/siacs/conversations/ui/MagicCreateActivity.java
View File

@ -66,13 +66,11 @@ public class MagicCreateActivity extends XmppActivity implements TextWatcher {
if (username != null && domain != null) { if (username != null && domain != null) {
binding.title.setText(R.string.your_server_invitation); binding.title.setText(R.string.your_server_invitation);
binding.instructions.setText(getString(R.string.magic_create_text_fixed, domain)); binding.instructions.setText(getString(R.string.magic_create_text_fixed, domain));
binding.finePrint.setVisibility(View.INVISIBLE);
binding.username.setEnabled(false); binding.username.setEnabled(false);
binding.username.setText(this.username); binding.username.setText(this.username);
updateFullJidInformation(this.username); updateFullJidInformation(this.username);
} else if (domain != null) { } else if (domain != null) {
binding.instructions.setText(getString(R.string.magic_create_text_on_x, domain)); binding.instructions.setText(getString(R.string.magic_create_text_on_x, domain));
binding.finePrint.setVisibility(View.INVISIBLE);
} }
binding.createAccount.setOnClickListener(v -> { binding.createAccount.setOnClickListener(v -> {
try { try {

13
src/conversations/res/layout/magic_create.xml
View File

@ -95,19 +95,6 @@
android:padding="8dp" android:padding="8dp"
android:src="@drawable/main_logo" /> android:src="@drawable/main_logo" />
</RelativeLayout> </RelativeLayout>
<TextView
android:id="@+id/fine_print"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:maxLines="1"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:text="@string/free_for_six_month"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/fineprint_size" />
</RelativeLayout> </RelativeLayout>
</ScrollView> </ScrollView>
</LinearLayout> </LinearLayout>