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

Better animations between tabs

Browse source
This commit is contained in:
Sylvain Berfini 2012-06-22 14:42:47 +02:00
parent 3bc93a8583
commit 1a29c5ac72
4 changed files with 75 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
res/layout/audio.xml
View file

@ -8,14 +8,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/champ_saisie_numero"
android:gravity="center_vertical"
android:stretchColumns="0"
android:shrinkColumns="0"
android:layout_weight="0.9">
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">
android:layout_height="wrap_content">
<TextView
android:id="@+id/contactNameOrNumber"
android:layout_width="wrap_content"

36
src/org/linphone/FragmentsAvailable.java
View file

@ -32,17 +32,35 @@ public enum FragmentsAvailable {
CHAT;
public boolean shouldAddToBackStack() {
return this == HISTORY_DETAIL ||
this == HISTORY ||
this == CONTACT ||
this == CONTACTS ||
this == CHATLIST ||
this == CHAT;
return true;
}
public boolean shouldAnimate() {
return this == HISTORY_DETAIL ||
this == CONTACT ||
this == CHAT;
return true;
}
public boolean isRightOf(FragmentsAvailable fragment) {
switch (this) {
case HISTORY:
case HISTORY_DETAIL:
return fragment == UNKNOW;
case CONTACTS:
case CONTACT:
return HISTORY.isRightOf(fragment) || fragment == HISTORY || fragment == HISTORY_DETAIL;
case DIALER:
return CONTACTS.isRightOf(fragment) || fragment == CONTACT || fragment == CONTACTS;
case SETTINGS:
return DIALER.isRightOf(fragment) || fragment == DIALER;
case CHAT:
case CHATLIST:
return SETTINGS.isRightOf(fragment) || fragment == SETTINGS;
default:
return false;
}
}
}

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

@ -50,6 +50,7 @@ import android.support.v4.app.Fragment.SavedState;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.view.KeyEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.WindowManager;
@ -189,17 +190,20 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
if (newFragment != null) {
newFragment.setArguments(extras);
currentFragment = newFragmentType;
changeFragment(newFragment);
changeFragment(newFragment, newFragmentType);
}
}
private void changeFragment(Fragment newFragment) {
private void changeFragment(Fragment newFragment, FragmentsAvailable newFragmentType) {
FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
if (currentFragment.shouldAddToBackStack()) {
if (!getResources().getBoolean(R.bool.disable_animations) && currentFragment.shouldAnimate()) {
if (newFragmentType.isRightOf(currentFragment)) {
transaction.setCustomAnimations(R.anim.slide_in_right_to_left, R.anim.slide_out_right_to_left, R.anim.slide_in_left_to_right, R.anim.slide_out_left_to_right);
} else {
transaction.setCustomAnimations(R.anim.slide_in_left_to_right, R.anim.slide_out_left_to_right, R.anim.slide_in_right_to_left, R.anim.slide_out_right_to_left);
}
}
transaction.addToBackStack("Add to back stack");
}
@ -213,6 +217,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
transaction.replace(R.id.fragmentContainer, newFragment);
transaction.commitAllowingStateLoss();
currentFragment = newFragmentType;
}
public void displayHistoryDetail(String sipUri, LinphoneCallLog log) {
@ -289,7 +294,6 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
dialer.setSelected(true);
}
else if (id == R.id.settings) {
currentFragment = FragmentsAvailable.SETTINGS;
// if (Version.sdkAboveOrEqual(Version.API11_HONEYCOMB_30)) {
// changeCurrentFragment(FragmentsAvailable.SETTINGS, null);
// settings.setSelected(true);
@ -297,6 +301,11 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
Intent intent = new Intent(ACTION_MAIN);
intent.setClass(this, PreferencesActivity.class);
startActivityForResult(intent, SETTINGS_ACTIVITY);
if (FragmentsAvailable.SETTINGS.isRightOf(currentFragment)) {
overridePendingTransition(R.anim.slide_in_right_to_left, R.anim.slide_out_right_to_left);
} else {
overridePendingTransition(R.anim.slide_in_left_to_right, R.anim.slide_out_left_to_right);
}
// }
}
else if (id == R.id.chat) {
@ -526,6 +535,10 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
return isInCallLayout;
}
public FragmentsAvailable getCurrentFragment() {
return currentFragment;
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (resultCode == Activity.RESULT_FIRST_USER && requestCode == SETTINGS_ACTIVITY) {
@ -577,6 +590,15 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
displayChat(sipUri);
}
}
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK && currentFragment == FragmentsAvailable.DIALER) {
if (LinphoneUtils.onKeyBackGoHome(this, keyCode, event)) {
return true;
}
}
return super.onKeyDown(keyCode, event);
}
}
interface ContactPicked {

20
src/org/linphone/LinphonePreferencesActivity.java
View file

@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import android.content.Intent;
import android.os.Bundle;
import android.preference.PreferenceActivity;
import android.view.KeyEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.ImageView;
@ -87,7 +88,7 @@ public class LinphonePreferencesActivity extends PreferenceActivity implements O
Intent intent = new Intent();
intent.putExtra("FragmentToDisplay", newFragment);
setResult(RESULT_FIRST_USER, intent);
finish();
finishWithCustomAnimation(newFragment);
}
}
@ -110,4 +111,21 @@ public class LinphonePreferencesActivity extends PreferenceActivity implements O
missedCalls.setVisibility(View.GONE);
}
}
private void finishWithCustomAnimation(FragmentsAvailable newFragment) {
finish();
if (FragmentsAvailable.SETTINGS.isRightOf(newFragment)) {
overridePendingTransition(R.anim.slide_in_left_to_right, R.anim.slide_out_left_to_right);
} else {
overridePendingTransition(R.anim.slide_in_right_to_left, R.anim.slide_out_right_to_left);
}
}
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
finishWithCustomAnimation(LinphoneActivity.instance().getCurrentFragment());
return true;
}
return super.onKeyDown(keyCode, event);
}
}