update manageprofiles

11 files changed, 50 insertions, 36 deletions

diff --git a/app/build.gradle b/app/build.gradle
index f7cbd737..0e9d112a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,7 +22,6 @@ android {
         println "- CODE: " + getVersionCode()
         println "- NAME: " + getVersionName()
         println "----------------------------"
-
     }
     buildTypes {
         debug {
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 7f054992..a43b9681 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
@@ -14,12 +14,12 @@ import android.view.Menu
 import android.view.MenuItem
 import kotlinx.android.synthetic.main.layout_main.*
 import net.lacolaco.smileessence.Application
+import net.lacolaco.smileessence.Logger
 import net.lacolaco.smileessence.R
 import net.lacolaco.smileessence.World
 import net.lacolaco.smileessence.data.PageInfo
 import net.lacolaco.smileessence.entity.Tweet
 import net.lacolaco.smileessence.entity.User
-import net.lacolaco.smileessence.Logger
 import net.lacolaco.smileessence.twitter.TwitterTaskException
 import net.lacolaco.smileessence.twitter.task.getTweetAsync
 import net.lacolaco.smileessence.twitter.task.getUserAsync
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/ManageProfilesActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/ManageProfilesActivity.kt
index 3c4c50c9..67fd768c 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/ManageProfilesActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/ManageProfilesActivity.kt
@@ -7,6 +7,7 @@ import android.graphics.Bitmap
 import android.graphics.Color
 import android.net.Uri
 import android.os.Bundle
+import android.support.design.widget.Snackbar
 import android.support.v13.app.ActivityCompat
 import android.support.v4.content.ContextCompat
 import android.support.v4.content.pm.ShortcutInfoCompat
@@ -16,11 +17,10 @@ import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.DividerItemDecoration
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
-import android.view.Menu
-import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
+import android.widget.Toast
 import com.android.volley.toolbox.ImageRequest
 import kotlinx.android.synthetic.main.activity_manage_profiles.*
 import kotlinx.android.synthetic.main.list_item_profile.view.*
@@ -62,6 +62,10 @@ class ManageProfilesActivity : AppCompatActivity() {
         profiles.layoutManager = LinearLayoutManager(this)
         adapter = ProfilesAdapter(World.all())
         profiles.adapter = adapter
+
+        fab.setOnClickListener {
+            startActivityForResult(Intent(this, OAuthActivity::class.java), REQUEST_OAUTH)
+        }
     }
 
     override fun onNewIntent(intent: Intent) {
@@ -78,7 +82,7 @@ class ManageProfilesActivity : AppCompatActivity() {
                         goToWorld(Application.currentWorld!!)
                     }
                 } else {
-                    Application.toast(R.string.notice_error_storage_permission)
+                    Toast.makeText(this, R.string.notice_error_storage_permission, Toast.LENGTH_LONG).show()
                     finish()
                 }
             }
@@ -93,22 +97,6 @@ class ManageProfilesActivity : AppCompatActivity() {
         startActivity(intent)
     }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        val add = menu.add(Menu.NONE, R.id.menu_edit_list_add, Menu.NONE, "")
-        add.setIcon(android.R.drawable.ic_menu_add)
-        add.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
-        return true
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.menu_edit_list_add ->
-                startActivityForResult(Intent(this, OAuthActivity::class.java), REQUEST_OAUTH)
-            else -> return super.onOptionsItemSelected(item)
-        }
-        return true
-    }
-
     override fun onBackPressed() {
         safeFinish()
     }
@@ -165,7 +153,9 @@ class ManageProfilesActivity : AppCompatActivity() {
             view.profile_action_menu.add("Remove") {
                 confirm(R.string.dialog_confirm_remove_profile, world.user.screenName) {
                     profiles.removeAt(position)
-                    notifyDataSetChanged()
+                    notifyItemRemoved(position)
+                    notifyItemRangeChanged(position, profiles.size)
+                    Snackbar.make(fab, "Removed profile ${world.user.screenName}", Snackbar.LENGTH_LONG).show()
                     // TODO: Account.unregister(account.id)
                     // TODO: Stop the world
                 }
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/OAuthActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/OAuthActivity.kt
index 763120b3..9fa7525b 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/OAuthActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/OAuthActivity.kt
@@ -7,8 +7,8 @@ import android.text.Editable
 import android.text.TextWatcher
 import kotlinx.android.synthetic.main.layout_oauth.*
 import net.lacolaco.smileessence.Application
-import net.lacolaco.smileessence.R
 import net.lacolaco.smileessence.Logger
+import net.lacolaco.smileessence.R
 import net.lacolaco.smileessence.util.bg
 import net.lacolaco.smileessence.util.launchUi
 import twitter4j.TwitterFactory
diff --git a/app/src/main/java/net/lacolaco/smileessence/data/ExtractionWord.kt b/app/src/main/java/net/lacolaco/smileessence/data/ExtractionWord.kt
index 6f187e6e..3cf50d29 100644
--- a/app/src/main/java/net/lacolaco/smileessence/data/ExtractionWord.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/data/ExtractionWord.kt
@@ -1,6 +1,7 @@
 package net.lacolaco.smileessence.data
 
 import android.content.ContentValues
+import net.lacolaco.smileessence.Application
 import java.util.regex.Pattern
 
 @Deprecated("Remove when ManagePagesActivity is done")
diff --git a/app/src/main/java/net/lacolaco/smileessence/twitter/UserStreamListener.kt b/app/src/main/java/net/lacolaco/smileessence/twitter/UserStreamListener.kt
index cf2fdb3b..e72aaff4 100644
--- a/app/src/main/java/net/lacolaco/smileessence/twitter/UserStreamListener.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/twitter/UserStreamListener.kt
@@ -1,12 +1,12 @@
 package net.lacolaco.smileessence.twitter
 
+import net.lacolaco.smileessence.Logger
 import net.lacolaco.smileessence.R
 import net.lacolaco.smileessence.World
 import net.lacolaco.smileessence.entity.DirectMessage
 import net.lacolaco.smileessence.entity.Event
 import net.lacolaco.smileessence.entity.Tweet
 import net.lacolaco.smileessence.entity.User
-import net.lacolaco.smileessence.Logger
 import twitter4j.ConnectionLifeCycleListener
 import twitter4j.Status
 import twitter4j.StatusDeletionNotice
diff --git a/app/src/main/java/net/lacolaco/smileessence/twitter/task/Tweets.kt b/app/src/main/java/net/lacolaco/smileessence/twitter/task/Tweets.kt
index 38419d1b..b56724e4 100644
--- a/app/src/main/java/net/lacolaco/smileessence/twitter/task/Tweets.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/twitter/task/Tweets.kt
@@ -6,9 +6,9 @@ import android.os.Environment
 import android.text.TextUtils
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.async
+import net.lacolaco.smileessence.Logger
 import net.lacolaco.smileessence.World
 import net.lacolaco.smileessence.entity.Tweet
-import net.lacolaco.smileessence.Logger
 import net.lacolaco.smileessence.twitter.TwitterTaskException
 import net.lacolaco.smileessence.util.bg
 import twitter4j.StatusUpdate
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 595ba9ed..94814e0b 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
@@ -18,12 +18,12 @@ import android.widget.TextView
 import com.twitter.Validator
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.page_fragment_compose.*
+import net.lacolaco.smileessence.Logger
 import net.lacolaco.smileessence.R
 import net.lacolaco.smileessence.activity.MainActivity
 import net.lacolaco.smileessence.data.PageInfo
 import net.lacolaco.smileessence.entity.Tweet
 import net.lacolaco.smileessence.entity.User
-import net.lacolaco.smileessence.Logger
 import net.lacolaco.smileessence.twitter.TwitterTaskException
 import net.lacolaco.smileessence.twitter.task.createTweetAsync
 import net.lacolaco.smileessence.util.BitmapThumbnailTask
diff --git a/app/src/main/res/drawable/ic_add_black_24dp.xml b/app/src/main/res/drawable/ic_add_black_24dp.xml
new file mode 100644
index 00000000..fedd077d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_manage_profiles.xml b/app/src/main/res/layout/activity_manage_profiles.xml
index 81f2606e..d51f7557 100644
--- a/app/src/main/res/layout/activity_manage_profiles.xml
+++ b/app/src/main/res/layout/activity_manage_profiles.xml
@@ -1,17 +1,33 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
+    <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:elevation="4dp" />
+        android:layout_height="wrap_content">
+
+        <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" />
+
+    </android.support.design.widget.AppBarLayout>
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/profiles"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</LinearLayout>
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        android:src="@drawable/ic_add_black_24dp" />
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_page_manage.xml b/app/src/main/res/layout/activity_page_manage.xml
index 87af0c9d..9f3ab43f 100644
--- a/app/src/main/res/layout/activity_page_manage.xml
+++ b/app/src/main/res/layout/activity_page_manage.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout 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"