Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update interface

Browse source
This commit is contained in:
Margaux Clerc 2015-07-27 17:00:12 +02:00
parent f9f9f7ddd5
commit f31f51661d
6 changed files with 9 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
res/layout/dialer.xml
View file

@ -5,12 +5,10 @@
android:background="@color/background">
<RelativeLayout
android:background="@color/button_addContact"
android:id="@+id/AddressBar"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_alignParentTop="true">
@ -61,7 +59,7 @@
android:adjustViewBounds="true"
android:scaleType="center"
android:contentDescription="@string/content_description_contacts"
android:src="@drawable/add_contact_button" />
android:src="@drawable/contact_add" />
</RelativeLayout>

11
res/layout/main.xml
View file

@ -9,18 +9,17 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/topLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="wrap_content">
<include layout="@layout/status" android:id="@+id/statusBar" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_below="@id/statusBar"
android:layout_above="@id/footer">
<include layout="@layout/status" android:id="@+id/status" />
<include layout="@layout/toolbar" android:id="@+id/toolbar" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -31,8 +30,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal" />
</FrameLayout>
</LinearLayout>

3
res/layout/status.xml
View file

@ -1,13 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
android:id="@+id/statusBar"
android:id="@+id/status"
android:background="@color/footer_select"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="50dp"
android:orientation="horizontal">
<RelativeLayout
android:id="@+id/content"
android:layout_width="match_parent"

50
res/layout/toolbar.xml
View file

@ -1,50 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/toolbar"
android:background="@color/button_addContact"
android:layout_width="match_parent"
android:layout_height="60dp">
<RelativeLayout
android:id="@+id/back"
android:layout_width="wrap_content"
android:layout_height="match_parent">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:contentDescription="@string/content_description_back"
android:src="@drawable/back" />
</RelativeLayout>
<TextView
android:id="@+id/toolbar_text"
android:text="@string/setup_title"
android:textColor="@color/footer_select"
android:textSize="28sp"
android:textAllCaps="true"
android:textStyle="bold"
android:paddingLeft="10dp"
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"/>
<RelativeLayout
android:id="@+id/dialer"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:contentDescription="@string/content_description_dialer"
android:src="@drawable/dialer_back" />
</RelativeLayout>
</RelativeLayout>

1
res/values/color.xml
View file

@ -9,6 +9,7 @@
<color name="footer_select">#ff5e00</color>
<color name="call_selected">#96c11f</color>
<color name="colorD">#808080</color>
<color name="colorE">#e1e1e1</color>
<!-- end -->

35
src/org/linphone/LinphoneActivity.java
View file

@ -318,39 +318,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.main, menu);
return super.onCreateOptionsMenu(menu);
}
/* Called whenever we call invalidateOptionsMenu() */
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
// If the nav drawer is open, hide action items related to the content view
boolean drawerOpen = mDrawerLayout.isDrawerOpen(mDrawerList);
menu.findItem(R.id.action_websearch).setVisible(!drawerOpen);
return super.onPrepareOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// The action bar home/up action should open or close the drawer.
// ActionBarDrawerToggle will take care of this.
if (mDrawerToggle.onOptionsItemSelected(item)) {
return true;
}
// Handle action buttons
switch(item.getItemId()) {
case R.id.action_websearch:
return true;
default:
return super.onOptionsItemSelected(item);
}
}
/* The click listner for ListView in the navigation drawer */
private class DrawerItemClickListener implements ListView.OnItemClickListener {
@Override
@ -457,7 +424,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
statusFragment.getView().setVisibility(View.VISIBLE);
}*/
//findViewById(R.id.status).setVisibility(View.VISIBLE);
findViewById(R.id.fragmentContainer).setPadding(0, LinphoneUtils.pixelsToDpi(getResources(), 40), 0, 0);
//findViewById(R.id.fragmentContainer).setPadding(0, LinphoneUtils.pixelsToDpi(getResources(), 40), 0, 0);
}
private void changeCurrentFragment(FragmentsAvailable newFragmentType, Bundle extras) {