diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java index 4a4d33ac7..00ee8db02 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java @@ -45,6 +45,7 @@ import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.PopupMenu; import android.text.SpannableString; import android.text.method.LinkMovementMethod; +import android.text.style.UnderlineSpan; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -396,7 +397,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi @Override - public void onRetrieveAccount(Account account, Error error) { + public void onRetrieveAccount(final Account account, Error error) { if( error != null){ final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); boolean show_error_messages = sharedpreferences.getBoolean(Helper.SET_SHOW_ERROR_MESSAGES, true); @@ -481,7 +482,26 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi final AppBarLayout appBar = findViewById(R.id.appBar); maxScrollSize = appBar.getTotalScrollRange(); - + final TextView warning_message = findViewById(R.id.warning_message); + SpannableString content = new SpannableString(getString(R.string.disclaimer_full)); + content.setSpan(new UnderlineSpan(), 0, content.length(), 0); + warning_message.setText(content); + warning_message.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(getApplicationContext(), WebviewActivity.class); + Bundle b = new Bundle(); + if( !accountUrl.startsWith("http://") && ! accountUrl.startsWith("https://")) + accountUrl = "http://" + accountUrl; + b.putString("url", accountUrl); + intent.putExtras(b); + startActivity(intent); + } + }); + if( account.getAcct().contains("@") ) + warning_message.setVisibility(View.VISIBLE); + else + warning_message.setVisibility(View.GONE); appBar.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() { @Override public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) { @@ -507,12 +527,17 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi .scaleY(0).scaleX(0) .setDuration(400) .start(); + warning_message.setVisibility(View.GONE); } if (percentage <= 40 && !avatarShown) { avatarShown = true; account_pp.animate() .scaleY(1).scaleX(1) .start(); + if( account.getAcct().contains("@") ) + warning_message.setVisibility(View.VISIBLE); + else + warning_message.setVisibility(View.GONE); } } }); diff --git a/app/src/main/res/layout-sw600dp/activity_show_account.xml b/app/src/main/res/layout-sw600dp/activity_show_account.xml index e4441800a..df752c73a 100644 --- a/app/src/main/res/layout-sw600dp/activity_show_account.xml +++ b/app/src/main/res/layout-sw600dp/activity_show_account.xml @@ -241,7 +241,14 @@ android:gravity="center" tools:ignore="ContentDescription" /> - + - + Für Menschen mit Sehbehinderung beschreiben Translate Please, wait few seconds before making this action. + Das Profil wird möglicherweise unvollständig wiedergegeben. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 78ac71a92..37abcde6c 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -436,4 +436,5 @@ Décrire pour les malvoyants Traduire Veuillez patienter quelques secondes avant de faire cette action. + Les données ci-dessous peuvent ne pas refléter ce profil dans sa totalité. \ No newline at end of file diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 87de9fde3..696e4d395 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -433,4 +433,5 @@ Omschrijf dit voor mensen met een visuele beperking Translate Please, wait few seconds before making this action. + De informatie hieronder kan mogelijk een incompleet beeld geven van dit gebruikersprofiel. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index d9431726b..8bc81a4cb 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -435,4 +435,5 @@ Describe for the visually impaired Translate Please, wait few seconds before making this action. + Information below may reflect the user\'s profile incompletely. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2514a57dc..aaff56f47 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -93,6 +93,7 @@ Click on the path to change it Failed! Scheduled toots + Information below may reflect the user\'s profile incompletely. No toot to display The toot was added to favourites