yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 09:49:21 +02:00
Code Issues Releases Wiki Activity

use profile fast-animation only for the chat-profile, not for contact-profiles in groups

Browse source
This commit is contained in:
B. Petersen 2019-05-25 00:49:32 +02:00
parent 1edf6c4db3
commit 5028ae6e82
No known key found for this signature in database
GPG key ID: 3B88E92DEA8E9AFC
4 changed files with 15 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

9
res/anim/fade_in.xml
View file

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/decelerate_interpolator">
<alpha
android:duration="150"
android:fromAlpha="0.3"
android:toAlpha="1.0" />
</set>

9
res/anim/fade_out.xml
View file

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/decelerate_interpolator">
<alpha
android:duration="150"
android:fromAlpha="1.0"
android:toAlpha="0.3" />
</set>

3
src/org/thoughtcrime/securesms/ConversationActivity.java
View file

@ -541,8 +541,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
if(chatId != DcChat.DC_CHAT_ID_DEADDROP) { if(chatId != DcChat.DC_CHAT_ID_DEADDROP) {
Intent intent = new Intent(this, ProfileActivity.class); Intent intent = new Intent(this, ProfileActivity.class);
intent.putExtra(ProfileActivity.CHAT_ID_EXTRA, chatId); intent.putExtra(ProfileActivity.CHAT_ID_EXTRA, chatId);
intent.putExtra(ProfileActivity.FROM_CHAT, true);
startActivity(intent); startActivity(intent);
overridePendingTransition(R.anim.fade_in, R.anim.fade_out); overridePendingTransition(0, 0);
} }
} }

15
src/org/thoughtcrime/securesms/ProfileActivity.java
View file

@ -45,6 +45,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
public static final String CHAT_ID_EXTRA = "chat_id"; public static final String CHAT_ID_EXTRA = "chat_id";
public static final String CONTACT_ID_EXTRA = "contact_id"; public static final String CONTACT_ID_EXTRA = "contact_id";
public static final String FORCE_TAB_EXTRA = "force_tab"; public static final String FORCE_TAB_EXTRA = "force_tab";
public static final String FROM_CHAT = "from_chat";
public static final int TAB_SETTINGS = 10; public static final int TAB_SETTINGS = 10;
public static final int TAB_GALLERY = 20; public static final int TAB_GALLERY = 20;
@ -61,6 +62,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
private int chatId; private int chatId;
private boolean chatIsGroup; private boolean chatIsGroup;
private int contactId; private int contactId;
private boolean fromChat;
private ArrayList<Integer> tabs = new ArrayList<>(); private ArrayList<Integer> tabs = new ArrayList<>();
private Toolbar toolbar; private Toolbar toolbar;
@ -146,11 +148,18 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
dynamicLanguage.onResume(this); dynamicLanguage.onResume(this);
} }
boolean backPressed = false;
@Override
public void onBackPressed() {
backPressed = true;
super.onBackPressed();
}
@Override @Override
protected void onPause() { protected void onPause() {
super.onPause(); super.onPause();
if (isFinishing()) { if (backPressed && fromChat) {
overridePendingTransition(R.anim.fade_in, R.anim.fade_out); overridePendingTransition(0, 0);
} }
} }
@ -169,6 +178,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
chatId = getIntent().getIntExtra(CHAT_ID_EXTRA, 0); chatId = getIntent().getIntExtra(CHAT_ID_EXTRA, 0);
contactId = getIntent().getIntExtra(CONTACT_ID_EXTRA, 0); contactId = getIntent().getIntExtra(CONTACT_ID_EXTRA, 0);
chatIsGroup = false; chatIsGroup = false;
fromChat = getIntent().getBooleanExtra(FROM_CHAT, false);
if (contactId!=0) { if (contactId!=0) {
chatId = dcContext.getChatIdByContactId(contactId); chatId = dcContext.getChatIdByContactId(contactId);
@ -305,6 +315,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
switch (item.getItemId()) { switch (item.getItemId()) {
case android.R.id.home: case android.R.id.home:
backPressed = true;
finish(); finish();
return true; return true;
case R.id.menu_mute_notifications: case R.id.menu_mute_notifications: