Mercury-IM/Mercury-IM
Mercury-IM
/
Mercury-IM
mirror of https://codeberg.org/Mercury-IM/Mercury-IM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add FABs for chat-, contact- and bookmarklist

This commit is contained in:
Paul Schaub 2019-10-12 18:17:36 +02:00
parent 6dc0d5081b
commit 5baa2738fe
Signed by: vanitasvitae
GPG Key ID: 62BEE9264BF17311
11 changed files with 104 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListFragment.java
View File

@ -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() {
}

1
app/src/main/java/org/mercury_im/messenger/ui/login/AccountsFragment.java
View File

@ -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;

6
app/src/main/java/org/mercury_im/messenger/ui/roster/bookmarks/BookmarkListFragment.java
View File

@ -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) {

5
app/src/main/java/org/mercury_im/messenger/ui/roster/contacts/ContactListFragment.java
View File

@ -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() {
}

9
app/src/main/res/drawable/ic_group_add_black_24dp.xml Normal file
View File

@ -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="M8,10L5,10L5,7L3,7v3L0,10v2h3v3h2v-3h3v-2zM18,11c1.66,0 2.99,-1.34 2.99,-3S19.66,5 18,5c-0.32,0 -0.63,0.05 -0.91,0.14 0.57,0.81 0.9,1.79 0.9,2.86s-0.34,2.04 -0.9,2.86c0.28,0.09 0.59,0.14 0.91,0.14zM13,11c1.66,0 2.99,-1.34 2.99,-3S14.66,5 13,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM19.62,13.16c0.83,0.73 1.38,1.66 1.38,2.84v2h3v-2c0,-1.54 -2.37,-2.49 -4.38,-2.84zM13,13c-2,0 -6,1 -6,3v2h12v-2c0,-2 -4,-3 -6,-3z"/>
</vector>

9
app/src/main/res/drawable/ic_person_add_black_24dp.xml Normal file
View File

@ -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="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
</vector>

1
app/src/main/res/layout/fragment_account_list.xml
View File

@ -20,6 +20,7 @@
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
style="@style/Widget.MaterialComponents.ExtendedFloatingActionButton.Icon"
android:id="@+id/fab"
android:transitionName="fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/action_add_account"

32
app/src/main/res/layout/fragment_bookmarks_list.xml
View File

@ -1,12 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.recyclerview.widget.RecyclerView
<androidx.coordinatorlayout.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"
android:id="@+id/roster_entry_list__recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:context=".ui.roster.contacts.ContactListFragment"
tools:listitem="@layout/list_item_chat" />
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/roster_entry_list__recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:context=".ui.roster.contacts.ContactListFragment"
tools:listitem="@layout/list_item_chat" />
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
style="@style/Widget.MaterialComponents.ExtendedFloatingActionButton.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/fab"
android:transitionName="fab"
android:text="@string/action_add_bookmark"
android:layout_margin="16dp"
android:layout_gravity="bottom|end"
app:icon="@drawable/ic_group_add_black_24dp"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

18
app/src/main/res/layout/fragment_chat_list.xml
View File

@ -1,8 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.recyclerview.widget.RecyclerView
<androidx.coordinatorlayout.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"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/chat_list__recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -10,3 +14,15 @@
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/list_item_chat"
tools:context=".ui.chatlist.ChatListFragment"/>
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
style="@style/Widget.MaterialComponents.ExtendedFloatingActionButton.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/fab"
android:transitionName="fab"
android:layout_margin="16dp"
android:layout_gravity="bottom|end"
app:icon="@drawable/ic_message_black_24dp"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

32
app/src/main/res/layout/fragment_contact_list.xml
View File

@ -1,12 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.recyclerview.widget.RecyclerView
<androidx.coordinatorlayout.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"
android:id="@+id/roster_entry_list__recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/list_item_contact"
tools:context=".ui.roster.contacts.ContactListFragment"/>
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/roster_entry_list__recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/list_item_contact"
tools:context=".ui.roster.contacts.ContactListFragment"/>
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
style="@style/Widget.MaterialComponents.ExtendedFloatingActionButton.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/fab"
android:transitionName="fab"
android:text="@string/action_add_contact"
android:layout_margin="16dp"
android:layout_gravity="bottom|end"
app:icon="@drawable/ic_person_add_black_24dp"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

2
app/src/main/res/values/strings.xml
View File

@ -127,4 +127,6 @@
<string name="notification_title">%1$s writes:</string>
<string name="action_add_account">Add Account</string>
<string name="action_add_contact">Add Contact</string>
<string name="action_add_bookmark">Add Bookmark</string>
</resources>