cleanupoldmaster

8 files changed, 5 insertions, 17 deletions

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()