aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2015-09-25 23:00:40 +0900
committerKazuki Yamaguchi <k@rhe.jp>2015-09-25 23:00:40 +0900
commit0cec4b3e9d393e24012a8ef5b788f7e81b9aab9d (patch)
treecdb4b29bfdb0d790d50e38c2a75f0489599faae4
parentc2c962f403e55e48f6fbba164ec33c00913246ce (diff)
downloadSmileEssence-0cec4b3e9d393e24012a8ef5b788f7e81b9aab9d.tar.gz
target SDK を 23 に
-rw-r--r--app/app.iml1
-rw-r--r--app/build.gradle22
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/activity/EditTabActivity.java1
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/twitter/StatusFilter.java1
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/view/MentionsFragment.java2
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/view/SearchFragment.java3
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/view/adapter/PageListAdapter.java2
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/view/dialog/SelectSearchQueryDialogFragment.java2
8 files changed, 14 insertions, 20 deletions
diff --git a/app/app.iml b/app/app.iml
index 0e6b07ce..447527e7 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -72,7 +72,6 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v13/23.0.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.mcxiaoke.volley/library/1.0.19/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.navercorp.pulltorefresh/library/3.3.0-SNAPSHOT/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/de.keyboardsurfer.android.widget/crouton/1.8.5/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
diff --git a/app/build.gradle b/app/build.gradle
index 26392afc..be4675bb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,7 @@ android {
defaultConfig {
applicationId "jp.rhe.smileessence"
minSdkVersion 21
- targetSdkVersion 21
+ targetSdkVersion 23
versionCode 25
versionName "1.0.11.1"
}
@@ -40,27 +40,27 @@ android {
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
- compile 'com.android.support:support-v13:+'
+ compile 'com.android.support:support-v13:23.0.1'
// compile 'com.android.support:appcompat-v7:22.1.0'
// volley
- compile 'com.mcxiaoke.volley:library:+@aar'
+ compile 'com.mcxiaoke.volley:library:1.0.19'
// ActiveAndroid
- compile 'com.michaelpardo:activeandroid:+'
+ compile 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT'
// crouton
- compile('de.keyboardsurfer.android.widget:crouton:+@aar') {
+ compile('de.keyboardsurfer.android.widget:crouton:1.8.5@aar') {
// exclusion is not necessary, but generally a good idea.
exclude group: 'com.google.android', module: 'support-v4'
}
// pull to refresh
- compile 'com.navercorp.pulltorefresh:library:+@aar'
+ compile 'com.navercorp.pulltorefresh:library:3.3.0-SNAPSHOT@aar'
// t4j
- compile 'org.twitter4j:twitter4j-core:+'
- compile 'org.twitter4j:twitter4j-media-support:+'
- compile 'org.twitter4j:twitter4j-stream:+'
+ compile 'org.twitter4j:twitter4j-core:4.0.4'
+ compile 'org.twitter4j:twitter4j-media-support:4.0.4'
+ compile 'org.twitter4j:twitter4j-stream:4.0.4'
// twitter-text
- compile 'com.twitter:twitter-text:+'
+ compile 'com.twitter:twitter-text:1.13.0'
// guava
- compile 'com.google.guava:guava:+'
+ compile 'com.google.guava:guava:19.0-rc2'
}
retrolambda {
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/EditTabActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/EditTabActivity.java
index fc848354..f21f5439 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/EditTabActivity.java
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/EditTabActivity.java
@@ -51,7 +51,6 @@ public class EditTabActivity extends Activity {
private EditableCheckBoxModel[] getCheckBoxItems() {
List<EditableCheckBoxModel> models = new ArrayList<>();
- UserPreferenceHelper pref = UserPreferenceHelper.getInstance();
EditableCheckBoxModel post = new EditableCheckBoxModel(getString(R.string.page_name_post));
post.setChecked(true).setInputText(String.valueOf(0)).setFreezing(true);
diff --git a/app/src/main/java/net/lacolaco/smileessence/twitter/StatusFilter.java b/app/src/main/java/net/lacolaco/smileessence/twitter/StatusFilter.java
index a48f4857..2f780cfa 100644
--- a/app/src/main/java/net/lacolaco/smileessence/twitter/StatusFilter.java
+++ b/app/src/main/java/net/lacolaco/smileessence/twitter/StatusFilter.java
@@ -78,6 +78,7 @@ public class StatusFilter {
filter(EventViewModel.class, event);
}
+ @SuppressWarnings("unchecked")
public <T extends IViewModel> void filter(Class<T> klass, T status) {
Map<Object, Consumer<?>> map = addHandlers.get(klass);
if (map != null) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/MentionsFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/MentionsFragment.java
index ccdb5f28..9bce0f77 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/MentionsFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/MentionsFragment.java
@@ -29,7 +29,6 @@ import android.widget.ListView;
import com.handmark.pulltorefresh.library.PullToRefreshBase;
import net.lacolaco.smileessence.Application;
import net.lacolaco.smileessence.R;
-import net.lacolaco.smileessence.activity.MainActivity;
import net.lacolaco.smileessence.entity.Account;
import net.lacolaco.smileessence.entity.ExtractionWord;
import net.lacolaco.smileessence.entity.Tweet;
@@ -108,7 +107,6 @@ public class MentionsFragment extends CustomListFragment<StatusListAdapter> {
@Override
public void onPullUpToRefresh(final PullToRefreshBase<ListView> refreshView) {
- final MainActivity activity = (MainActivity) getActivity();
final Account currentAccount = Application.getCurrentAccount();
final StatusListAdapter adapter = getAdapter();
new MentionsTimelineTask(currentAccount)
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/SearchFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/SearchFragment.java
index 1bd03c73..27818363 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/SearchFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/SearchFragment.java
@@ -83,7 +83,6 @@ public class SearchFragment extends CustomListFragment<SearchListAdapter> implem
SearchListAdapter adapter = new SearchListAdapter(getActivity());
setAdapter(adapter);
- final MainActivity activity = (MainActivity) getActivity();
String lastUsedSearchQuery = InternalPreferenceHelper.getInstance().get(R.string.key_last_used_search_query, "");
if (!TextUtils.isEmpty(lastUsedSearchQuery)) {
startSearch(lastUsedSearchQuery);
@@ -131,7 +130,6 @@ public class SearchFragment extends CustomListFragment<SearchListAdapter> implem
@Override
public void onPullDownToRefresh(final PullToRefreshBase<ListView> refreshView) {
- final MainActivity activity = (MainActivity) getActivity();
final Account currentAccount = Application.getCurrentAccount();
final SearchListAdapter adapter = getAdapter();
String queryString = adapter.getQuery();
@@ -172,7 +170,6 @@ public class SearchFragment extends CustomListFragment<SearchListAdapter> implem
@Override
public void onPullUpToRefresh(final PullToRefreshBase<ListView> refreshView) {
- final MainActivity activity = (MainActivity) getActivity();
final Account currentAccount = Application.getCurrentAccount();
final SearchListAdapter adapter = getAdapter();
String queryString = adapter.getQuery();
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/adapter/PageListAdapter.java b/app/src/main/java/net/lacolaco/smileessence/view/adapter/PageListAdapter.java
index 4fa2a8d2..8a31605c 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/adapter/PageListAdapter.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/adapter/PageListAdapter.java
@@ -141,7 +141,7 @@ public class PageListAdapter extends FragmentPagerAdapter implements ViewPager.O
return -1;
}
- @Deprecated
+ @Deprecated @SuppressWarnings("unchecked")
public <T extends PageFragment> T getFragment(Class<T> fragmentClass) {
for(PageInfo info : pages) {
if (info.getFragmentClass() == fragmentClass) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/SelectSearchQueryDialogFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/dialog/SelectSearchQueryDialogFragment.java
index 24bec636..fa5d3218 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/SelectSearchQueryDialogFragment.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/SelectSearchQueryDialogFragment.java
@@ -49,7 +49,7 @@ public class SelectSearchQueryDialogFragment extends MenuDialogFragment implemen
@Override
public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
final CommandOpenSearch command = (CommandOpenSearch) parent.getItemAtPosition(position);
- final CustomListAdapter<Command> adapter = (CustomListAdapter<Command>) parent.getAdapter();
+ @SuppressWarnings("unchecked") final CustomListAdapter<Command> adapter = (CustomListAdapter<Command>) parent.getAdapter();
ConfirmDialogFragment.show(getActivity(), getString(R.string.dialog_confirm_delete_query), () -> {
adapter.removeItem(command);