From 3df3d19a07bc25098c60ffe5cd45a73fc695a921 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 9 Dec 2016 14:40:20 -0200
Subject: [PATCH] Address review comments
---
.../keyagreement/KeyAgreementActivity.java | 2 +-
.../briar/android/login/PasswordActivity.java | 5 ++++-
.../briar/android/login/SetupActivity.java | 3 ++-
.../android/navdrawer/NavDrawerActivity.java | 16 +++++++++-------
.../creation/CreateGroupActivity.java | 1 -
.../creation/GroupInviteFragment.java | 7 +++++++
.../main/res/anim/{dialog_in.xml => fade_in.xml} | 0
.../res/anim/{dialog_out.xml => fade_out.xml} | 0
briar-android/src/main/res/values/themes.xml | 4 ++--
9 files changed, 25 insertions(+), 13 deletions(-)
rename briar-android/src/main/res/anim/{dialog_in.xml => fade_in.xml} (100%)
rename briar-android/src/main/res/anim/{dialog_out.xml => fade_out.xml} (100%)
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java
index 00f9cf900b..446f4d1d43 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java
@@ -98,7 +98,7 @@ public class KeyAgreementActivity extends BriarActivity implements
@Override
public void showNextScreen() {
- // FIXME with #288
+ // FIXME #824
// showNextFragment(ShowQrCodeFragment.newInstance());
BaseFragment f = ShowQrCodeFragment.newInstance();
getSupportFragmentManager().beginTransaction()
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordActivity.java
index a67ac56dee..d5c1da8a4d 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordActivity.java
@@ -42,7 +42,8 @@ public class PasswordActivity extends BaseActivity {
@Override
public void onCreate(Bundle state) {
super.onCreate(state);
- overridePendingTransition(R.anim.dialog_in, R.anim.dialog_out);
+ // fade-in after splash screen instead of default animation
+ overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
if (!passwordController.accountExists()) {
deleteAccount();
@@ -134,6 +135,8 @@ public class PasswordActivity extends BaseActivity {
if (result) {
setResult(RESULT_OK);
supportFinishAfterTransition();
+ // don't show closing animation,
+ // but one for opening NavDrawerActivity
overridePendingTransition(R.anim.screen_new_in,
R.anim.screen_old_out);
} else {
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java
index 1c2ad3c17b..694d78927e 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java
@@ -50,7 +50,8 @@ public class SetupActivity extends BaseActivity implements OnClickListener,
@Override
public void onCreate(Bundle state) {
super.onCreate(state);
- overridePendingTransition(R.anim.dialog_in, R.anim.dialog_out);
+ // fade-in after splash screen instead of default animation
+ overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
setContentView(R.layout.activity_setup);
nicknameEntryWrapper =
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java
index b431582d44..1a5398630e 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java
@@ -230,9 +230,9 @@ public class NavDrawerActivity extends BriarActivity implements
boolean isAddedToBackStack) {
FragmentTransaction trans =
getSupportFragmentManager().beginTransaction()
- .setCustomAnimations(R.anim.dialog_in,
- R.anim.dialog_out, R.anim.dialog_in,
- R.anim.dialog_out)
+ .setCustomAnimations(R.anim.fade_in,
+ R.anim.fade_out, R.anim.fade_in,
+ R.anim.fade_out)
.replace(R.id.fragmentContainer, fragment,
fragment.getUniqueTag());
if (isAddedToBackStack) {
@@ -290,10 +290,12 @@ public class NavDrawerActivity extends BriarActivity implements
public View getView(int position, View convertView,
ViewGroup parent) {
View view;
- if (convertView != null) view = convertView;
- else view =
- inflater.inflate(R.layout.list_item_transport, parent,
- false);
+ if (convertView != null) {
+ view = convertView;
+ } else {
+ view = inflater.inflate(R.layout.list_item_transport,
+ parent, false);
+ }
Transport t = getItem(position);
int c;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupActivity.java
index ba7459628e..0f13bab833 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupActivity.java
@@ -65,7 +65,6 @@ public class CreateGroupActivity extends BaseGroupInviteActivity implements
}
private void switchToContactSelectorFragment(GroupId g) {
- setTitle(R.string.groups_invite_members);
showNextFragment(GroupInviteFragment.newInstance(g));
}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/GroupInviteFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/GroupInviteFragment.java
index 44e03ab61f..8840c9cf01 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/GroupInviteFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/GroupInviteFragment.java
@@ -5,6 +5,7 @@ import android.os.Bundle;
import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId;
+import org.briarproject.briar.R;
import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.contactselection.ContactSelectorController;
import org.briarproject.briar.android.contactselection.ContactSelectorFragment;
@@ -31,6 +32,12 @@ public class GroupInviteFragment extends ContactSelectorFragment {
return fragment;
}
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ getActivity().setTitle(R.string.groups_invite_members);
+ }
+
@Override
public void injectFragment(ActivityComponent component) {
component.inject(this);
diff --git a/briar-android/src/main/res/anim/dialog_in.xml b/briar-android/src/main/res/anim/fade_in.xml
similarity index 100%
rename from briar-android/src/main/res/anim/dialog_in.xml
rename to briar-android/src/main/res/anim/fade_in.xml
diff --git a/briar-android/src/main/res/anim/dialog_out.xml b/briar-android/src/main/res/anim/fade_out.xml
similarity index 100%
rename from briar-android/src/main/res/anim/dialog_out.xml
rename to briar-android/src/main/res/anim/fade_out.xml
diff --git a/briar-android/src/main/res/values/themes.xml b/briar-android/src/main/res/values/themes.xml
index 6f6c98aa8b..2890930d44 100644
--- a/briar-android/src/main/res/values/themes.xml
+++ b/briar-android/src/main/res/values/themes.xml
@@ -63,8 +63,8 @@
</style>
<style name="DialogAnimation" parent="@android:style/Animation.Dialog">
- <item name="android:windowEnterAnimation">@anim/dialog_in</item>
- <item name="android:windowExitAnimation">@anim/dialog_out</item>
+ <item name="android:windowEnterAnimation">@anim/fade_in</item>
+ <item name="android:windowExitAnimation">@anim/fade_out</item>
</style>
<style name="OnboardingDialogTheme" parent="BriarDialogTheme">
--
GitLab