Merge branch 'develop'

tuskyapp · Feb 23, 2021 · cf6e8bd · cf6e8bd
2 parents 1e0b93e + 09317d9
commit cf6e8bd
Show file tree

Hide file tree

Showing 29 changed files with 733 additions and 86 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -20,8 +20,8 @@ android {
         applicationId APP_ID
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 79
-        versionName "14.0 beta 1"
+        versionCode 80
+        versionName "14.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
 

diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
@@ -568,11 +568,12 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
                 subscribing = relation.subscribing
         }
 
+        // remove the listener so it doesn't fire on non-user changes
+        accountNoteTextInputLayout.editText?.removeTextChangedListener(noteWatcher)
+
         accountNoteTextInputLayout.visible(relation.note != null)
         accountNoteTextInputLayout.editText?.setText(relation.note)
 
-        // add the listener late to avoid it firing on the first change
-        accountNoteTextInputLayout.editText?.removeTextChangedListener(noteWatcher)
         accountNoteTextInputLayout.editText?.addTextChangedListener(noteWatcher)
 
         updateButtons()
@@ -622,8 +623,10 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
 
         if(subscribing) {
             accountSubscribeButton.setIconResource(R.drawable.ic_notifications_active_24dp)
+            accountSubscribeButton.contentDescription = getString(R.string.action_unsubscribe_account)
         } else {
             accountSubscribeButton.setIconResource(R.drawable.ic_notifications_24dp)
+            accountSubscribeButton.contentDescription = getString(R.string.action_subscribe_account)
         }
     }
 
@@ -660,14 +663,6 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
         menuInflater.inflate(R.menu.account_toolbar, menu)
 
         if (!viewModel.isSelf) {
-            val follow = menu.findItem(R.id.action_follow)
-            follow.title = if (followState == FollowState.NOT_FOLLOWING) {
-                getString(R.string.action_follow)
-            } else {
-                getString(R.string.action_unfollow)
-            }
-
-            follow.isVisible = followState != FollowState.REQUESTED
 
             val block = menu.findItem(R.id.action_block)
             block.title = if (blocking) {
@@ -711,8 +706,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
             }
 
         } else {
-            // It shouldn't be possible to block, follow, mute or report yourself.
-            menu.removeItem(R.id.action_follow)
+            // It shouldn't be possible to block, mute or report yourself.
             menu.removeItem(R.id.action_block)
             menu.removeItem(R.id.action_mute)
             menu.removeItem(R.id.action_mute_domain)
@@ -804,21 +798,13 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.action_mention -> {
-                mention()
-                return true
-            }
             R.id.action_open_in_web -> {
                 // If the account isn't loaded yet, eat the input.
                 if (loadedAccount != null) {
                     LinkHelper.openLink(loadedAccount?.url, this)
                 }
                 return true
             }
-            R.id.action_follow -> {
-                viewModel.changeFollowState()
-                return true
-            }
             R.id.action_block -> {
                 toggleBlock()
                 return true

diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
@@ -694,16 +694,18 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
             .into(object : CustomTarget<Drawable>(navIconSize, navIconSize) {
 
                 override fun onLoadStarted(placeholder: Drawable?) {
-                    if(placeholder != null) {
+                    if (placeholder != null) {
                         mainToolbar.navigationIcon = FixedSizeDrawable(placeholder, navIconSize, navIconSize)
                     }
                 }
                 override fun onResourceReady(resource: Drawable, transition: Transition<in Drawable>?) {
-                    mainToolbar.navigationIcon = resource
+                    mainToolbar.navigationIcon = FixedSizeDrawable(resource, navIconSize, navIconSize)
                 }
 
                 override fun onLoadCleared(placeholder: Drawable?) {
-                    mainToolbar.navigationIcon = placeholder
+                    if (placeholder != null) {
+                        mainToolbar.navigationIcon = FixedSizeDrawable(placeholder, navIconSize, navIconSize)
+                    }
                 }
             })
     }

diff --git a/app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesActivity.kt
@@ -21,6 +21,7 @@ import android.content.SharedPreferences
 import android.os.Bundle
 import android.util.Log
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.commit
 import androidx.preference.PreferenceManager
 import com.keylesspalace.tusky.BaseActivity
 import com.keylesspalace.tusky.MainActivity
@@ -58,34 +59,37 @@ class PreferencesActivity : BaseActivity(), SharedPreferences.OnSharedPreference
             setDisplayShowHomeEnabled(true)
         }
 
-        val fragment: Fragment = when (intent.getIntExtra(EXTRA_PREFERENCE_TYPE, 0)) {
-            GENERAL_PREFERENCES -> {
-                setTitle(R.string.action_view_preferences)
-                PreferencesFragment.newInstance()
-            }
-            ACCOUNT_PREFERENCES -> {
-                setTitle(R.string.action_view_account_preferences)
-                AccountPreferencesFragment.newInstance()
-            }
-            NOTIFICATION_PREFERENCES -> {
-                setTitle(R.string.pref_title_edit_notification_settings)
-                NotificationPreferencesFragment.newInstance()
-            }
-            TAB_FILTER_PREFERENCES -> {
-                setTitle(R.string.pref_title_status_tabs)
-                TabFilterPreferencesFragment.newInstance()
-            }
-            PROXY_PREFERENCES -> {
-                setTitle(R.string.pref_title_http_proxy_settings)
-                ProxyPreferencesFragment.newInstance()
-            }
-            else -> throw IllegalArgumentException("preferenceType not known")
+        val fragmentTag = "preference_fragment_$EXTRA_PREFERENCE_TYPE"
+
+        val fragment: Fragment = supportFragmentManager.findFragmentByTag(fragmentTag)
+                ?: when (intent.getIntExtra(EXTRA_PREFERENCE_TYPE, 0)) {
+                    GENERAL_PREFERENCES -> {
+                        setTitle(R.string.action_view_preferences)
+                        PreferencesFragment.newInstance()
+                    }
+                    ACCOUNT_PREFERENCES -> {
+                        setTitle(R.string.action_view_account_preferences)
+                        AccountPreferencesFragment.newInstance()
+                    }
+                    NOTIFICATION_PREFERENCES -> {
+                        setTitle(R.string.pref_title_edit_notification_settings)
+                        NotificationPreferencesFragment.newInstance()
+                    }
+                    TAB_FILTER_PREFERENCES -> {
+                        setTitle(R.string.pref_title_status_tabs)
+                        TabFilterPreferencesFragment.newInstance()
+                    }
+                    PROXY_PREFERENCES -> {
+                        setTitle(R.string.pref_title_http_proxy_settings)
+                        ProxyPreferencesFragment.newInstance()
+                    }
+                    else -> throw IllegalArgumentException("preferenceType not known")
+                }
+
+        supportFragmentManager.commit {
+            replace(R.id.fragment_container, fragment, fragmentTag)
         }
 
-        supportFragmentManager.beginTransaction()
-                .replace(R.id.fragment_container, fragment)
-                .commit()
-
         restartActivitiesOnExit = intent.getBooleanExtra("restart", false)
 
     }

diff --git a/app/src/main/res/menu/account_toolbar.xml b/app/src/main/res/menu/account_toolbar.xml
@@ -2,18 +2,10 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item android:id="@+id/action_mention"
-        android:title="@string/action_mention"
-        app:showAsAction="never" />
-
     <item android:id="@+id/action_open_in_web"
         android:title="@string/action_open_in_web"
         app:showAsAction="never" />
 
-    <item android:id="@+id/action_follow"
-        android:title="@string/action_follow"
-        app:showAsAction="never" />
-
     <item android:id="@+id/action_mute"
         android:title="@string/action_mute"
         app:showAsAction="never" />