Fixed wait layout of GroupChatInfo fragment + added the same of ChatCreationFragment
This commit is contained in:
Sylvain Berfini
parent
7c747ec700
commit
a90a8f9fef
3 changed files with 191 additions and 159 deletions
|
|
@ -1,182 +1,207 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:background="@color/colorH" >
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/top_bar"
|
||||
android:orientation="horizontal"
|
||||
android:background="@color/colorF"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="60dp">
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:background="@color/colorH" >
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/back"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="left"
|
||||
android:layout_weight="0.2"
|
||||
android:background="@drawable/toolbar_button"
|
||||
android:contentDescription="@string/content_description_back"
|
||||
android:padding="18dp"
|
||||
android:src="@drawable/back"/>
|
||||
<LinearLayout
|
||||
android:id="@+id/top_bar"
|
||||
android:orientation="horizontal"
|
||||
android:background="@color/colorF"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="60dp">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="0.2">
|
||||
<ImageView
|
||||
android:id="@+id/back"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="left"
|
||||
android:layout_weight="0.2"
|
||||
android:background="@drawable/toolbar_button"
|
||||
android:contentDescription="@string/content_description_back"
|
||||
android:padding="18dp"
|
||||
android:src="@drawable/back"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/all_contacts"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/toolbar_button"
|
||||
android:contentDescription="@string/content_description_all_contacts"
|
||||
android:padding="15dp"
|
||||
android:src="@drawable/contacts_all"/>
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="0.2">
|
||||
|
||||
<View
|
||||
android:id="@+id/all_contacts_select"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="5dp"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="@color/colorA"/>
|
||||
</RelativeLayout>
|
||||
<ImageView
|
||||
android:id="@+id/all_contacts"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/toolbar_button"
|
||||
android:contentDescription="@string/content_description_all_contacts"
|
||||
android:padding="15dp"
|
||||
android:src="@drawable/contacts_all"/>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="0.2">
|
||||
<View
|
||||
android:id="@+id/all_contacts_select"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="5dp"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="@color/colorA"/>
|
||||
</RelativeLayout>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/linphone_contacts"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/toolbar_button"
|
||||
android:contentDescription="@string/content_description_linphone_contacts"
|
||||
android:gravity="center"
|
||||
android:padding="15dp"
|
||||
android:src="@drawable/contacts_sip"/>
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="0.2">
|
||||
|
||||
<View
|
||||
android:id="@+id/linphone_contacts_select"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="5dp"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="@color/colorA"
|
||||
android:visibility="gone"/>
|
||||
</RelativeLayout>
|
||||
<ImageView
|
||||
android:id="@+id/linphone_contacts"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/toolbar_button"
|
||||
android:contentDescription="@string/content_description_linphone_contacts"
|
||||
android:gravity="center"
|
||||
android:padding="15dp"
|
||||
android:src="@drawable/contacts_sip"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/next"
|
||||
android:src="@drawable/chat_room_creation_next"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="0.2"
|
||||
android:background="@drawable/toolbar_button"
|
||||
android:contentDescription="@string/content_description_valid"
|
||||
android:padding="18dp"
|
||||
android:layout_gravity="right"/>
|
||||
<View
|
||||
android:id="@+id/linphone_contacts_select"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="5dp"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="@color/colorA"
|
||||
android:visibility="gone"/>
|
||||
</RelativeLayout>
|
||||
|
||||
</LinearLayout>
|
||||
<ImageView
|
||||
android:id="@+id/next"
|
||||
android:src="@drawable/chat_room_creation_next"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="0.2"
|
||||
android:background="@drawable/toolbar_button"
|
||||
android:contentDescription="@string/content_description_valid"
|
||||
android:padding="18dp"
|
||||
android:layout_gravity="right"/>
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/layoutSearchField"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="10dp">
|
||||
</LinearLayout>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/searchField"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="40dp"
|
||||
android:background="@drawable/resizable_textfield"
|
||||
android:hint="@string/chat_room_creation_filter_hint"
|
||||
android:contentDescription="@string/content_description_search_contact"
|
||||
android:gravity="center"
|
||||
android:inputType="textPersonName"
|
||||
android:paddingRight="5dp"
|
||||
android:textColor="@android:color/black"
|
||||
android:textCursorDrawable="@null"/>
|
||||
<RelativeLayout
|
||||
android:id="@+id/layoutSearchField"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="10dp">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/clearSearchField"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="30dp"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:paddingLeft="5dp"
|
||||
android:paddingRight="5dp"
|
||||
android:src="@drawable/clean_field"/>
|
||||
<EditText
|
||||
android:id="@+id/searchField"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="40dp"
|
||||
android:background="@drawable/resizable_textfield"
|
||||
android:hint="@string/chat_room_creation_filter_hint"
|
||||
android:contentDescription="@string/content_description_search_contact"
|
||||
android:gravity="center"
|
||||
android:inputType="textPersonName"
|
||||
android:paddingRight="5dp"
|
||||
android:textColor="@android:color/black"
|
||||
android:textCursorDrawable="@null"/>
|
||||
|
||||
</RelativeLayout>
|
||||
<ImageView
|
||||
android:id="@+id/clearSearchField"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="30dp"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:paddingLeft="5dp"
|
||||
android:paddingRight="5dp"
|
||||
android:src="@drawable/clean_field"/>
|
||||
|
||||
<HorizontalScrollView
|
||||
android:id="@+id/layoutContactsSelected"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="50dp"
|
||||
android:layout_marginTop="5dp"
|
||||
android:background="@drawable/resizable_textfield"
|
||||
android:lines="1"
|
||||
android:fadeScrollbars="false">
|
||||
</RelativeLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/contactsSelected"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:lines="1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="10dp"
|
||||
android:paddingRight="10dp"
|
||||
android:scrollIndicators="bottom"/>
|
||||
</HorizontalScrollView>
|
||||
<HorizontalScrollView
|
||||
android:id="@+id/layoutContactsSelected"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="50dp"
|
||||
android:layout_marginTop="5dp"
|
||||
android:background="@drawable/resizable_textfield"
|
||||
android:lines="1"
|
||||
android:fadeScrollbars="false">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_below="@+id/layoutContactsSelected"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:id="@+id/relativeLayout">
|
||||
<LinearLayout
|
||||
android:id="@+id/contactsSelected"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:lines="1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="10dp"
|
||||
android:paddingRight="10dp"
|
||||
android:scrollIndicators="bottom"/>
|
||||
</HorizontalScrollView>
|
||||
|
||||
<ListView
|
||||
android:id="@+id/contactsList"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:divider="@color/colorE"
|
||||
android:dividerHeight="1dp"
|
||||
android:fastScrollAlwaysVisible="true"
|
||||
android:fastScrollEnabled="true"/>
|
||||
<RelativeLayout
|
||||
android:layout_below="@+id/layoutContactsSelected"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:id="@+id/relativeLayout">
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/contactsFetchInProgress"
|
||||
style="?android:attr/progressBarStyle"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:visibility="gone"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"/>
|
||||
<ListView
|
||||
android:id="@+id/contactsList"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:divider="@color/colorE"
|
||||
android:dividerHeight="1dp"
|
||||
android:fastScrollAlwaysVisible="true"
|
||||
android:fastScrollEnabled="true"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/noSipContact"
|
||||
android:text="@string/no_sip_contact"
|
||||
style="@style/font6"
|
||||
android:visibility="gone"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:layout_centerVertical="true"/>
|
||||
<ProgressBar
|
||||
android:id="@+id/contactsFetchInProgress"
|
||||
style="?android:attr/progressBarStyle"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:visibility="gone"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/noContact"
|
||||
android:text="@string/no_contact"
|
||||
android:visibility="gone"
|
||||
style="@style/font6"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:layout_centerVertical="true"/>
|
||||
<TextView
|
||||
android:id="@+id/noSipContact"
|
||||
android:text="@string/no_sip_contact"
|
||||
style="@style/font6"
|
||||
android:visibility="gone"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:layout_centerVertical="true"/>
|
||||
|
||||
</RelativeLayout>
|
||||
<TextView
|
||||
android:id="@+id/noContact"
|
||||
android:text="@string/no_contact"
|
||||
android:visibility="gone"
|
||||
style="@style/font6"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:layout_centerVertical="true"/>
|
||||
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/waitScreen"
|
||||
android:clickable="true"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="#99c4c4c4">
|
||||
|
||||
<ProgressBar
|
||||
android:indeterminate="true"
|
||||
android:indeterminateTint="@color/colorA"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerInParent="true">
|
||||
|
||||
</ProgressBar>
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
|
|
@ -60,7 +60,7 @@ public class ChatCreationFragment extends Fragment implements View.OnClickListen
|
|||
private ImageView allContacts, linphoneContacts;
|
||||
private boolean onlyDisplayLinphoneContacts;
|
||||
private View allContactsSelected, linphoneContactsSelected;
|
||||
private RelativeLayout searchLayout;
|
||||
private RelativeLayout searchLayout, waitLayout;
|
||||
private ImageView clearSearchField;
|
||||
private EditText searchField;
|
||||
private ProgressBar contactsFetchInProgress;
|
||||
|
|
@ -78,6 +78,9 @@ public class ChatCreationFragment extends Fragment implements View.OnClickListen
|
|||
contactsSelected = new ArrayList<>();
|
||||
}
|
||||
|
||||
waitLayout = view.findViewById(R.id.waitScreen);
|
||||
waitLayout.setVisibility(View.GONE);
|
||||
|
||||
contactsList = view.findViewById(R.id.contactsList);
|
||||
contactsSelectedLayout = view.findViewById(R.id.contactsSelected);
|
||||
contactsSelectLayout = view.findViewById(R.id.layoutContactsSelected);
|
||||
|
|
@ -282,6 +285,7 @@ public class ChatCreationFragment extends Fragment implements View.OnClickListen
|
|||
} else if (id == R.id.next) {
|
||||
if (contactsSelected.size() == 1) {
|
||||
contactsSelectedLayout.removeAllViews();
|
||||
waitLayout.setVisibility(View.VISIBLE);
|
||||
//LinphoneActivity.instance().displayChat(contactsSelected.get(0).getAddress(), "", "");
|
||||
//TODO create group chat room with only two participants ?
|
||||
//TODO what subject to set ?
|
||||
|
|
@ -290,8 +294,10 @@ public class ChatCreationFragment extends Fragment implements View.OnClickListen
|
|||
@Override
|
||||
public void onStateChanged(ChatRoom cr, ChatRoom.State newState) {
|
||||
if (newState == ChatRoom.State.Created) {
|
||||
waitLayout.setVisibility(View.GONE);
|
||||
LinphoneActivity.instance().goToChat(cr.getConferenceAddress().asStringUriOnly());
|
||||
} else if (newState == ChatRoom.State.CreationFailed) {
|
||||
waitLayout.setVisibility(View.GONE);
|
||||
//TODO display error
|
||||
Log.e("Group chat room for address " + cr.getConferenceAddress() + " has failed !");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -142,10 +142,11 @@ public class GroupInfoFragment extends Fragment {
|
|||
chatRoom.setListener(new ChatRoomListenerStub() {
|
||||
@Override
|
||||
public void onStateChanged(ChatRoom cr, ChatRoom.State newState) {
|
||||
mWaitLayout.setVisibility(View.GONE);
|
||||
if (newState == ChatRoom.State.Created) {
|
||||
mWaitLayout.setVisibility(View.GONE);
|
||||
LinphoneActivity.instance().goToChat(cr.getConferenceAddress().asStringUriOnly());
|
||||
} else if (newState == ChatRoom.State.CreationFailed) {
|
||||
mWaitLayout.setVisibility(View.GONE);
|
||||
//TODO display error
|
||||
Log.e("Group chat room for address " + cr.getConferenceAddress() + " has failed !");
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue