diff --git a/res/layout/about.xml b/res/layout/about.xml
index 5f16136e0..efc9917ca 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -5,6 +5,34 @@
android:layout_height="match_parent"
android:orientation="vertical">
+
+
+
+
+
+
+
+
+ android:layout_centerInParent="true"/>
-
+ android:visibility="gone"/>
@@ -118,42 +116,37 @@
android:background="@drawable/footer_button"
android:layout_weight="1"
android:layout_width="0dp"
- android:layout_height="match_parent"
- android:adjustViewBounds="true">
+ android:layout_height="match_parent">
+ android:layout_centerInParent="true"/>
-
+ android:visibility="gone"/>
-
+ android:layout_height="match_parent">
-
-
-
-
-
+
+
-
+
-
+ android:dividerHeight="0dp"/>
-
+ android:dividerHeight="1dp"/>
+ android:layout_height="50dp">
-
+ android:layout_height="wrap_content"/>
outgoing
incoming
missed
+ Settings
free SIP VOIP client
@@ -293,7 +294,6 @@
Audio
Prefix
Advanced
- Settings
Proxy
Domain*
Password*
diff --git a/src/org/linphone/AboutFragment.java b/src/org/linphone/AboutFragment.java
index f90607056..47815700b 100644
--- a/src/org/linphone/AboutFragment.java
+++ b/src/org/linphone/AboutFragment.java
@@ -29,6 +29,7 @@ import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.ImageView;
+import android.widget.RelativeLayout;
import android.widget.TextView;
/**
@@ -37,6 +38,7 @@ import android.widget.TextView;
public class AboutFragment extends Fragment implements OnClickListener {
View sendLogButton = null;
View resetLogButton = null;
+ ImageView cancel;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -49,6 +51,9 @@ public class AboutFragment extends Fragment implements OnClickListener {
Log.e(e, "cannot get version name");
}
+ cancel = (ImageView) view.findViewById(R.id.cancel);
+ cancel.setOnClickListener(this);
+
sendLogButton = view.findViewById(R.id.send_log);
sendLogButton.setOnClickListener(this);
sendLogButton.setVisibility(org.linphone.LinphonePreferences.instance().isDebugEnabled() ? View.VISIBLE : View.GONE);
@@ -66,7 +71,6 @@ public class AboutFragment extends Fragment implements OnClickListener {
if (org.linphone.LinphoneActivity.isInstanciated()) {
LinphoneActivity.instance().hideTabBar(true);
- LinphoneActivity.instance().displayTopBar(true,"About");
}
}
@@ -82,6 +86,8 @@ public class AboutFragment extends Fragment implements OnClickListener {
if (lc != null) {
lc.resetLogCollection();
}
+ } else if (v == cancel) {
+ getFragmentManager().popBackStackImmediate();
}
}
}
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 5df9d1235..9cc3353ba 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -99,7 +99,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
private StatusFragment statusFragment;
private TextView missedCalls, missedChats;
private RelativeLayout contacts, history, dialer, chat;
- private RelativeLayout contacts_selected, history_selected, dialer_selected, chat_selected;
+ private View contacts_selected, history_selected, dialer_selected, chat_selected;
private RelativeLayout mTopBar;
private ImageView cancel;
private FragmentsAvailable currentFragment, nextFragment;
@@ -294,13 +294,13 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
chat = (RelativeLayout) findViewById(R.id.chat);
chat.setOnClickListener(this);
- history_selected = (RelativeLayout) findViewById(R.id.history_select);
- contacts_selected = (RelativeLayout) findViewById(R.id.contacts_select);
- dialer_selected = (RelativeLayout) findViewById(R.id.dialer_select);
- chat_selected = (RelativeLayout) findViewById(R.id.chat_select);
+ history_selected = findViewById(R.id.history_select);
+ contacts_selected = findViewById(R.id.contacts_select);
+ dialer_selected = findViewById(R.id.dialer_select);
+ chat_selected = findViewById(R.id.chat_select);
- missedCalls = (TextView) findViewById(R.id.missedCalls);
- missedChats = (TextView) findViewById(R.id.missedChats);
+ missedCalls = (TextView) findViewById(R.id.missed_calls);
+ missedChats = (TextView) findViewById(R.id.missed_chats);
}
private boolean isTablet() {
@@ -694,9 +694,9 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
} else if (id == R.id.chat) {
changeCurrentFragment(FragmentsAvailable.CHAT_LIST, null);
chat_selected.setVisibility(View.VISIBLE);
- } else if (id == R.id.cancel) {
- displayTopBar(false,"");
+ } else if (id == R.id.cancel){
getFragmentManager().popBackStackImmediate();
+ mTopBar.setVisibility(View.GONE);
}
}
@@ -715,17 +715,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
}
}
- public void displayTopBar(Boolean display, String name) {
- TextView menuName = (TextView) findViewById(R.id.menu_name);
- if(display){
- menuName.setText(name);
- mTopBar.setVisibility(View.VISIBLE);
- } else {
- menuName.setText("");
- mTopBar.setVisibility(View.GONE);
- }
- }
-
@SuppressWarnings("incomplete-switch")
public void selectMenu(FragmentsAvailable menuToSelect) {
currentFragment = menuToSelect;
@@ -746,7 +735,8 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
break;
case SETTINGS:
case ACCOUNT_SETTINGS:
- displayTopBar(true,"settings");
+ hideTabBar(true);
+ mTopBar.setVisibility(View.VISIBLE);
break;
case CHAT_LIST:
case CHAT:
@@ -1264,7 +1254,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
sideMenuItemList = (ListView)findViewById(R.id.item_list);
menu = (ImageView) findViewById(R.id.side_menu_button);
- sideMenuItemList.setAdapter(new ArrayAdapter(this, R.layout.side_menu_item, sideMenuItems));
+ sideMenuItemList.setAdapter(new ArrayAdapter(this, R.layout.side_menu_item_cell, sideMenuItems));
sideMenuItemList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView adapterView, View view, int i, long l) {
@@ -1323,9 +1313,9 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
private void displayMainAccount(){
defaultAccount.setVisibility(View.VISIBLE);
- ImageView status = (ImageView) defaultAccount.findViewById(R.id.status_led);
- TextView address = (TextView) defaultAccount.findViewById(R.id.address);
- TextView displayName = (TextView) defaultAccount.findViewById(R.id.display_name);
+ ImageView status = (ImageView) defaultAccount.findViewById(R.id.main_account_status);
+ TextView address = (TextView) defaultAccount.findViewById(R.id.main_account_address);
+ TextView displayName = (TextView) defaultAccount.findViewById(R.id.main_account_display_name);
LinphoneProxyConfig proxy = LinphoneManager.getLc().getDefaultProxyConfig();
@@ -1422,11 +1412,11 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
if (convertView != null) {
view = convertView;
} else {
- view = getLayoutInflater().inflate(R.layout.accounts, parent, false);
+ view = getLayoutInflater().inflate(R.layout.side_menu_account_cell, parent, false);
}
- ImageView status = (ImageView) view.findViewById(R.id.status_led);
- TextView address = (TextView) view.findViewById(R.id.address);
+ ImageView status = (ImageView) view.findViewById(R.id.account_status);
+ TextView address = (TextView) view.findViewById(R.id.account_address);
String sipAddress = lpc.getAddress().asStringUriOnly();
address.setText(sipAddress);