aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2015-10-03 22:25:20 +0900
committerKazuki Yamaguchi <k@rhe.jp>2015-10-04 00:38:00 +0900
commit45dc0eca8e331cabcea6ef1dceb67c7feddc22b4 (patch)
tree7bb41668077dd1e6bdb563efc1574b6fa67cbbfc
parent66559f8c164c12bcd8afe17bb8c250dfed7475f4 (diff)
downloadSmileEssence-45dc0eca8e331cabcea6ef1dceb67c7feddc22b4.tar.gz
Lint に従って細かい修正
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java1
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/twitter/task/GetUserListsTask.java5
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/util/Morse.java2
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java2
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageDetailDialogFragment.java3
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/view/dialog/SendMessageDialogFragment.java8
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.java7
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.java3
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/view/listener/ListItemClickListener.java3
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/view/page/PostFragment.java13
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/view/page/SearchFragment.java9
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/view/page/UserListFragment.java2
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/view/preference/IntegerEditTextPreference.java3
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/view/preference/IntegerListPreference.java4
-rw-r--r--app/src/main/res/layout/dialog_status_detail.xml2
-rw-r--r--app/src/main/res/layout/layout_edit_list.xml1
-rw-r--r--app/src/main/res/layout/layout_license.xml1
-rw-r--r--app/src/main/res/layout/layout_main.xml1
-rw-r--r--app/src/main/res/layout/layout_oauth.xml1
-rw-r--r--app/src/main/res/layout/layout_setting.xml1
20 files changed, 37 insertions, 35 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
index 9ae59f15..c5219b43 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
@@ -330,6 +330,7 @@ public class MainActivity extends Activity implements Application.OnCurrentAccou
return true;
}
+ @SuppressWarnings("ConstantConditions")
@Override
public void onCurrentAccountChanged(Account account) {
Logger.debug(String.format("onCurrentAccountChanged: %s", account.getUser().getScreenName()));
diff --git a/app/src/main/java/net/lacolaco/smileessence/twitter/task/GetUserListsTask.java b/app/src/main/java/net/lacolaco/smileessence/twitter/task/GetUserListsTask.java
index ca675e25..57f35f91 100644
--- a/app/src/main/java/net/lacolaco/smileessence/twitter/task/GetUserListsTask.java
+++ b/app/src/main/java/net/lacolaco/smileessence/twitter/task/GetUserListsTask.java
@@ -28,6 +28,7 @@ import net.lacolaco.smileessence.entity.Account;
import net.lacolaco.smileessence.util.BackgroundTask;
import net.lacolaco.smileessence.util.ListUtils;
import twitter4j.TwitterException;
+import twitter4j.UserList;
import java.util.List;
@@ -45,8 +46,6 @@ public class GetUserListsTask extends BackgroundTask<List<String>, Void> {
@Override
protected List<String> doInBackground() throws TwitterException {
- return ListUtils.map(account.getTwitter().list().getUserLists(account.getUserId()), userLists -> {
- return userLists.getFullName();
- });
+ return ListUtils.map(account.getTwitter().list().getUserLists(account.getUserId()), UserList::getFullName);
}
}
diff --git a/app/src/main/java/net/lacolaco/smileessence/util/Morse.java b/app/src/main/java/net/lacolaco/smileessence/util/Morse.java
index 3c33d4f8..7aa5f697 100644
--- a/app/src/main/java/net/lacolaco/smileessence/util/Morse.java
+++ b/app/src/main/java/net/lacolaco/smileessence/util/Morse.java
@@ -55,7 +55,7 @@ public class Morse {
return false;
} else {
for (String s : list) {
- if (!s.equals("・・・") && !s.equals("・・") && !s.equals("・")) {
+ if (!"・・・".equals(s) && !"・・".equals(s) && !"・".equals(s)) {
return true;
}
}
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java
index b49f406a..226a9988 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.java
@@ -33,8 +33,8 @@ import android.preference.Preference;
import android.preference.PreferenceFragment;
import android.text.TextUtils;
import net.lacolaco.smileessence.R;
-import net.lacolaco.smileessence.activity.ManageAccountsActivity;
import net.lacolaco.smileessence.activity.LicenseActivity;
+import net.lacolaco.smileessence.activity.ManageAccountsActivity;
import net.lacolaco.smileessence.notification.Notificator;
import net.lacolaco.smileessence.view.dialog.SimpleDialogFragment;
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageDetailDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageDetailDialogFragment.java
index 27344b5d..1d6b7809 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageDetailDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageDetailDialogFragment.java
@@ -28,6 +28,7 @@ import android.app.AlertDialog;
import android.app.Dialog;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
+import android.support.v4.content.ContextCompat;
import android.view.View;
import android.widget.ImageButton;
import android.widget.LinearLayout;
@@ -204,7 +205,7 @@ public class MessageDetailDialogFragment extends StackableDialogFragment impleme
Command.filter(commands);
for (final Command command : commands) {
View commandView = command.getView(activity, activity.getLayoutInflater(), null);
- commandView.setBackgroundColor(getResources().getColor(R.color.transparent));
+ commandView.setBackgroundColor(ContextCompat.getColor(getActivity(), R.color.transparent));
commandView.setOnClickListener(new ListItemClickListener(activity, command::execute));
commandsLayout.addView(commandView);
}
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/SendMessageDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/SendMessageDialogFragment.java
index 13e28fd5..1ab2324c 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/SendMessageDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/SendMessageDialogFragment.java
@@ -28,6 +28,7 @@ import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
+import android.support.v4.content.ContextCompat;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@@ -96,11 +97,8 @@ public class SendMessageDialogFragment extends StackableDialogFragment implement
remainingCount -= validator.getShortUrlLength();
}
textViewCount.setText(String.valueOf(remainingCount));
- if (remainingCount == 140) {
- textViewCount.setTextColor(getResources().getColor(R.color.red));
- buttonSend.setEnabled(false);
- } else if (remainingCount < 0) {
- textViewCount.setTextColor(getResources().getColor(R.color.red));
+ if (remainingCount == 140 || remainingCount < 0) {
+ textViewCount.setTextColor(ContextCompat.getColor(getActivity(), R.color.red));
buttonSend.setEnabled(false);
} else {
textViewCount.setTextAppearance(getActivity(), android.R.style.TextAppearance_Widget_TextView);
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.java
index 296b0365..5fe9ff73 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.java
@@ -28,6 +28,7 @@ import android.app.AlertDialog;
import android.app.Dialog;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
+import android.support.v4.content.ContextCompat;
import android.view.View;
import android.widget.*;
import net.lacolaco.smileessence.Application;
@@ -207,7 +208,7 @@ public class StatusDetailDialogFragment extends StackableDialogFragment implemen
} else {
retweet.setVisibility(View.VISIBLE);
if (tweet.isRetweetedBy(account.getUserId())) {
- retweet.setImageDrawable(getResources().getDrawable(R.drawable.icon_retweet_on));
+ retweet.setImageDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.icon_retweet_on));
} else {
retweet.setImageDrawable(Themes.getStyledDrawable(getActivity(), themeResId, R.attr.icon_retweet_off));
}
@@ -216,7 +217,7 @@ public class StatusDetailDialogFragment extends StackableDialogFragment implemen
ImageButton favorite = (ImageButton) view.findViewById(R.id.button_status_detail_favorite);
favorite.setOnClickListener(this);
if (tweet.isFavoritedBy(account.getUserId())) {
- favorite.setImageDrawable(getResources().getDrawable(R.drawable.icon_favorite_on));
+ favorite.setImageDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.icon_favorite_on));
} else {
favorite.setImageDrawable(Themes.getStyledDrawable(getActivity(), themeResId, R.attr.icon_favorite_off));
}
@@ -237,7 +238,7 @@ public class StatusDetailDialogFragment extends StackableDialogFragment implemen
Command.filter(commands);
for (final Command command : commands) {
View commandView = command.getView(activity, activity.getLayoutInflater(), null);
- commandView.setBackgroundColor(getResources().getColor(R.color.transparent));
+ commandView.setBackgroundColor(ContextCompat.getColor(getActivity(), R.color.transparent));
commandView.setOnClickListener(new ListItemClickListener(activity, command::execute));
commandsLayout.addView(commandView);
}
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.java
index ea0c34d7..97766e12 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.java
@@ -28,6 +28,7 @@ import android.app.AlertDialog;
import android.app.Dialog;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
+import android.support.v4.content.ContextCompat;
import android.text.Html;
import android.text.TextUtils;
import android.text.method.LinkMovementMethod;
@@ -317,7 +318,7 @@ public class UserDetailDialogFragment extends StackableDialogFragment implements
private void lockFollowButton() {
buttonFollow.setText(R.string.user_detail_loading);
- buttonFollow.setBackground(getActivity().getResources().getDrawable(R.drawable.button_round_gray));
+ buttonFollow.setBackground(ContextCompat.getDrawable(getActivity(), R.drawable.button_round_gray));
buttonFollow.setEnabled(false);
}
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/listener/ListItemClickListener.java b/app/src/main/java/net/lacolaco/smileessence/view/listener/ListItemClickListener.java
index 13f1b49c..22d6180f 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/listener/ListItemClickListener.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/listener/ListItemClickListener.java
@@ -26,6 +26,7 @@ package net.lacolaco.smileessence.view.listener;
import android.app.Activity;
import android.graphics.drawable.ColorDrawable;
+import android.support.v4.content.ContextCompat;
import android.view.View;
import net.lacolaco.smileessence.R;
import net.lacolaco.smileessence.util.UIHandler;
@@ -52,7 +53,7 @@ public class ListItemClickListener implements View.OnClickListener {
@Override
public void onClick(final View v) {
final int currentBgColor = ((ColorDrawable) v.getBackground()).getColor();
- v.setBackgroundColor(activity.getResources().getColor(R.color.metro_blue));
+ v.setBackgroundColor(ContextCompat.getColor(activity, R.color.metro_blue));
v.invalidate();
new UIHandler().post(() -> {
v.setBackgroundColor(currentBgColor);
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/PostFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/page/PostFragment.java
index 5ff960fd..e2d3a24e 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/PostFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/PostFragment.java
@@ -28,6 +28,8 @@ import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.content.ContextCompat;
import android.text.Editable;
import android.text.Spannable;
import android.text.TextUtils;
@@ -141,7 +143,7 @@ public class PostFragment extends PageFragment implements TextWatcher, View.OnFo
Tweet tweet = postState.getInReplyTo();
View header = viewGroupReply.findViewById(R.id.layout_post_reply_status);
header = new StatusViewModel(tweet).getView(activity, activity.getLayoutInflater(), header);
- header.setBackgroundColor(getResources().getColor(R.color.transparent));
+ header.setBackgroundColor(ContextCompat.getColor(getActivity(), R.color.transparent));
header.setClickable(false);
} else {
viewGroupReply.setVisibility(View.GONE);
@@ -177,11 +179,8 @@ public class PostFragment extends PageFragment implements TextWatcher, View.OnFo
remainingCount -= validator.getShortUrlLength();
}
textViewCount.setText(String.valueOf(remainingCount));
- if (remainingCount == 140) {
- textViewCount.setTextColor(getResources().getColor(R.color.red));
- buttonTweet.setEnabled(false);
- } else if (remainingCount < 0) {
- textViewCount.setTextColor(getResources().getColor(R.color.red));
+ if (remainingCount == 140 || remainingCount < 0) {
+ textViewCount.setTextColor(ContextCompat.getColor(getActivity(), R.color.red));
buttonTweet.setEnabled(false);
} else {
textViewCount.setTextAppearance(getActivity(), android.R.style.TextAppearance_Widget_TextView);
@@ -224,7 +223,7 @@ public class PostFragment extends PageFragment implements TextWatcher, View.OnFo
editText.setTextSize(textSize + 4);
editText.setMovementMethod(new ArrowKeyMovementMethod() {
@Override
- protected boolean right(TextView widget, Spannable buffer) {
+ protected boolean right(@NonNull TextView widget, Spannable buffer) {
//Don't back to Home
return widget.getSelectionEnd() == widget.length() || super.right(widget, buffer);
}
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/SearchFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/page/SearchFragment.java
index e12536f7..01bed430 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/SearchFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/SearchFragment.java
@@ -26,6 +26,7 @@ package net.lacolaco.smileessence.view.page;
import android.content.Context;
import android.os.Bundle;
+import android.support.annotation.NonNull;
import android.text.Spannable;
import android.text.TextUtils;
import android.text.method.ArrowKeyMovementMethod;
@@ -228,13 +229,13 @@ public class SearchFragment extends CustomListFragment<SearchListAdapter> implem
});
editText.setMovementMethod(new ArrowKeyMovementMethod() {
@Override
- protected boolean right(TextView widget, Spannable buffer) {
+ protected boolean right(@NonNull TextView widget, Spannable buffer) {
//Don't move page
return widget.getSelectionEnd() == widget.length() || super.right(widget, buffer);
}
@Override
- protected boolean left(TextView widget, Spannable buffer) {
+ protected boolean left(@NonNull TextView widget, Spannable buffer) {
//Don't move page
return widget.getSelectionStart() == 0 || super.left(widget, buffer);
}
@@ -318,9 +319,7 @@ public class SearchFragment extends CustomListFragment<SearchListAdapter> implem
query.setResultType(Query.RECENT);
runRefreshTask(
new SearchTask(Application.getInstance().getCurrentAccount(), query),
- () -> {
- adapter.updateForce();
- });
+ adapter::updateForce);
}
}
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/UserListFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/page/UserListFragment.java
index 4441f63e..646e6877 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/UserListFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/UserListFragment.java
@@ -197,7 +197,7 @@ public class UserListFragment extends CustomListFragment<UserListListAdapter> im
adapter.updateForce();
runRefreshTask(
new UserListStatusesTask(Application.getInstance().getCurrentAccount(), listFullName),
- () -> adapter.updateForce());
+ adapter::updateForce);
}
private void runRefreshTask(TimelineTask<Tweet> task, Runnable onFinish) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/preference/IntegerEditTextPreference.java b/app/src/main/java/net/lacolaco/smileessence/view/preference/IntegerEditTextPreference.java
index b5989662..88ad0879 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/preference/IntegerEditTextPreference.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/preference/IntegerEditTextPreference.java
@@ -1,6 +1,8 @@
package net.lacolaco.smileessence.view.preference;
+import android.annotation.TargetApi;
import android.content.Context;
+import android.os.Build;
import android.preference.EditTextPreference;
import android.util.AttributeSet;
@@ -9,6 +11,7 @@ public class IntegerEditTextPreference extends EditTextPreference {
super(context);
}
+ @TargetApi(Build.VERSION_CODES.LOLLIPOP)
public IntegerEditTextPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
}
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/preference/IntegerListPreference.java b/app/src/main/java/net/lacolaco/smileessence/view/preference/IntegerListPreference.java
index c3663c52..f04a3b89 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/preference/IntegerListPreference.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/preference/IntegerListPreference.java
@@ -1,14 +1,18 @@
package net.lacolaco.smileessence.view.preference;
+import android.annotation.TargetApi;
import android.content.Context;
+import android.os.Build;
import android.preference.ListPreference;
import android.util.AttributeSet;
public class IntegerListPreference extends ListPreference {
+ @TargetApi(Build.VERSION_CODES.LOLLIPOP)
public IntegerListPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
}
+ @TargetApi(Build.VERSION_CODES.LOLLIPOP)
public IntegerListPreference(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
diff --git a/app/src/main/res/layout/dialog_status_detail.xml b/app/src/main/res/layout/dialog_status_detail.xml
index 474e9e04..fb64e0ba 100644
--- a/app/src/main/res/layout/dialog_status_detail.xml
+++ b/app/src/main/res/layout/dialog_status_detail.xml
@@ -172,6 +172,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/page_background"
- android:orientation="vertical"></LinearLayout>
+ android:orientation="vertical" />
</LinearLayout>
</ScrollView>
diff --git a/app/src/main/res/layout/layout_edit_list.xml b/app/src/main/res/layout/layout_edit_list.xml
index 316a42ad..bc86286c 100644
--- a/app/src/main/res/layout/layout_edit_list.xml
+++ b/app/src/main/res/layout/layout_edit_list.xml
@@ -26,7 +26,6 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/layout_license.xml b/app/src/main/res/layout/layout_license.xml
index 562715aa..fa73ec04 100644
--- a/app/src/main/res/layout/layout_license.xml
+++ b/app/src/main/res/layout/layout_license.xml
@@ -25,7 +25,6 @@
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml
index d144df93..e1c4f5f8 100644
--- a/app/src/main/res/layout/layout_main.xml
+++ b/app/src/main/res/layout/layout_main.xml
@@ -25,7 +25,6 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context=".MainActivity"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/layout_oauth.xml b/app/src/main/res/layout/layout_oauth.xml
index 030ac4a1..246d51ce 100644
--- a/app/src/main/res/layout/layout_oauth.xml
+++ b/app/src/main/res/layout/layout_oauth.xml
@@ -26,7 +26,6 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="15dp"
diff --git a/app/src/main/res/layout/layout_setting.xml b/app/src/main/res/layout/layout_setting.xml
index a31fdaad..9c6fc9d5 100644
--- a/app/src/main/res/layout/layout_setting.xml
+++ b/app/src/main/res/layout/layout_setting.xml
@@ -26,7 +26,6 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">