diff options
author | Kazuki Yamaguchi <k@rhe.jp> | 2016-09-22 01:59:47 +0900 |
---|---|---|
committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-09-22 02:01:01 +0900 |
commit | 05149478218ed788ad03aa92071304a3da801f71 (patch) | |
tree | 4e4efef137e6645ec5714fa4795cece116fd7b23 /app/src/main/java | |
parent | f24cf8daf78296564131c9e91323686b9de8e92d (diff) | |
download | SmileEssence-05149478218ed788ad03aa92071304a3da801f71.tar.gz |
常にオリジナルサイズのアイコンを使用する
Diffstat (limited to 'app/src/main/java')
4 files changed, 5 insertions, 24 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/entity/User.java b/app/src/main/java/net/lacolaco/smileessence/entity/User.java index d03c67c7..b6bce4c6 100644 --- a/app/src/main/java/net/lacolaco/smileessence/entity/User.java +++ b/app/src/main/java/net/lacolaco/smileessence/entity/User.java @@ -61,7 +61,7 @@ public class User extends UIObservable { if (isProtected() != user.isProtected() || getScreenName() == null || !getScreenName().equals(user.getScreenName()) || getName() == null || !getName().equals(user.getName()) || - getProfileImageUrl() == null || !getProfileImageUrl().equals(user.getProfileImageURLHttps())) { + profileImageUrl == null || !profileImageUrl.equals(user.getProfileImageURLHttps())) { isProtected = user.isProtected(); if (user.getScreenName() != null) screenName = user.getScreenName(); @@ -119,16 +119,12 @@ public class User extends UIObservable { return name; } - public String getProfileImageUrl() { - return profileImageUrl; - } - public String getProfileImageUrlOriginal() { return getProfileImageUrlWithSuffix(""); } private String getProfileImageUrlWithSuffix(String suffix) { - String original = getProfileImageUrl(); + String original = profileImageUrl; if (original != null) { String url = original.substring(0, original.lastIndexOf("_")) + suffix; int extIndex = original.lastIndexOf("."); diff --git a/app/src/main/java/net/lacolaco/smileessence/viewmodel/EventViewModel.java b/app/src/main/java/net/lacolaco/smileessence/viewmodel/EventViewModel.java index b6c18d6c..ffdaaa36 100644 --- a/app/src/main/java/net/lacolaco/smileessence/viewmodel/EventViewModel.java +++ b/app/src/main/java/net/lacolaco/smileessence/viewmodel/EventViewModel.java @@ -105,12 +105,7 @@ public class EventViewModel implements IViewModel { private void updateViewUser(View convertedView) { NetworkImageView icon = (NetworkImageView) convertedView.findViewById(R.id.imageview_status_icon); - String iconUrl; - if (UserPreferenceHelper.getInstance().get(R.string.key_setting_original_icon, false)) { - iconUrl = source.getProfileImageUrlOriginal(); - } else { - iconUrl = source.getProfileImageUrl(); - } + String iconUrl= source.getProfileImageUrlOriginal(); ImageCache.getInstance().setImageToView(iconUrl, icon); TextView header = (TextView) convertedView.findViewById(R.id.textview_status_header); diff --git a/app/src/main/java/net/lacolaco/smileessence/viewmodel/MessageViewModel.java b/app/src/main/java/net/lacolaco/smileessence/viewmodel/MessageViewModel.java index 11793ecf..bbc9f51b 100644 --- a/app/src/main/java/net/lacolaco/smileessence/viewmodel/MessageViewModel.java +++ b/app/src/main/java/net/lacolaco/smileessence/viewmodel/MessageViewModel.java @@ -131,12 +131,7 @@ public class MessageViewModel implements IViewModel, IdObject { int textSize = UserPreferenceHelper.getInstance().getTextSize(); NetworkImageView icon = (NetworkImageView) convertedView.findViewById(R.id.imageview_status_icon); - String iconUrl; - if (UserPreferenceHelper.getInstance().get(R.string.key_setting_original_icon, false)) { - iconUrl = directMessage.getSender().getProfileImageUrlOriginal(); - } else { - iconUrl = directMessage.getSender().getProfileImageUrl(); - } + String iconUrl= directMessage.getSender().getProfileImageUrlOriginal(); ImageCache.getInstance().setImageToView(iconUrl, icon); icon.setOnClickListener(v -> { UserDetailDialogFragment dialogFragment = new UserDetailDialogFragment(); diff --git a/app/src/main/java/net/lacolaco/smileessence/viewmodel/StatusViewModel.java b/app/src/main/java/net/lacolaco/smileessence/viewmodel/StatusViewModel.java index 625349b9..9320a4bd 100644 --- a/app/src/main/java/net/lacolaco/smileessence/viewmodel/StatusViewModel.java +++ b/app/src/main/java/net/lacolaco/smileessence/viewmodel/StatusViewModel.java @@ -136,12 +136,7 @@ public class StatusViewModel implements IViewModel, IdObject { int textSize = UserPreferenceHelper.getInstance().getTextSize(); NetworkImageView icon = (NetworkImageView) convertedView.findViewById(R.id.imageview_status_icon); - String iconUrl; - if (UserPreferenceHelper.getInstance().get(R.string.key_setting_original_icon, false)) { - iconUrl = tweet.getOriginalTweet().getUser().getProfileImageUrlOriginal(); - } else { - iconUrl = tweet.getOriginalTweet().getUser().getProfileImageUrl(); - } + String iconUrl = tweet.getOriginalTweet().getUser().getProfileImageUrlOriginal(); ImageCache.getInstance().setImageToView(iconUrl, icon); icon.setOnClickListener(v -> onIconClick(activity)); |