From 54afd383b7fc241b7cb430244e07e0cdd108acc4 Mon Sep 17 00:00:00 2001 From: Kazuki Yamaguchi Date: Sun, 18 Oct 2015 15:39:34 +0900 Subject: _normal ではなくオリジナルのアイコンを使う設定を追加 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../smileessence/activity/ManageAccountsActivity.java | 2 +- .../net/lacolaco/smileessence/viewmodel/EventViewModel.java | 8 +++++++- .../lacolaco/smileessence/viewmodel/MessageViewModel.java | 8 +++++++- .../lacolaco/smileessence/viewmodel/StatusViewModel.java | 8 +++++++- app/src/main/res/values-ja/strings.xml | 2 ++ app/src/main/res/values/keys.xml | 1 + app/src/main/res/values/strings.xml | 2 ++ app/src/main/res/xml/setting.xml | 13 +++++++++---- 8 files changed, 36 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/ManageAccountsActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/ManageAccountsActivity.java index 2063b694..f310e4c5 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/ManageAccountsActivity.java +++ b/app/src/main/java/net/lacolaco/smileessence/activity/ManageAccountsActivity.java @@ -199,7 +199,7 @@ public class ManageAccountsActivity extends Activity implements AdapterView.OnIt } Account account = getItem(position); NetworkImageView iconView = (NetworkImageView) convertView.findViewById(R.id.account_icon); - ImageCache.getInstance().setImageToView(account.getUser().getProfileImageUrl(), iconView); + ImageCache.getInstance().setImageToView(account.getUser().getProfileImageUrlOriginal(), iconView); TextView textView = (TextView) convertView.findViewById(R.id.account_text_view); String text = "@" + account.getUser().getScreenName(); 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 39b97adb..b6c18d6c 100644 --- a/app/src/main/java/net/lacolaco/smileessence/viewmodel/EventViewModel.java +++ b/app/src/main/java/net/lacolaco/smileessence/viewmodel/EventViewModel.java @@ -105,7 +105,13 @@ public class EventViewModel implements IViewModel { private void updateViewUser(View convertedView) { NetworkImageView icon = (NetworkImageView) convertedView.findViewById(R.id.imageview_status_icon); - ImageCache.getInstance().setImageToView(source.getProfileImageUrl(), icon); + String iconUrl; + if (UserPreferenceHelper.getInstance().get(R.string.key_setting_original_icon, false)) { + iconUrl = source.getProfileImageUrlOriginal(); + } else { + iconUrl = source.getProfileImageUrl(); + } + ImageCache.getInstance().setImageToView(iconUrl, icon); TextView header = (TextView) convertedView.findViewById(R.id.textview_status_header); header.setText(getFormattedString()); 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 905e6d8d..23b96ba0 100644 --- a/app/src/main/java/net/lacolaco/smileessence/viewmodel/MessageViewModel.java +++ b/app/src/main/java/net/lacolaco/smileessence/viewmodel/MessageViewModel.java @@ -133,7 +133,13 @@ public class MessageViewModel implements IViewModel, IdObject { int nameStyle = UserPreferenceHelper.getInstance().getNameStyle(); NetworkImageView icon = (NetworkImageView) convertedView.findViewById(R.id.imageview_status_icon); - ImageCache.getInstance().setImageToView(directMessage.getSender().getProfileImageUrl(), icon); + String iconUrl; + if (UserPreferenceHelper.getInstance().get(R.string.key_setting_original_icon, false)) { + iconUrl = directMessage.getSender().getProfileImageUrlOriginal(); + } else { + iconUrl = directMessage.getSender().getProfileImageUrl(); + } + ImageCache.getInstance().setImageToView(iconUrl, icon); icon.setOnClickListener(v -> { UserDetailDialogFragment dialogFragment = new UserDetailDialogFragment(); dialogFragment.setUserID(directMessage.getSender().getId()); 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 b1ab044a..5e59a986 100644 --- a/app/src/main/java/net/lacolaco/smileessence/viewmodel/StatusViewModel.java +++ b/app/src/main/java/net/lacolaco/smileessence/viewmodel/StatusViewModel.java @@ -137,7 +137,13 @@ public class StatusViewModel implements IViewModel, IdObject { int nameStyle = UserPreferenceHelper.getInstance().getNameStyle(); NetworkImageView icon = (NetworkImageView) convertedView.findViewById(R.id.imageview_status_icon); - ImageCache.getInstance().setImageToView(tweet.getOriginalTweet().getUser().getProfileImageUrl(), 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(); + } + ImageCache.getInstance().setImageToView(iconUrl, icon); icon.setOnClickListener(v -> onIconClick(activity)); TextView header = (TextView) convertedView.findViewById(R.id.textview_status_header); diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index b3169ad2..f1259d5b 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -84,6 +84,8 @@ モールスの解読 ツイートURLの展開 開発中につき不安定 + オリジナルのアイコンを使用する + _normal サフィックスのつかない元画像を使用する システム設定 セーフモード 確認ダイアログを表示する diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml index 55a0b301..5de498d2 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -48,6 +48,7 @@ pageListVisibility pageListPosition extendStatusURL + useOriginalIcon resizePostImage lastUsedSearchQuery lastUsedAccountId diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0a4a0d47..93cf559b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -84,6 +84,8 @@ Enable morse Extend status url Unstable + Use original size profile image + Use original ones rather than "_normal" images System Setting Safe mode Show confirm dialog diff --git a/app/src/main/res/xml/setting.xml b/app/src/main/res/xml/setting.xml index 2843b3ab..53f6c5a8 100644 --- a/app/src/main/res/xml/setting.xml +++ b/app/src/main/res/xml/setting.xml @@ -62,10 +62,15 @@ android:key="@string/key_setting_read_morse" android:title="@string/setting_read_morse" /> + android:defaultValue="true" + android:key="@string/key_setting_extend_status_url" + android:summary="@string/setting_extend_status_url_summary" + android:title="@string/setting_extend_status_url" /> +