mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-18 03:48:08 +00:00
Conflicts: AndroidManifest.xml res/drawable-xhdpi/topbar_avatar.png res/drawable/assistant_button.xml res/layout-land/call.xml res/layout-land/call_incoming.xml res/layout-land/call_outgoing.xml res/layout-land/chatlist_cell.xml res/layout-land/main.xml res/layout/about.xml res/layout/assistant_account_creation.xml res/layout/assistant_linphone_login.xml res/layout/assistant_remote_provisioning_login.xml res/layout/assistant_topbar.xml res/layout/call.xml res/layout/call_incoming.xml res/layout/call_outgoing.xml res/layout/chat.xml res/layout/chatlist.xml res/layout/chatlist_cell.xml res/layout/conference_paused_row.xml res/layout/contact.xml res/layout/contact_edit.xml res/layout/contacts_list.xml res/layout/dialog.xml res/layout/edit_list.xml res/layout/history.xml res/layout/history_detail.xml res/layout/main.xml res/layout/side_menu_account_cell.xml res/mipmap-hdpi/ic_launcher.png res/mipmap-mdpi/ic_launcher.png res/mipmap-xhdpi/ic_launcher.png res/mipmap-xxhdpi/ic_launcher.png res/mipmap-xxxhdpi/ic_launcher.png res/values-ar/strings.xml res/values-de/strings.xml res/values-es/strings.xml res/values-fr/custom.xml res/values-fr/strings.xml res/values-he/strings.xml res/values-ja/strings.xml res/values-nl/strings.xml res/values-ru/strings.xml res/values-tr/strings.xml res/values/custom.xml res/values/non_localizable_custom.xml res/values/strings.xml res/values/styles.xml src/org/linphone/CallActivity.java src/org/linphone/ChatFragment.java src/org/linphone/ChatListFragment.java src/org/linphone/ContactDetailsFragment.java src/org/linphone/ContactsListFragment.java src/org/linphone/HistoryDetailFragment.java src/org/linphone/HistoryListFragment.java src/org/linphone/LinphoneActivity.java src/org/linphone/LinphoneManager.java src/org/linphone/LinphoneService.java src/org/linphone/assistant/RemoteProvisioningActivity.java
242 lines
No EOL
7 KiB
XML
242 lines
No EOL
7 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<RelativeLayout
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent">
|
|
|
|
<fragment
|
|
android:id="@+id/status"
|
|
android:name="org.linphone.StatusFragment"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="40dp"
|
|
tools:layout="@layout/status" />
|
|
|
|
<android.support.v4.widget.DrawerLayout
|
|
android:id="@+id/side_menu"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_below="@id/status">
|
|
|
|
<RelativeLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent">
|
|
|
|
<RelativeLayout
|
|
android:id="@+id/top_bar"
|
|
android:background="@color/colorF"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="60dp"
|
|
android:visibility="gone"
|
|
android:layout_alignParentTop="true">
|
|
|
|
<TextView
|
|
android:id="@+id/menu_name"
|
|
android:text="@string/settings"
|
|
style="@style/font1"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:layout_centerInParent="true"
|
|
android:gravity="center_vertical"/>
|
|
|
|
<ImageView
|
|
android:id="@+id/cancel"
|
|
android:src="@drawable/dialer_back"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:padding="15dp"
|
|
android:layout_centerInParent="true"
|
|
android:layout_alignParentRight="true"/>
|
|
|
|
</RelativeLayout>
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:orientation="vertical"
|
|
android:layout_above="@id/footer"
|
|
android:layout_below="@id/top_bar">
|
|
|
|
<FrameLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_alignParentTop="true">
|
|
|
|
<LinearLayout
|
|
android:id="@+id/fragmentContainer"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:orientation="horizontal" />
|
|
</FrameLayout>
|
|
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/footer"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="60dp"
|
|
android:layout_alignParentBottom="true"
|
|
android:orientation="horizontal">
|
|
|
|
<RelativeLayout
|
|
android:id="@+id/history"
|
|
android:background="@drawable/footer_button"
|
|
android:layout_weight="1"
|
|
android:layout_width="0dp"
|
|
android:layout_height="match_parent">
|
|
|
|
<ImageView
|
|
android:id="@+id/history_image"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:padding="18dp"
|
|
android:layout_centerInParent="true"
|
|
android:contentDescription="@string/content_description_history"
|
|
android:src="@drawable/footer_history"/>
|
|
|
|
<TextView
|
|
android:id="@+id/missed_calls"
|
|
style="@style/font7"
|
|
android:layout_width="25dp"
|
|
android:layout_height="25dp"
|
|
android:layout_margin="12dp"
|
|
android:background="@drawable/history_chat_indicator"
|
|
android:visibility="gone"
|
|
android:gravity="center"
|
|
android:layout_alignParentBottom="true"
|
|
android:layout_alignParentRight="true"/>
|
|
|
|
</RelativeLayout>
|
|
|
|
<ImageView
|
|
android:id="@+id/contacts"
|
|
android:src="@drawable/footer_contacts"
|
|
android:background="@drawable/footer_button"
|
|
android:contentDescription="@string/content_description_contacts"
|
|
android:layout_weight="1"
|
|
android:layout_width="0dp"
|
|
android:layout_height="match_parent"
|
|
android:padding="18dp"
|
|
android:layout_centerInParent="true" />
|
|
|
|
<ImageView
|
|
android:id="@+id/dialer"
|
|
android:src="@drawable/footer_dialer"
|
|
android:background="@drawable/footer_button"
|
|
android:contentDescription="@string/content_description_dialer"
|
|
android:layout_weight="1"
|
|
android:layout_width="0dp"
|
|
android:layout_height="match_parent"
|
|
android:padding="18dp"
|
|
android:layout_centerInParent="true"/>
|
|
|
|
<RelativeLayout
|
|
android:id="@+id/chat"
|
|
android:background="@drawable/footer_button"
|
|
android:layout_weight="1"
|
|
android:layout_width="0dp"
|
|
android:layout_height="match_parent">
|
|
|
|
<ImageView
|
|
android:id="@+id/chat_image"
|
|
android:src="@drawable/footer_chat"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:padding="18dp"
|
|
android:layout_centerInParent="true" />
|
|
|
|
<TextView
|
|
android:id="@+id/missed_chats"
|
|
style="@style/font7"
|
|
android:layout_width="25dp"
|
|
android:layout_height="25dp"
|
|
android:layout_margin="12dp"
|
|
android:background="@drawable/history_chat_indicator"
|
|
android:visibility="gone"
|
|
android:gravity="center"
|
|
android:layout_alignParentBottom="true"
|
|
android:layout_alignParentRight="true"/>
|
|
|
|
</RelativeLayout>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/fragmentContainer2"
|
|
android:visibility="gone"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical">
|
|
|
|
</LinearLayout>
|
|
</RelativeLayout>
|
|
|
|
<!-- Side Menu -->
|
|
<RelativeLayout
|
|
android:id="@+id/side_menu_content"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_gravity="left">
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:orientation="vertical">
|
|
|
|
<include layout="@layout/side_menu_main_account"/>
|
|
|
|
<ListView
|
|
android:id="@+id/accounts_list"
|
|
android:background="@color/colorB"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:choiceMode="singleChoice"
|
|
android:cacheColorHint="@color/transparent"
|
|
android:divider="@android:color/transparent"
|
|
android:dividerHeight="0dp"/>
|
|
|
|
<ListView
|
|
android:id="@+id/item_list"
|
|
android:background="@color/colorG"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:choiceMode="singleChoice"
|
|
android:divider="@color/colorE"
|
|
android:listSelector="@color/colorG"
|
|
android:dividerHeight="1dp"/>
|
|
</LinearLayout>
|
|
|
|
<RelativeLayout
|
|
android:id="@+id/side_menu_quit"
|
|
android:background="@color/colorA"
|
|
android:gravity="bottom"
|
|
android:layout_alignParentBottom="true"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="50dp">
|
|
|
|
|
|
<ImageView
|
|
android:id="@+id/quit_button"
|
|
android:src="@drawable/quit"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:padding="5dp"
|
|
android:layout_alignParentLeft="true"
|
|
android:layout_centerVertical="true" />
|
|
|
|
<TextView
|
|
android:id="@+id/quit"
|
|
android:text="@string/quit"
|
|
style="@style/font8"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_toRightOf="@id/quit_button"
|
|
android:gravity="center_vertical"
|
|
android:layout_centerInParent="true"/>
|
|
|
|
</RelativeLayout>
|
|
|
|
</RelativeLayout>
|
|
|
|
</android.support.v4.widget.DrawerLayout>
|
|
|
|
</RelativeLayout> |