upup

20 files changed, 136 insertions, 253 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1e41fa5d..362f4a07 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,7 +11,6 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:supportsRtl="false"
         android:theme="@style/AppTheme.Light">
         <activity
             android:name=".activity.ManageProfilesActivity"
@@ -92,13 +91,6 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.SettingActivity"
-            android:configChanges="keyboardHidden|orientation"
-            android:excludeFromRecents="true"
-            android:label="@string/activity_setting"
-            android:launchMode="singleTask"
-            android:parentActivityName=".activity.MainActivity" />
-        <activity
             android:name=".activity.EditExtractionActivity"
             android:configChanges="keyboardHidden|orientation"
             android:excludeFromRecents="true"
@@ -106,10 +98,6 @@
             android:launchMode="singleTask"
             android:parentActivityName=".activity.MainActivity" />
         <activity
-            android:name=".activity.LicenseActivity"
-            android:label="@string/activity_licenses"
-            android:parentActivityName=".activity.SettingActivity" />
-        <activity
             android:name=".activity.OAuthActivity"
             android:configChanges="keyboardHidden|orientation"
             android:excludeFromRecents="false"
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.kt
deleted file mode 100644
index cf37e5c4..00000000
--- a/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package net.lacolaco.smileessence.activity
-
-import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-import kotlinx.android.synthetic.main.layout_license.*
-import net.lacolaco.smileessence.R
-
-class LicenseActivity : AppCompatActivity() {
-    public override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.layout_license)
-        setSupportActionBar(toolbar)
-        web_view.loadUrl("file:///android_asset/licenses.html")
-    }
-}
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
index 407c75fa..26f283ed 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
@@ -30,6 +30,7 @@ import net.lacolaco.smileessence.util.launchUi
 import net.lacolaco.smileessence.view.DialogHelper
 import net.lacolaco.smileessence.view.MainFragmentPagerAdapter
 import net.lacolaco.smileessence.view.confirm
+import net.lacolaco.smileessence.view.dialog.AppInfoDialogFragment
 import net.lacolaco.smileessence.view.dialog.StatusDetailDialogFragment
 import net.lacolaco.smileessence.view.dialog.UserDetailDialogFragment
 import net.lacolaco.smileessence.view.page.ComposePageFragment
@@ -270,13 +271,13 @@ class MainActivity : AppCompatActivity() {
                 intent.putExtra(ManageProfilesActivity.INTENT_KEY_NOINIT, true)
                 startActivity(intent)
             }
-            R.id.actionbar_setting -> startActivity(Intent(this, SettingActivity::class.java))
             R.id.actionbar_manage_pages -> {
                 val intent = Intent(this, ManagePagesActivity::class.java)
                 intent.putExtra(ManagePagesActivity.INTENT_KEY_WORLD_ID, world.id)
                 startActivityForResult(intent, REQUEST_CODE_MANAGE_PAGES)
             }
             R.id.actionbar_aclog -> browse(world.user.aclogTimelineURL)
+            R.id.open_version_dialog -> DialogHelper.showDialog(this, AppInfoDialogFragment.newInstance())
             else -> return super.onOptionsItemSelected(item)
         }
         return true
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/SettingActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/SettingActivity.kt
deleted file mode 100644
index 47f44dd0..00000000
--- a/app/src/main/java/net/lacolaco/smileessence/activity/SettingActivity.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package net.lacolaco.smileessence.activity
-
-import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-import android.view.MenuItem
-import kotlinx.android.synthetic.main.layout_setting.*
-import net.lacolaco.smileessence.R
-
-class SettingActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.layout_setting)
-        setSupportActionBar(toolbar)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            android.R.id.home -> {
-                finish()
-                return true
-            }
-        }
-        return true
-    }
-}
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.kt
deleted file mode 100644
index f7c06fcb..00000000
--- a/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package net.lacolaco.smileessence.view
-
-import android.content.Intent
-import android.os.Bundle
-import android.preference.Preference
-import android.preference.PreferenceFragment
-import android.support.v7.app.AlertDialog
-import kotlinx.android.synthetic.main.dialog_app_info.view.*
-import net.lacolaco.smileessence.BuildConfig
-import net.lacolaco.smileessence.R
-import net.lacolaco.smileessence.activity.LicenseActivity
-
-class SettingFragment : PreferenceFragment(), Preference.OnPreferenceClickListener {
-    override fun onPreferenceClick(preference: Preference): Boolean {
-        val key = preference.key
-        if (key.contentEquals(getString(R.string.key_setting_application_information))) {
-            openAppInfoDialog()
-        } else if (key.contentEquals(getString(R.string.key_setting_licenses)))
-            activity.startActivity(Intent(activity, LicenseActivity::class.java))
-        return true
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        addPreferencesFromResource(R.xml.setting)
-        val appInfoPreference = findPreference(R.string.key_setting_application_information)
-        appInfoPreference.onPreferenceClickListener = this
-        appInfoPreference.summary = BuildConfig.VERSION_NAME + " (" + BuildConfig.VERSION_CODE + ")"
-        val license = findPreference(R.string.key_setting_licenses)
-        license.onPreferenceClickListener = this
-    }
-
-    private fun findPreference(preferenceResID: Int): Preference {
-        return findPreference(getString(preferenceResID))
-    }
-
-    private fun openAppInfoDialog() {
-        val inflater = activity.layoutInflater
-        val contentView = inflater.inflate(R.layout.dialog_app_info, null)
-        contentView.versionTextView.text = BuildConfig.VERSION_NAME + " (rev: " + BuildConfig.VERSION_CODE + "; upstream: " + getString(R.string.app_version_full) + ")"
-
-        AlertDialog.Builder(activity)
-                .setView(contentView)
-                .show()
-    }
-}
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/AppInfoDialogFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/dialog/AppInfoDialogFragment.kt
new file mode 100644
index 00000000..4ebd69f7
--- /dev/null
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/AppInfoDialogFragment.kt
@@ -0,0 +1,27 @@
+package net.lacolaco.smileessence.view.dialog
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import kotlinx.android.synthetic.main.dialog_app_info.*
+import net.lacolaco.smileessence.BuildConfig
+import net.lacolaco.smileessence.R
+
+class AppInfoDialogFragment : StackableDialogFragment() {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        return inflater.inflate(R.layout.dialog_app_info, container, false)
+    }
+
+    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        application_version.text = "${BuildConfig.VERSION_NAME} (revision ${BuildConfig.VERSION_CODE})"
+        web_view.loadUrl("file:///android_asset/licenses.html")
+    }
+
+    companion object {
+        fun newInstance(): AppInfoDialogFragment {
+            return AppInfoDialogFragment()
+        }
+    }
+}
diff --git a/app/src/main/res/layout/dialog_app_info.xml b/app/src/main/res/layout/dialog_app_info.xml
index 1a4da136..c7ba7b20 100644
--- a/app/src/main/res/layout/dialog_app_info.xml
+++ b/app/src/main/res/layout/dialog_app_info.xml
@@ -1,75 +1,80 @@
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout 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="wrap_content"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="10dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:orientation="horizontal"
-            android:paddingBottom="15dp">
+    <ImageView
+        android:id="@+id/application_icon"
+        android:layout_width="96dp"
+        android:layout_height="96dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:src="@mipmap/ic_launcher"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageView
-                android:layout_width="80dp"
-                android:layout_height="80dp"
-                android:layout_gravity="center_vertical"
-                android:src="@mipmap/ic_launcher" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="vertical"
-                android:padding="10dp">
+    <TextView
+        android:id="@+id/application_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:text="@string/app_name"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toTopOf="@+id/application_version"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/application_icon"
+        app:layout_constraintTop_toTopOf="parent" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/app_name"
-                    android:textSize="20sp" />
+    <TextView
+        android:id="@+id/application_version"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:text="!!!VERSION STRING!!!"
+        android:textSize="16sp"
+        app:layout_constraintBottom_toTopOf="@+id/barrier"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/application_icon"
+        app:layout_constraintTop_toBottomOf="@+id/application_name" />
 
-                <TextView
-                    android:id="@+id/versionTextView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/app_version_full"
-                    android:textSize="16sp" />
+    <android.support.constraint.Barrier
+        android:id="@+id/barrier"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:barrierDirection="bottom"
+        app:constraint_referenced_ids="application_icon,application_version,application_name" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/app_author"
-                    android:textSize="16sp" />
+    <TextView
+        android:id="@+id/copyright_notices_label"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:labelFor="@+id/web_view"
+        android:text="Copyright notices for third-party libraries:"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/barrier" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:autoLink="web"
-                    android:text="@string/app_url"
-                    android:textSize="12sp" />
-            </LinearLayout>
-        </LinearLayout>
+    <WebView
+        android:id="@+id/web_view"
+        android:layout_width="0dp"
+        android:layout_height="300dp"
+        android:layout_marginBottom="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/copyright_notices_label" />
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:text="@string/app_thanks_to"
-            android:textSize="16sp"
-            android:textStyle="bold" />
+</android.support.constraint.ConstraintLayout>
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:text="@string/thanks_to"
-            android:textSize="16sp" />
-    </LinearLayout>
-</ScrollView>
diff --git a/app/src/main/res/layout/dialog_send_message.xml b/app/src/main/res/layout/dialog_send_message.xml
index 20df5d99..032154ca 100644
--- a/app/src/main/res/layout/dialog_send_message.xml
+++ b/app/src/main/res/layout/dialog_send_message.xml
@@ -14,7 +14,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="1px"
-        android:background="?attr/color_list_divider" />
+        android:background="?attr/app_divider" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_status_detail.xml b/app/src/main/res/layout/dialog_status_detail.xml
index 2ba8f766..b88d9927 100644
--- a/app/src/main/res/layout/dialog_status_detail.xml
+++ b/app/src/main/res/layout/dialog_status_detail.xml
@@ -15,8 +15,8 @@
         <FrameLayout
             android:id="@+id/detail_dialog_divider_top"
             android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="?attr/color_list_divider" />
+            android:layout_height="1dp"
+            android:background="?attr/app_divider" />
 
         <include
             android:id="@+id/layout_status_header"
@@ -75,8 +75,8 @@
         <FrameLayout
             android:id="@+id/detail_dialog_divider_bottom"
             android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="?attr/color_list_divider" />
+            android:layout_height="1dp"
+            android:background="?app_divider" />
 
         <net.lacolaco.smileessence.view.ExpandedListView
             android:id="@+id/listview_status_detail_menu"
diff --git a/app/src/main/res/layout/dialog_talk_list.xml b/app/src/main/res/layout/dialog_talk_list.xml
index c91d7835..d4ba5884 100644
--- a/app/src/main/res/layout/dialog_talk_list.xml
+++ b/app/src/main/res/layout/dialog_talk_list.xml
@@ -6,7 +6,7 @@
         android:id="@+id/listview_dialog_talk_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:divider="?attr/color_list_divider"
+        android:divider="?attr/app_divider"
         android:dividerHeight="1px"
         android:fastScrollEnabled="true"
         android:overScrollMode="never" />
diff --git a/app/src/main/res/layout/dialog_user_detail.xml b/app/src/main/res/layout/dialog_user_detail.xml
index 645740db..3aeb09ab 100644
--- a/app/src/main/res/layout/dialog_user_detail.xml
+++ b/app/src/main/res/layout/dialog_user_detail.xml
@@ -122,7 +122,7 @@
                     <FrameLayout
                         android:layout_width="fill_parent"
                         android:layout_height="1px"
-                        android:background="?attr/color_list_divider" />
+                        android:background="?attr/app_divider" />
 
                     <TableLayout
                         android:layout_width="match_parent"
@@ -215,7 +215,7 @@
                         android:layout_width="fill_parent"
                         android:layout_height="1px"
                         android:layout_marginTop="5dp"
-                        android:background="?attr/color_list_divider" />
+                        android:background="?attr/app_divider" />
 
                     <RelativeLayout
                         android:layout_width="match_parent"
@@ -265,7 +265,7 @@
                     <FrameLayout
                         android:layout_width="fill_parent"
                         android:layout_height="1px"
-                        android:background="?attr/color_list_divider" />
+                        android:background="?attr/app_divider" />
 
                     <TextView
                         android:id="@+id/textview_user_detail_description"
@@ -290,7 +290,7 @@
                     android:id="@+id/listview_user_detail_timeline"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:divider="?attr/color_list_divider"
+                    android:divider="?attr/app_divider"
                     android:dividerHeight="1px"
                     android:fastScrollEnabled="true"
                     android:overScrollMode="never" />
diff --git a/app/src/main/res/layout/layout_license.xml b/app/src/main/res/layout/layout_license.xml
deleted file mode 100644
index 0ad86e59..00000000
--- a/app/src/main/res/layout/layout_license.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:elevation="4dp" />
-
-    <WebView
-        android:id="@+id/web_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/layout_setting.xml b/app/src/main/res/layout/layout_setting.xml
deleted file mode 100644
index 51ef6f20..00000000
--- a/app/src/main/res/layout/layout_setting.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:elevation="4dp" />
-
-    <fragment
-        android:id="@+id/fragment_setting"
-        android:name="net.lacolaco.smileessence.view.SettingFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/list_item_status.xml b/app/src/main/res/layout/list_item_status.xml
index be6b89d1..50a92f88 100644
--- a/app/src/main/res/layout/list_item_status.xml
+++ b/app/src/main/res/layout/list_item_status.xml
@@ -48,9 +48,9 @@
         android:text="!!!NAME!!!"
         android:textColor="?attr/color_status_text_header"
         android:textSize="@dimen/status_text_size"
+        app:layout_constraintBottom_toBottomOf="@+id/textview_status_header_username"
         app:layout_constraintStart_toEndOf="@+id/textview_status_header_username"
-        app:layout_constraintTop_toTopOf="@+id/textview_status_header_username"
-        app:layout_constraintBottom_toBottomOf="@+id/textview_status_header_username" />
+        app:layout_constraintTop_toTopOf="@+id/textview_status_header_username" />
 
     <TextView
         android:id="@+id/textview_status_footer"
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index a15c6660..94cdcd05 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -1,10 +1,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:id="@+id/actionbar_setting"
-        android:title="@string/actionbar_setting"
-        app:showAsAction="never" />
-    <item
         android:id="@+id/actionbar_manage_pages"
         android:title="Manage pages"
         app:showAsAction="never" />
@@ -12,4 +8,10 @@
         android:id="@+id/actionbar_aclog"
         android:title="@string/actionbar_aclog"
         app:showAsAction="never" />
+    <group>
+        <item
+            android:id="@+id/open_version_dialog"
+            android:title="About the application"
+            app:showAsAction="never" />
+    </group>
 </menu>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 7fc3cf01..bcb60c7e 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,10 +1,10 @@
 <resources>
+    <attr name="app_divider" format="color" />
     <attr name="status_item_background" format="reference" />
     <attr name="color_status_text_header" format="color" />
     <attr name="color_status_text_normal" format="color" />
     <attr name="color_status_text_footer" format="color" />
     <attr name="color_status_text_mine" format="color" />
-    <attr name="color_list_divider" format="color" />
     <attr name="color_message_text_header" format="color" />
     <attr name="color_nonactivatable" format="reference" />
     <attr name="color_orange_activatable" format="reference" />
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
deleted file mode 100644
index 9da6f6bd..00000000
--- a/app/src/main/res/values/keys.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="key_setting_application_information">appInfo</string>
-    <string name="key_setting_licenses">licenseNotice</string>
-</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3501f75f..799d2246 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,14 +1,7 @@
 <resources>
     <string name="app_name">SE4</string>
-    <string name="app_version_full">1.0.11 \"Dolphin\"</string>
-    <string name="app_url">http://smileessence.lacolaco.net</string>
-    <string name="app_author">Developed by laco0416</string>
-    <string name="app_thanks_to">Thanks to</string>
-    <string name="thanks_to">miz_hi, yaplus, firstspring1845, ahiru3net, unyuho123, karno, ret156, vividtomato_, hoyo203, brsywe, NTTrf, mikamikafever</string>
-    <string name="activity_setting">App Setting</string>
     <string name="activity_edit_extraction">Extraction Setting</string>
     <string name="activity_authenticate">Authenticate</string>
-    <string name="activity_licenses">Open Source Licenses</string>
     <string name="intent_post">Tweet</string>
     <string name="message_oauth_text">Please get PIN code at a URL below, and input it.</string>
     <string name="message_oauth_hint">PIN code</string>
@@ -22,13 +15,7 @@
     <string name="page_name_history">History</string>
     <string name="page_name_search">Search</string>
     <string name="page_name_list">List</string>
-    <string name="actionbar_setting">Settings</string>
     <string name="actionbar_aclog">Aclog</string>
-    <string name="setting_category_system_title">System Setting</string>
-    <string name="setting_category_about_title">About</string>
-    <string name="setting_application_information_title">Application information</string>
-    <string name="setting_licenses_title">Licenses</string>
-    <string name="error_setting_text_size_not_number">Given value is not number</string>
     <string name="error_intent_status_cannot_load">Failed to get tweet</string>
     <string name="alert_dialog_ok">OK</string>
     <string name="alert_dialog_cancel">Cancel</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9b15c6cb..b6dd01a2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,19 +1,22 @@
 <resources>
 
     <style name="AppTheme.Dark" parent="Theme.AppCompat.NoActionBar">
-        <item name="dialogTheme">@style/AppTheme.Dialog</item>
-
-        <item name="android:colorBackground">@color/md_grey_900</item>
+        <!-- Override defaults -->
+        <!--<item name="android:colorBackground">@color/md_grey_900</item>
         <item name="android:windowBackground">@color/md_grey_900</item>
         <item name="colorBackgroundFloating">@color/md_grey_850</item>
         <item name="colorAccent">@color/md_blue_A200</item>
-        <item name="colorPrimary">@color/md_purple_400</item>
+        <item name="colorPrimary">@color/md_brown_500</item>
+        <item name="colorPrimaryDark">@color/md_brown_700</item>-->
+        <item name="dialogTheme">@style/AppTheme.Dialog</item>
+
+        <!-- Application specific styles -->
+        <item name="app_divider">#1fffffff</item>
 
         <item name="color_status_text_header">@color/md_green_700</item>
         <item name="color_status_text_normal">#ffffffff</item>
         <item name="color_status_text_footer">#7fffffff</item>
         <item name="color_status_text_mine">@color/md_amber_700</item>
-        <item name="color_list_divider">#1fffffff</item>
         <item name="color_message_text_header">#ff9800</item>
 
         <item name="color_nonactivatable">@color/color_nonactivatable</item>
@@ -24,13 +27,17 @@
     </style>
 
     <style name="AppTheme.Light" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- Override defaults -->
         <item name="dialogTheme">@style/AppTheme.Dialog</item>
 
-        <item name="color_status_text_header">@color/dark_green</item>
-        <item name="color_status_text_normal">@color/gray_dark</item>
-        <item name="color_status_text_footer">@color/gray_dark_light</item>
+        <!-- Application specific styles -->
+        <item name="app_divider">#1f000000</item>
+
+
+        <item name="color_status_text_header">@color/md_green_800</item>
+        <item name="color_status_text_normal">#de000000</item>
+        <item name="color_status_text_footer">#7f000000</item>
         <item name="color_status_text_mine">@color/dark_blue</item>
-        <item name="color_list_divider">#1f000000</item>
         <item name="color_message_text_header">@color/orange</item>
 
         <item name="color_nonactivatable">@color/color_nonactivatable_light</item>
@@ -40,6 +47,7 @@
         <item name="status_item_background">@drawable/tweet_background_light</item>
     </style>
 
+    <!-- Enforce minimum width of Dialog, just as in AlertDialog -->
     <style name="AppTheme.Dialog" parent="ThemeOverlay.AppCompat.Dialog">
         <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
         <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
diff --git a/app/src/main/res/xml/setting.xml b/app/src/main/res/xml/setting.xml
deleted file mode 100644
index c616ae85..00000000
--- a/app/src/main/res/xml/setting.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/setting_category_about_title">
-        <Preference
-            android:key="@string/key_setting_application_information"
-            android:title="@string/setting_application_information_title" />
-        <Preference
-            android:key="@string/key_setting_licenses"
-            android:title="@string/setting_licenses_title" />
-    </PreferenceCategory>
-</PreferenceScreen>