From ba944c09f0c74903e1a776cece838bdd834bdf80 Mon Sep 17 00:00:00 2001
From: Mariotaku Lee <mariotaku.lee@gmail.com>
Date: Sat, 21 Jan 2017 14:45:36 +0800
Subject: [PATCH] trying to fix memory leaks improved some EditText styles

---
 .../fragment/AccountsDashboardFragment.kt     | 11 +++---
 .../res/layout/dialog_edit_user_nickname.xml  |  5 ++-
 .../layout/dialog_status_quote_retweet.xml    | 35 +++++++++++--------
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt
index 8fbedd7ce..4f858a04f 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt
@@ -78,6 +78,7 @@ import org.mariotaku.twidere.provider.TwidereDataStore.Drafts
 import org.mariotaku.twidere.util.*
 import org.mariotaku.twidere.util.KeyboardShortcutsHandler.KeyboardShortcutCallback
 import org.mariotaku.twidere.view.ShapedImageView
+import java.lang.ref.WeakReference
 import java.util.*
 
 class AccountsDashboardFragment : BaseFragment(), LoaderCallbacks<AccountsInfo>,
@@ -762,23 +763,23 @@ class AccountsDashboardFragment : BaseFragment(), LoaderCallbacks<AccountsInfo>,
          * Handles a request to start the Loader.
          */
         override fun onStartLoading() {
-
+            val weakLoader = WeakReference(this)
             // Start watching for changes in the app data.
             if (contentObserver == null) {
-                contentObserver = object : ContentObserver(Handler(Looper.getMainLooper())) {
+                contentObserver = object : ContentObserver(null) {
                     override fun onChange(selfChange: Boolean) {
-                        onContentChanged()
+                        weakLoader.get()?.onContentChanged()
                     }
 
                     override fun onChange(selfChange: Boolean, uri: Uri?) {
-                        onContentChanged()
+                        weakLoader.get()?.onContentChanged()
                     }
                 }
                 context.contentResolver.registerContentObserver(Drafts.CONTENT_URI, true, contentObserver)
             }
             if (accountListener == null) {
                 accountListener = OnAccountsUpdateListener {
-                    onContentChanged()
+                    weakLoader.get()?.onContentChanged()
                 }
                 AccountManager.get(context).addOnAccountsUpdatedListenerSafe(accountListener!!, updateImmediately = false)
             }
diff --git a/twidere/src/main/res/layout/dialog_edit_user_nickname.xml b/twidere/src/main/res/layout/dialog_edit_user_nickname.xml
index 1807b8db4..9cea7107b 100644
--- a/twidere/src/main/res/layout/dialog_edit_user_nickname.xml
+++ b/twidere/src/main/res/layout/dialog_edit_user_nickname.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="@dimen/element_spacing_normal">
@@ -10,6 +11,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:inputType="text|textPersonName"
-        android:maxLines="1"/>
+        android:maxLines="1"
+        android:textColor="?colorAccent"
+        tools:text="Nickname" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/twidere/src/main/res/layout/dialog_status_quote_retweet.xml b/twidere/src/main/res/layout/dialog_status_quote_retweet.xml
index 707b55f99..68d0d2976 100644
--- a/twidere/src/main/res/layout/dialog_status_quote_retweet.xml
+++ b/twidere/src/main/res/layout/dialog_status_quote_retweet.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
   ~ Twidere - Twitter client for Android
   ~
   ~  Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
@@ -17,15 +19,17 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<ScrollView android:id="@+id/status_container"
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:tools="http://schemas.android.com/tools"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:paddingBottom="@dimen/element_spacing_normal"
-            android:paddingLeft="@dimen/element_spacing_large"
-            android:paddingRight="@dimen/element_spacing_large"
-            android:paddingTop="@dimen/element_spacing_normal">
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/status_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/element_spacing_normal"
+    android:paddingLeft="@dimen/element_spacing_large"
+    android:paddingRight="@dimen/element_spacing_large"
+    android:paddingTop="@dimen/element_spacing_normal">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -45,9 +49,10 @@
                 android:focusable="true"
                 android:hint="@string/comment_hint"
                 android:inputType="textMultiLine|textLongMessage|textCapSentences"
-                android:visibility="visible">
+                android:visibility="visible"
+                app:backgroundTint="?colorAccent">
 
-                <requestFocus/>
+                <requestFocus />
             </org.mariotaku.twidere.view.ComposeEditText>
 
             <org.mariotaku.twidere.view.StatusTextCountView
@@ -64,7 +69,7 @@
                 android:gravity="center_vertical|start"
                 android:paddingLeft="@dimen/element_spacing_normal"
                 android:paddingRight="@dimen/element_spacing_normal"
-                tools:text="140"/>
+                tools:text="140" />
 
             <org.mariotaku.twidere.view.IconActionButton
                 android:id="@+id/comment_menu"
@@ -76,10 +81,10 @@
                 android:layout_below="@+id/edit_comment"
                 android:color="?android:textColorTertiary"
                 android:focusable="false"
-                android:src="@drawable/ic_action_more_vertical"/>
+                android:src="@drawable/ic_action_more_vertical" />
         </RelativeLayout>
 
-        <include layout="@layout/list_item_status"/>
+        <include layout="@layout/list_item_status" />
     </LinearLayout>
 
 </ScrollView>
\ No newline at end of file