make testsize not configurable

18 files changed, 20 insertions, 90 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4bbacffa..b34c1a63 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,7 +82,9 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:host="mainactivity" android:scheme="smileessence" />
+                <data
+                    android:host="mainactivity"
+                    android:scheme="smileessence" />
             </intent-filter>
         </activity>
         <activity
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/ManageAccountsActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/ManageAccountsActivity.kt
index 1ea07948..0f5924b8 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/ManageAccountsActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/ManageAccountsActivity.kt
@@ -133,10 +133,10 @@ class ManageAccountsActivity : AppCompatActivity() {
             launchBg {
                 data!!
                 adapter.add(Account.register(
-                            data.getStringExtra(OAuthActivity.KEY_TOKEN),
-                            data.getStringExtra(OAuthActivity.KEY_TOKEN_SECRET),
-                            data.getLongExtra(OAuthActivity.KEY_USER_ID, -1L),
-                            data.getStringExtra(OAuthActivity.KEY_SCREEN_NAME)))
+                        data.getStringExtra(OAuthActivity.KEY_TOKEN),
+                        data.getStringExtra(OAuthActivity.KEY_TOKEN_SECRET),
+                        data.getLongExtra(OAuthActivity.KEY_USER_ID, -1L),
+                        data.getStringExtra(OAuthActivity.KEY_SCREEN_NAME)))
                 launchUi { adapter.notifyDataSetChanged() }
             }
         }
diff --git a/app/src/main/java/net/lacolaco/smileessence/preference/UserPreferenceHelper.kt b/app/src/main/java/net/lacolaco/smileessence/preference/UserPreferenceHelper.kt
index 23bae89e..7d73423d 100644
--- a/app/src/main/java/net/lacolaco/smileessence/preference/UserPreferenceHelper.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/preference/UserPreferenceHelper.kt
@@ -3,16 +3,11 @@ package net.lacolaco.smileessence.preference
 import android.content.SharedPreferences
 import android.preference.PreferenceManager
 import net.lacolaco.smileessence.Application
-import net.lacolaco.smileessence.R
 
 class UserPreferenceHelper private constructor() {
     private val preferences: SharedPreferences
         get() = PreferenceManager.getDefaultSharedPreferences(Application.instance)
 
-    val textSize: Int
-        get() = get(R.string.key_setting_text_size, 10)
-
-
     operator fun get(key: Int, defaultValue: String): String {
         return preferences.getString(getString(key), defaultValue)
     }
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 81abb9fb..2e91dc4e 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/Partials.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/Partials.kt
@@ -12,7 +12,6 @@ import net.lacolaco.smileessence.data.ImageCache
 import net.lacolaco.smileessence.entity.DirectMessage
 import net.lacolaco.smileessence.entity.Tweet
 import net.lacolaco.smileessence.entity.User
-import net.lacolaco.smileessence.preference.UserPreferenceHelper
 import net.lacolaco.smileessence.twitter.task.getTweetAsync
 import net.lacolaco.smileessence.util.StringUtils
 import net.lacolaco.smileessence.util.bg
@@ -70,24 +69,17 @@ object Partials {
     }
 
     private fun updateViewUser(user: User, activity: Activity, view: View) {
-        val textSize = UserPreferenceHelper.instance.textSize
-
         val iconUrl = user.profileImageUrl
         view.imageview_status_icon.setImageUrl(iconUrl, ImageCache.getImageLoader())
         view.imageview_status_icon.setOnClickListener { v ->
             DialogHelper.showDialog(activity, UserDetailDialogFragment.newInstance(user))
         }
 
-        view.textview_status_header.textSize = textSize.toFloat()
         view.textview_status_header.text = user.formattedName
     }
 
     private fun updateViewBody(tweet: Tweet, world: World, activity: Activity, view: View) {
-        val textSize = UserPreferenceHelper.instance.textSize
-
-        view.textview_status_text.textSize = textSize.toFloat()
         view.textview_status_text.text = tweet.text
-        view.textview_status_footer.textSize = (textSize - 2).toFloat()
         view.textview_status_footer.text = getFooterText(tweet)
 
         val typedView = view as ColoredRelativeLayout
@@ -156,11 +148,7 @@ object Partials {
 
 
     private fun updateViewBody(directMessage: DirectMessage, world: World, view: View) {
-        val textSize = UserPreferenceHelper.instance.textSize
-
-        view.textview_status_text.textSize = textSize.toFloat()
         view.textview_status_text.text = directMessage.text
-        view.textview_status_footer.textSize = (textSize - 2).toFloat()
         view.textview_status_footer.text = getFooterText(directMessage, world)
     }
 }
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 c2aa6ec0..5f3b74c0 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.kt
@@ -4,12 +4,10 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import android.os.Bundle
-import android.preference.EditTextPreference
 import android.preference.ListPreference
 import android.preference.Preference
 import android.preference.PreferenceFragment
 import android.support.v7.app.AlertDialog
-import android.text.TextUtils
 import kotlinx.android.synthetic.main.dialog_app_info.view.*
 import net.lacolaco.smileessence.Application
 import net.lacolaco.smileessence.BuildConfig
@@ -18,15 +16,7 @@ import net.lacolaco.smileessence.activity.LicenseActivity
 
 class SettingFragment : PreferenceFragment(), OnSharedPreferenceChangeListener, Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener {
     override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
-        val newValueStr = newValue.toString()
-        if (preference.key.contentEquals(getString(R.string.key_setting_text_size))) {
-            if (TextUtils.isDigitsOnly(newValueStr)) {
-                return true
-            } else {
-                Application.toast(R.string.error_setting_text_size_not_number)
-            }
-            return false
-        } else if (preference.key.contentEquals(getString(R.string.key_setting_theme))) {
+        if (preference.key.contentEquals(getString(R.string.key_setting_theme))) {
             Application.toast(R.string.notice_theme_changed)
         }
         return true
@@ -54,9 +44,6 @@ class SettingFragment : PreferenceFragment(), OnSharedPreferenceChangeListener,
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         addPreferencesFromResource(R.xml.setting)
-        val textSizePreference = findPreference(R.string.key_setting_text_size) as EditTextPreference
-        textSizePreference.summary = textSizePreference.text
-        textSizePreference.onPreferenceChangeListener = this
         val themePreference = findPreference(R.string.key_setting_theme) as ListPreference
         themePreference.summary = themePreference.entry
         themePreference.onPreferenceChangeListener = this
@@ -96,8 +83,6 @@ class SettingFragment : PreferenceFragment(), OnSharedPreferenceChangeListener,
     }
 
     private fun setSummaryCurrentValue() {
-        val textSizePreference = findPreference(R.string.key_setting_text_size) as EditTextPreference
-        textSizePreference.summary = textSizePreference.text
         val themePreference = findPreference(R.string.key_setting_theme) as ListPreference
         themePreference.summary = themePreference.entry
     }
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 cb1fd60e..7e89f2e0 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/ToggleableImageButton.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/ToggleableImageButton.kt
@@ -2,10 +2,8 @@ package net.lacolaco.smileessence.view
 
 import android.content.Context
 import android.graphics.drawable.Drawable
-import android.support.v7.widget.AppCompatButton
 import android.support.v7.widget.AppCompatImageButton
 import android.util.AttributeSet
-import android.widget.ImageButton
 import net.lacolaco.smileessence.R
 
 class ToggleableImageButton @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = android.R.attr.imageButtonStyle) : AppCompatImageButton(context, attrs, defStyleAttr) {
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 b38bf25e..4312c696 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
@@ -8,7 +8,6 @@ import net.lacolaco.smileessence.R
 import net.lacolaco.smileessence.World
 import net.lacolaco.smileessence.data.ImageCache
 import net.lacolaco.smileessence.entity.Event
-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
@@ -21,14 +20,9 @@ class EventListAdapter(private val world: World, private val activity: Activity)
         val view = convertView ?: activity.layoutInflater.inflate(R.layout.list_item_status, parent, false)
         val event = getItem(position)
 
-        val textSize = UserPreferenceHelper.instance.textSize
-
         view.imageview_status_icon.setImageUrl(event.source.profileImageUrl, ImageCache.getImageLoader())
         view.textview_status_header.text = event.formattedString
-        view.textview_status_header.textSize = textSize.toFloat()
-        view.textview_status_text.textSize = textSize.toFloat()
         view.textview_status_text.text = event.targetObject?.text ?: ""
-        view.textview_status_footer.textSize = (textSize - 2).toFloat()
         view.textview_status_footer.text = StringUtils.dateToString(event.createdAt)
         view.imageview_status_favorited.visibility = View.GONE
         view.setOnClickListener {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/adapter/PageListAdapter.kt b/app/src/main/java/net/lacolaco/smileessence/view/adapter/PageListAdapter.kt
index 452eb3f6..9589ffef 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/adapter/PageListAdapter.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/adapter/PageListAdapter.kt
@@ -21,7 +21,8 @@ class PageListAdapter(_activity: MainActivity) : PagerAdapter() {
     private val pages = ArrayList<PageInfo>()
     private val fragmentCache = HashMap<Int, WeakReference<PageFragment>>()
 
-    @Synchronized fun getItem(position: Int): PageFragment {
+    @Synchronized
+    fun getItem(position: Int): PageFragment {
         val pf: PageFragment
         val info = pages[position]
         try {
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 4c34f82c..58e26cc0 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
@@ -14,7 +14,6 @@ import net.lacolaco.smileessence.command.CommandAddHashtag
 import net.lacolaco.smileessence.command.CommandOpenURL
 import net.lacolaco.smileessence.command.CommandOpenUserDetail
 import net.lacolaco.smileessence.entity.DirectMessage
-import net.lacolaco.smileessence.preference.UserPreferenceHelper
 import net.lacolaco.smileessence.twitter.TwitterTaskException
 import net.lacolaco.smileessence.twitter.task.destroyMessageAsync
 import net.lacolaco.smileessence.util.SystemServiceHelper
@@ -99,7 +98,6 @@ class MessageDetailDialogFragment : StackableDialogFragment() {
             val adapter = object : UnorderedCustomListAdapter<Command>(commands) {
                 override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
                     val itemView = convertView ?: activity.layoutInflater.inflate(R.layout.menu_item_simple_text, parent, false)
-                    itemView.list_item_textview.textSize = UserPreferenceHelper.instance.textSize.toFloat()
                     itemView.list_item_textview.text = getItem(position).text
                     return itemView
                 }
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.kt
index 3869a3d7..97134ce4 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.kt
@@ -14,7 +14,6 @@ import net.lacolaco.smileessence.command.CommandAddHashtag
 import net.lacolaco.smileessence.command.CommandOpenURL
 import net.lacolaco.smileessence.command.CommandOpenUserDetail
 import net.lacolaco.smileessence.entity.Tweet
-import net.lacolaco.smileessence.preference.UserPreferenceHelper
 import net.lacolaco.smileessence.twitter.TwitterTaskException
 import net.lacolaco.smileessence.twitter.task.*
 import net.lacolaco.smileessence.util.*
@@ -223,7 +222,6 @@ class StatusDetailDialogFragment : StackableDialogFragment() {
             val adapter = object : UnorderedCustomListAdapter<Command>(commands) {
                 override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
                     val itemView = convertView ?: activity.layoutInflater.inflate(R.layout.menu_item_simple_text, parent, false)
-                    itemView.list_item_textview.textSize = UserPreferenceHelper.instance.textSize.toFloat()
                     itemView.list_item_textview.text = getItem(position).text
                     return itemView
                 }
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/preference/IntegerEditTextPreference.kt b/app/src/main/java/net/lacolaco/smileessence/view/preference/IntegerEditTextPreference.kt
deleted file mode 100644
index e6a23696..00000000
--- a/app/src/main/java/net/lacolaco/smileessence/view/preference/IntegerEditTextPreference.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-
-class IntegerEditTextPreference : EditTextPreference {
-    constructor(context: Context) : super(context)
-
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes)
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
-
-    override fun persistString(value: String): Boolean {
-        return persistInt(Integer.valueOf(value)!!)
-    }
-
-    override fun getPersistedString(defaultReturnValue: String?): String {
-        return getPersistedInt(-1).toString()
-    }
-}
diff --git a/app/src/main/res/layout/list_item_status.xml b/app/src/main/res/layout/list_item_status.xml
index f86c19b1..f5f2d75b 100644
--- a/app/src/main/res/layout/list_item_status.xml
+++ b/app/src/main/res/layout/list_item_status.xml
@@ -22,6 +22,7 @@
         android:layout_marginLeft="5dp"
         android:layout_toRightOf="@+id/imageview_status_icon"
         android:gravity="top"
+        android:textSize="@dimen/status_text_size"
         android:textColor="?attr/color_status_text_header" />
 
     <TextView
@@ -33,6 +34,7 @@
         android:layout_below="@+id/textview_status_header"
         android:layout_marginBottom="3dp"
         android:layout_marginTop="1dp"
+        android:textSize="@dimen/status_text_size"
         android:textColor="?attr/color_status_text_normal" />
 
     <TextView
@@ -42,6 +44,7 @@
         android:layout_alignLeft="@+id/textview_status_text"
         android:layout_below="@+id/textview_status_text"
         android:layout_marginRight="2dp"
+        android:textSize="@dimen/status_meta_text_size"
         android:textColor="?attr/color_status_text_footer" />
 
     <ImageView
diff --git a/app/src/main/res/layout/menu_item_simple_text.xml b/app/src/main/res/layout/menu_item_simple_text.xml
index 0c7890d5..a8d920ab 100644
--- a/app/src/main/res/layout/menu_item_simple_text.xml
+++ b/app/src/main/res/layout/menu_item_simple_text.xml
@@ -11,5 +11,5 @@
         android:layout_marginBottom="10dp"
         android:layout_marginTop="10dp"
         android:paddingLeft="10dp"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
+        android:textSize="@dimen/status_text_size" />
 </FrameLayout>
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
new file mode 100644
index 00000000..cdf1de98
--- /dev/null
+++ b/app/src/main/res/values/dimen.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_text_size">11sp</dimen>
+    <dimen name="status_meta_text_size">9sp</dimen>
+</resources>
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index e17ba426..1f71fb27 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -1,5 +1,4 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="key_setting_text_size">textSize</string>
     <string name="key_setting_theme">theme</string>
     <string name="key_setting_application_information">appInfo</string>
     <string name="key_setting_licenses">licenseNotice</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d15d7e8d..02958e7c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -27,9 +27,6 @@
     <string name="actionbar_edit_extraction">Edit extraction</string>
     <string name="setting_category_display_title">Display Setting</string>
     <string name="setting_category_display_summary">Enable at next launch.</string>
-    <string name="setting_text_size_title">Text size</string>
-    <string name="setting_text_size_dialog_title">Edit text tize</string>
-    <string name="setting_text_size_dialog_message">Set a value between 8\-24</string>
     <string name="setting_theme_title">Theme</string>
     <string name="setting_theme_dialog_title">Choose theme</string>
     <string name="setting_category_system_title">System Setting</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 62286a83..6bc06af3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,4 +1,5 @@
 <resources>
+
     <style name="theme_dark" parent="Theme.AppCompat.NoActionBar">
         <item name="android:colorBackground">@color/md_grey_900</item>
         <item name="android:windowBackground">@color/md_grey_900</item>
diff --git a/app/src/main/res/xml/setting.xml b/app/src/main/res/xml/setting.xml
index 2ba59865..f01a4bd5 100644
--- a/app/src/main/res/xml/setting.xml
+++ b/app/src/main/res/xml/setting.xml
@@ -2,14 +2,6 @@
     <PreferenceCategory
         android:summary="@string/setting_category_display_summary"
         android:title="@string/setting_category_display_title">
-        <net.lacolaco.smileessence.view.preference.IntegerEditTextPreference
-            android:defaultValue="10"
-            android:dialogMessage="@string/setting_text_size_dialog_message"
-            android:dialogTitle="@string/setting_text_size_dialog_title"
-            android:key="@string/key_setting_text_size"
-            android:maxLength="2"
-            android:numeric="decimal"
-            android:title="@string/setting_text_size_title" />
         <net.lacolaco.smileessence.view.preference.IntegerListPreference
             android:defaultValue="0"
             android:dialogTitle="@string/setting_theme_dialog_title"