From 5d08081f9dcbab037c826aef7bbb58533b899dce Mon Sep 17 00:00:00 2001 From: nuclearfog Date: Fri, 27 Mar 2020 13:17:53 +0100 Subject: [PATCH] bug fix, layout fix --- .../twidda/activity/AppSettings.java | 1 + .../twidda/activity/UserProfile.java | 10 ++++++++-- .../twidda/backend/items/Tweet.java | 4 ++-- .../twidda/backend/items/TwitterUser.java | 10 +++++----- app/src/main/res/layout/page_settings.xml | 19 ++++++++++++++++--- 5 files changed, 32 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/AppSettings.java b/app/src/main/java/org/nuclearfog/twidda/activity/AppSettings.java index c41e6c7b..bc3293fd 100644 --- a/app/src/main/java/org/nuclearfog/twidda/activity/AppSettings.java +++ b/app/src/main/java/org/nuclearfog/twidda/activity/AppSettings.java @@ -118,6 +118,7 @@ public class AppSettings extends AppCompatActivity implements OnClickListener, O load_picker.setMaxValue(10); load_picker.setDisplayedValues(PICKER_SELECT); load_picker.setWrapSelectorWheel(false); + load_picker.setDescendantFocusability(NumberPicker.FOCUS_BLOCK_DESCENDANTS); load_dialog_selector = new Dialog(this); load_dialog_selector.setContentView(load_picker); diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java b/app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java index dfc38df4..f2d5bcb0 100644 --- a/app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java +++ b/app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java @@ -130,7 +130,7 @@ public class UserProfile extends AppCompatActivity implements OnClickListener, bioTxt.setMovementMethod(LinkMovementMethod.getInstance()); tab.setSelectedTabIndicatorColor(settings.getHighlightColor()); bioTxt.setLinkTextColor(settings.getHighlightColor()); - lnkTxt.setLinkTextColor(settings.getHighlightColor()); + lnkTxt.setTextColor(settings.getHighlightColor()); root.setBackgroundColor(settings.getBackgroundColor()); tweetTabTxt.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.home_profile, 0, 0); favorTabTxt.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.favorite_profile, 0, 0); @@ -495,7 +495,13 @@ public class UserProfile extends AppCompatActivity implements OnClickListener, txtLocation.setVisibility(GONE); } if (!user.getLink().isEmpty()) { - lnkTxt.setText(user.getLink()); + String link = user.getLink(); + if (link.startsWith("http://")) + lnkTxt.setText(link.substring(7)); + else if (link.startsWith("https://")) + lnkTxt.setText(link.substring(8)); + else + lnkTxt.setText(link); lnkTxt.setVisibility(VISIBLE); } else { lnkTxt.setVisibility(GONE); diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/items/Tweet.java b/app/src/main/java/org/nuclearfog/twidda/backend/items/Tweet.java index 6e3a29b9..97c2e06a 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/items/Tweet.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/items/Tweet.java @@ -71,7 +71,7 @@ public class Tweet { replyUserId = status.getInReplyToUserId(); // remove HTML tag - String api = status.getSource(); + String api = "" + status.getSource(); int start = api.indexOf('>') + 1; int end = api.lastIndexOf('<'); if (start > 0 && end > 0) @@ -341,7 +341,7 @@ public class Tweet { private String getText(Status status) { URLEntity[] urlEntities = status.getURLEntities(); MediaEntity[] mediaEntities = status.getMediaEntities(); - StringBuilder tweet = new StringBuilder(status.getText()); + StringBuilder tweet = new StringBuilder("" + status.getText()); for (int i = urlEntities.length - 1; i >= 0; i--) { // expand shorten links int start = urlEntities[i].getStart(); int end = urlEntities[i].getEnd(); diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/items/TwitterUser.java b/app/src/main/java/org/nuclearfog/twidda/backend/items/TwitterUser.java index bdc31de2..4b136a73 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/items/TwitterUser.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/items/TwitterUser.java @@ -33,11 +33,11 @@ public class TwitterUser { userID = user.getId(); username = user.getName(); screenname = '@' + user.getScreenName(); - profileImg = user.getOriginalProfileImageURLHttps(); + profileImg = "" + user.getOriginalProfileImageURLHttps(); bio = getBio(user); - link = user.getURLEntity().getExpandedURL(); - location = user.getLocation(); - bannerImg = user.getProfileBannerURL(); + link = "" + user.getURLEntity().getExpandedURL(); + location = "" + user.getLocation(); + bannerImg = "" + user.getProfileBannerURL(); isVerified = user.isVerified(); isLocked = user.isProtected(); created = user.getCreatedAt().getTime(); @@ -205,7 +205,7 @@ public class TwitterUser { */ private String getBio(User user) { URLEntity[] entities = user.getDescriptionURLEntities(); - StringBuilder bio = new StringBuilder(user.getDescription()); + StringBuilder bio = new StringBuilder("" + user.getDescription()); for (int i = entities.length - 1; i >= 0; i--) { URLEntity entity = entities[i]; bio.replace(entity.getStart(), entity.getEnd(), entity.getExpandedURL()); diff --git a/app/src/main/res/layout/page_settings.xml b/app/src/main/res/layout/page_settings.xml index 73ac0d7f..40fca1ea 100644 --- a/app/src/main/res/layout/page_settings.xml +++ b/app/src/main/res/layout/page_settings.xml @@ -105,10 +105,23 @@ android:layout_height="@dimen/divider" android:background="?android:attr/listDivider" /> - + android:layout_height="match_parent" + android:orientation="horizontal"> + + + + + +