diff --git a/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListFragment.java b/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListFragment.java index 865daec..08910cd 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListFragment.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListFragment.java @@ -15,6 +15,8 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.RecyclerView; +import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton; + import butterknife.BindView; import butterknife.ButterKnife; @@ -28,6 +30,9 @@ public class ChatListFragment extends Fragment { RecyclerView recyclerView; private final ChatListRecyclerViewAdapter recyclerViewAdapter = new ChatListRecyclerViewAdapter(); + @BindView(R.id.fab) + ExtendedFloatingActionButton fab; + public ChatListFragment() { } diff --git a/app/src/main/java/org/mercury_im/messenger/ui/login/AccountsFragment.java b/app/src/main/java/org/mercury_im/messenger/ui/login/AccountsFragment.java index d61b4ad..1c42a07 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/login/AccountsFragment.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/login/AccountsFragment.java @@ -10,7 +10,6 @@ import android.view.ViewGroup; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; diff --git a/app/src/main/java/org/mercury_im/messenger/ui/roster/bookmarks/BookmarkListFragment.java b/app/src/main/java/org/mercury_im/messenger/ui/roster/bookmarks/BookmarkListFragment.java index e6cf8b2..a9f3943 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/roster/bookmarks/BookmarkListFragment.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/roster/bookmarks/BookmarkListFragment.java @@ -9,12 +9,18 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; +import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton; + import org.mercury_im.messenger.R; +import butterknife.BindView; import butterknife.ButterKnife; public class BookmarkListFragment extends Fragment { + @BindView(R.id.fab) + ExtendedFloatingActionButton fab; + @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { diff --git a/app/src/main/java/org/mercury_im/messenger/ui/roster/contacts/ContactListFragment.java b/app/src/main/java/org/mercury_im/messenger/ui/roster/contacts/ContactListFragment.java index e10d0e3..9bc816a 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/roster/contacts/ContactListFragment.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/roster/contacts/ContactListFragment.java @@ -14,6 +14,8 @@ import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.RecyclerView; +import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton; + import butterknife.BindView; import butterknife.ButterKnife; @@ -30,6 +32,9 @@ public class ContactListFragment extends Fragment { RecyclerView recyclerView; private final ContactListRecyclerViewAdapter recyclerViewAdapter = new ContactListRecyclerViewAdapter(); + @BindView(R.id.fab) + ExtendedFloatingActionButton fab; + public ContactListFragment() { } diff --git a/app/src/main/res/drawable/ic_group_add_black_24dp.xml b/app/src/main/res/drawable/ic_group_add_black_24dp.xml new file mode 100644 index 0000000..b3a2fb3 --- /dev/null +++ b/app/src/main/res/drawable/ic_group_add_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_person_add_black_24dp.xml b/app/src/main/res/drawable/ic_person_add_black_24dp.xml new file mode 100644 index 0000000..225ae0a --- /dev/null +++ b/app/src/main/res/drawable/ic_person_add_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/fragment_account_list.xml b/app/src/main/res/layout/fragment_account_list.xml index b758385..2b051dd 100644 --- a/app/src/main/res/layout/fragment_account_list.xml +++ b/app/src/main/res/layout/fragment_account_list.xml @@ -20,6 +20,7 @@ - \ No newline at end of file + android:layout_height="match_parent"> + + + + + + + diff --git a/app/src/main/res/layout/fragment_chat_list.xml b/app/src/main/res/layout/fragment_chat_list.xml index 0ec5528..861673d 100644 --- a/app/src/main/res/layout/fragment_chat_list.xml +++ b/app/src/main/res/layout/fragment_chat_list.xml @@ -1,8 +1,12 @@ - + + + + + + diff --git a/app/src/main/res/layout/fragment_contact_list.xml b/app/src/main/res/layout/fragment_contact_list.xml index ce4a967..0fa9386 100644 --- a/app/src/main/res/layout/fragment_contact_list.xml +++ b/app/src/main/res/layout/fragment_contact_list.xml @@ -1,12 +1,30 @@ - + android:layout_height="match_parent"> + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6f0899d..b093d29 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -127,4 +127,6 @@ %1$s writes: Add Account + Add Contact + Add Bookmark