Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

Links in user bios can be clicked on.

This commit is contained in:
Vavassor 2017-02-01 15:20:39 -05:00
parent 62ff735878
commit cad060282b
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
View File

@ -28,6 +28,7 @@ import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.text.Spanned;
import android.text.method.LinkMovementMethod;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
@ -110,7 +111,9 @@ public class AccountActivity extends AppCompatActivity {
tabLayout.setupWithViewPager(viewPager);
for (int i = 0; i < tabLayout.getTabCount(); i++) {
TabLayout.Tab tab = tabLayout.getTabAt(i);
tab.setCustomView(adapter.getTabView(i));
if (tab != null) {
tab.setCustomView(adapter.getTabView(i));
}
}
}
@ -166,6 +169,7 @@ public class AccountActivity extends AppCompatActivity {
note.setText(account.note);
note.setLinksClickable(true);
note.setMovementMethod(LinkMovementMethod.getInstance());
ImageLoader imageLoader = VolleySingleton.getInstance(this).getImageLoader();
if (!account.avatar.isEmpty()) {
@ -187,8 +191,10 @@ public class AccountActivity extends AppCompatActivity {
TabLayout.Tab tab = tabLayout.getTabAt(i);
if (tab != null) {
View view = tab.getCustomView();
TextView total = (TextView) view.findViewById(R.id.total);
total.setText(counts[i]);
if (view != null) {
TextView total = (TextView) view.findViewById(R.id.total);
total.setText(counts[i]);
}
}
}
}

3
app/src/main/java/com/keylesspalace/tusky/StatusViewHolder.java
View File

@ -106,7 +106,8 @@ public class StatusViewHolder extends RecyclerView.ViewHolder {
public void setContent(Spanned content, Status.Mention[] mentions,
final StatusActionListener listener) {
// Redirect URLSpan's in the status content to the listener for viewing tag pages.
/* Redirect URLSpan's in the status content to the listener for viewing tag pages and
* account pages. */
SpannableStringBuilder builder = new SpannableStringBuilder(content);
URLSpan[] urlSpans = content.getSpans(0, content.length(), URLSpan.class);
for (URLSpan span : urlSpans) {