21 files changed, 19 insertions, 53 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/ColoredRelativeLayout.kt b/app/src/main/java/net/lacolaco/smileessence/view/ColoredRelativeLayout.kt
index 0bf69378..79c1b579 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/ColoredRelativeLayout.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/ColoredRelativeLayout.kt
@@ -1,7 +1,6 @@
 package net.lacolaco.smileessence.view
 
 import android.content.Context
-import android.content.res.TypedArray
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.util.AttributeSet
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/ExpandedListView.kt b/app/src/main/java/net/lacolaco/smileessence/view/ExpandedListView.kt
index 288354ba..794b4ea6 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/ExpandedListView.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/ExpandedListView.kt
@@ -3,7 +3,6 @@ package net.lacolaco.smileessence.view
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
-import android.view.ViewGroup
 import android.widget.ListView
 
 class ExpandedListView : ListView {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/Partials.kt b/app/src/main/java/net/lacolaco/smileessence/view/Partials.kt
index 679b38cd..62858936 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/Partials.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/Partials.kt
@@ -77,12 +77,10 @@ object Partials {
         view.textview_status_footer.text = getFooterText(tweet)
 
         val typedView = view as ColoredRelativeLayout
-        if (tweet.isRetweet) {
-            typedView.setHighlight(2)
-        } else if (tweet.mentions.contains(world.account.user.screenName)) {
-            typedView.setHighlight(1)
-        } else {
-            typedView.setHighlight(0)
+        when {
+            tweet.isRetweet -> typedView.setHighlight(2)
+            tweet.mentions.contains(world.account.user.screenName) -> typedView.setHighlight(1)
+            else -> typedView.setHighlight(0)
         }
     }
 
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.kt
index 0c908450..e90963bc 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.kt
@@ -106,7 +106,7 @@ class SettingFragment : PreferenceFragment(), OnSharedPreferenceChangeListener,
 
     // -------------------------- OTHER METHODS --------------------------
 
-    fun findPreference(preferenceResID: Int): Preference {
+    private fun findPreference(preferenceResID: Int): Preference {
         return findPreference(getString(preferenceResID))
     }
 
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/ThreeStateButton.kt b/app/src/main/java/net/lacolaco/smileessence/view/ThreeStateButton.kt
index 16e40447..0f496385 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/ThreeStateButton.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/ThreeStateButton.kt
@@ -1,7 +1,6 @@
 package net.lacolaco.smileessence.view
 
 import android.content.Context
-import android.content.res.TypedArray
 import android.graphics.drawable.Drawable
 import android.util.AttributeSet
 import android.widget.Button
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/ToggleableImageButton.kt b/app/src/main/java/net/lacolaco/smileessence/view/ToggleableImageButton.kt
index 945eeb61..f83bcf56 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/ToggleableImageButton.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/ToggleableImageButton.kt
@@ -1,7 +1,6 @@
 package net.lacolaco.smileessence.view
 
 import android.content.Context
-import android.content.res.TypedArray
 import android.graphics.drawable.Drawable
 import android.util.AttributeSet
 import android.widget.ImageButton
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.kt b/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.kt
index 3b022012..e68e3746 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.kt
@@ -6,7 +6,7 @@ import net.lacolaco.smileessence.util.UIHandler
 import java.util.ArrayList
 import java.util.Collections
 
-abstract class CustomListAdapter<T> : BaseAdapter() {
+abstract class CustomListAdapter<out T> : BaseAdapter() {
     private var isNotifiable = true
     private var frozenList: List<T> = ArrayList()
 
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/adapter/EventListAdapter.kt b/app/src/main/java/net/lacolaco/smileessence/view/adapter/EventListAdapter.kt
index c50802d9..86e80e2b 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/adapter/EventListAdapter.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/adapter/EventListAdapter.kt
@@ -36,7 +36,6 @@ import net.lacolaco.smileessence.preference.UserPreferenceHelper
 import net.lacolaco.smileessence.util.StringUtils
 import net.lacolaco.smileessence.view.DialogHelper
 import net.lacolaco.smileessence.view.dialog.UserDetailDialogFragment
-import net.lacolaco.smileessence.view.listener.ListItemClickListener
 
 class EventListAdapter(private val world: World, private val activity: Activity) : CustomListAdapter<Event>() {
     override val list: List<Event>
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/adapter/UnorderedCustomListAdapter.kt b/app/src/main/java/net/lacolaco/smileessence/view/adapter/UnorderedCustomListAdapter.kt
index ef123e55..f32fa7f3 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/adapter/UnorderedCustomListAdapter.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/adapter/UnorderedCustomListAdapter.kt
@@ -2,7 +2,7 @@ package net.lacolaco.smileessence.view.adapter
 
 import java.util.*
 
-abstract class UnorderedCustomListAdapter<T> constructor(override val list: ArrayList<T> = ArrayList<T>()) : CustomListAdapter<T>() {
+abstract class UnorderedCustomListAdapter<T> constructor(override val list: ArrayList<T> = ArrayList()) : CustomListAdapter<T>() {
     init { update() }
 
     @Synchronized
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/ConfirmDialogFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/dialog/ConfirmDialogFragment.kt
index 445995b1..7491fc94 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/ConfirmDialogFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/ConfirmDialogFragment.kt
@@ -66,7 +66,7 @@ abstract class ConfirmDialogFragment : StackableDialogFragment() {
         }
 
         fun show(activity: Activity, text: String, onOK: (() -> Unit)?, onCancel: (() -> Unit)?, ignorable: Boolean) {
-            val confirm = UserPreferenceHelper.instance.get(R.string.key_setting_show_confirm_dialog, true)
+            val confirm = UserPreferenceHelper.instance[R.string.key_setting_show_confirm_dialog, true]
             if (!confirm && ignorable) {
                 onOK!!()
                 return
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageDetailDialogFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageDetailDialogFragment.kt
index 8315ca9f..6359c1b5 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageDetailDialogFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/MessageDetailDialogFragment.kt
@@ -44,11 +44,9 @@ import net.lacolaco.smileessence.twitter.task.Messages
 import net.lacolaco.smileessence.util.SystemServiceHelper
 import net.lacolaco.smileessence.view.DialogHelper
 import net.lacolaco.smileessence.view.Partials
-import net.lacolaco.smileessence.view.adapter.CustomListAdapter
 import net.lacolaco.smileessence.view.adapter.MessageListAdapter
 import net.lacolaco.smileessence.view.adapter.UnorderedCustomListAdapter
-
-import java.util.ArrayList
+import java.util.*
 
 class MessageDetailDialogFragment : StackableDialogFragment() {
     private lateinit var message: DirectMessage
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/TalkChainDialogFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/dialog/TalkChainDialogFragment.kt
index 993bb026..928708c2 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/TalkChainDialogFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/TalkChainDialogFragment.kt
@@ -34,11 +34,8 @@ import net.lacolaco.smileessence.R
 import net.lacolaco.smileessence.entity.Tweet
 import net.lacolaco.smileessence.twitter.task.Tweets
 import net.lacolaco.smileessence.view.Partials
-import net.lacolaco.smileessence.view.adapter.CustomListAdapter
 import net.lacolaco.smileessence.view.adapter.UnorderedCustomListAdapter
 
-import java.util.ArrayList
-
 class TalkChainDialogFragment : StackableDialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val view = activity.layoutInflater.inflate(R.layout.dialog_talk_list, null)
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt
index e5d2bc68..b2430b5a 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt
@@ -95,21 +95,11 @@ class UserDetailDialogFragment : StackableDialogFragment(), View.OnClickListener
                 val dialog = builder.create()
                 dialog.show()
             }
-            R.id.imageview_user_detail_icon -> {
-                browse(user.profileImageUrl!!)
-            }
-            R.id.textview_user_detail_screenname, R.id.textview_user_detail_tweet_count -> {
-                browse(user.userHomeURL)
-            }
-            R.id.textview_user_detail_friend_count -> {
-                browse(String.format("%s/following", user.userHomeURL))
-            }
-            R.id.textview_user_detail_follower_count -> {
-                browse(String.format("%s/followers", user.userHomeURL))
-            }
-            R.id.textview_user_detail_favorite_count -> {
-                browse(String.format("%s/favorites", user.userHomeURL))
-            }
+            R.id.imageview_user_detail_icon -> browse(user.profileImageUrl)
+            R.id.textview_user_detail_screenname, R.id.textview_user_detail_tweet_count -> browse(user.userHomeURL)
+            R.id.textview_user_detail_friend_count -> browse(String.format("%s/following", user.userHomeURL))
+            R.id.textview_user_detail_follower_count -> browse(String.format("%s/followers", user.userHomeURL))
+            R.id.textview_user_detail_favorite_count -> browse(String.format("%s/favorites", user.userHomeURL))
             R.id.button_user_detail_follow -> {
                 val v = view
                 ConfirmDialogFragment.show(activity, getString(R.string.dialog_confirm_commands)) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/CustomListFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/CustomListFragment.kt
index 0c7a1663..23174d09 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/CustomListFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/CustomListFragment.kt
@@ -32,7 +32,6 @@ import android.widget.AbsListView
 import android.widget.ListView
 import com.handmark.pulltorefresh.library.PullToRefreshBase
 import com.handmark.pulltorefresh.library.PullToRefreshListView
-import kotlinx.android.synthetic.main.dialog_menu_list.*
 import kotlinx.android.synthetic.main.fragment_list.view.*
 import net.lacolaco.smileessence.R
 import net.lacolaco.smileessence.view.adapter.CustomListAdapter
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/HistoryFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/HistoryFragment.kt
index 20643aa5..6e5ba84e 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/HistoryFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/HistoryFragment.kt
@@ -25,8 +25,6 @@
 package net.lacolaco.smileessence.view.page
 
 import android.os.Bundle
-import com.handmark.pulltorefresh.library.PullToRefreshBase
-import net.lacolaco.smileessence.World
 import net.lacolaco.smileessence.view.adapter.EventListAdapter
 
 class HistoryFragment : CustomListFragment<EventListAdapter>() {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/HomeFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/HomeFragment.kt
index 505efd22..7803450a 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/HomeFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/HomeFragment.kt
@@ -27,11 +27,8 @@ package net.lacolaco.smileessence.view.page
 import android.os.Bundle
 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.Tweet
-import net.lacolaco.smileessence.logging.Logger
 import net.lacolaco.smileessence.twitter.task.TimelineTask
 import net.lacolaco.smileessence.twitter.task.Timelines
 import net.lacolaco.smileessence.util.UIHandler
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/MentionsFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/MentionsFragment.kt
index 7c047a51..1fabac59 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/MentionsFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/MentionsFragment.kt
@@ -27,11 +27,9 @@ package net.lacolaco.smileessence.view.page
 import android.os.Bundle
 import android.widget.ListView
 import com.handmark.pulltorefresh.library.PullToRefreshBase
-import net.lacolaco.smileessence.Application
 import net.lacolaco.smileessence.R
 import net.lacolaco.smileessence.data.ExtractionWord
 import net.lacolaco.smileessence.entity.Tweet
-import net.lacolaco.smileessence.entity.User
 import net.lacolaco.smileessence.twitter.task.TimelineTask
 import net.lacolaco.smileessence.twitter.task.Timelines
 import net.lacolaco.smileessence.view.adapter.TimelineAdapter
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/PageFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/PageFragment.kt
index b3814d05..32ab1dec 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/PageFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/PageFragment.kt
@@ -1,11 +1,7 @@
 package net.lacolaco.smileessence.view.page
 
 import android.app.Fragment
-import android.os.Bundle
-import android.widget.Adapter
 import net.lacolaco.smileessence.Application
-import net.lacolaco.smileessence.World
-import net.lacolaco.smileessence.activity.MainActivity
 
 abstract class PageFragment : Fragment() {
     protected val world by lazy {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/PostFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/PostFragment.kt
index b2aade14..670dca30 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/PostFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/PostFragment.kt
@@ -244,7 +244,7 @@ class PostFragment : PageFragment(), TextWatcher, View.OnFocusChangeListener, Vi
         setStateFromView()
         val state = world.postState
         val mainActivity = activity as MainActivity
-        val resizeFlag = UserPreferenceHelper.instance.get(R.string.key_setting_resize_post_image, false)
+        val resizeFlag = UserPreferenceHelper.instance[R.string.key_setting_resize_post_image, false]
         Tweets.CreateTask(world.account, state.toStatusUpdate(), state.mediaFilePath, resizeFlag)
                 .onDoneUI { t ->
                     world.notify(R.string.notice_tweet_succeeded)
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/SearchFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/SearchFragment.kt
index d24a562c..3b0d759d 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/SearchFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/SearchFragment.kt
@@ -58,7 +58,7 @@ class SearchFragment : CustomListFragment<TimelineAdapter>(), View.OnClickListen
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
-        queryString = UserPreferenceHelper.instance.get(R.string.key_last_used_search_query, "")
+        queryString = UserPreferenceHelper.instance[R.string.key_last_used_search_query, ""]
     }
 
     override fun refresh() { //TODO
@@ -237,7 +237,7 @@ class SearchFragment : CustomListFragment<TimelineAdapter>(), View.OnClickListen
     }
 
     fun startSearch(queryString: String) {
-        UserPreferenceHelper.instance.set(R.string.key_last_used_search_query, queryString)
+        UserPreferenceHelper.instance[R.string.key_last_used_search_query] = queryString
         edittext_search.setText(queryString)
         this.queryString = queryString
         adapter.clear()
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/UserListFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/UserListFragment.kt
index abcdb01d..91767135 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/UserListFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/UserListFragment.kt
@@ -54,7 +54,7 @@ class UserListFragment : CustomListFragment<TimelineAdapter>(), View.OnClickList
     }
 
     override fun refresh() {//TODO
-        val lastUserList = UserPreferenceHelper.instance.get(R.string.key_last_used_user_list, "")
+        val lastUserList = UserPreferenceHelper.instance[R.string.key_last_used_user_list, ""]
         if (!TextUtils.isEmpty(lastUserList)) {
             startUserList(lastUserList)
         }
@@ -140,7 +140,7 @@ class UserListFragment : CustomListFragment<TimelineAdapter>(), View.OnClickList
     }
 
     fun startUserList(listFullName: String) {
-        UserPreferenceHelper.instance.set(R.string.key_last_used_user_list, listFullName)
+        UserPreferenceHelper.instance[R.string.key_last_used_user_list] = listFullName
         val adapter = adapter
         this.listFullName = listFullName
         adapter.clear()