Address review comments

This commit is contained in:
Torsten Grote
2016-12-09 14:40:20 -02:00
parent e3dcc62509
commit 3df3d19a07
9 changed files with 25 additions and 13 deletions

View File

@@ -98,7 +98,7 @@ public class KeyAgreementActivity extends BriarActivity implements
@Override @Override
public void showNextScreen() { public void showNextScreen() {
// FIXME with #288 // FIXME #824
// showNextFragment(ShowQrCodeFragment.newInstance()); // showNextFragment(ShowQrCodeFragment.newInstance());
BaseFragment f = ShowQrCodeFragment.newInstance(); BaseFragment f = ShowQrCodeFragment.newInstance();
getSupportFragmentManager().beginTransaction() getSupportFragmentManager().beginTransaction()

View File

@@ -42,7 +42,8 @@ public class PasswordActivity extends BaseActivity {
@Override @Override
public void onCreate(Bundle state) { public void onCreate(Bundle state) {
super.onCreate(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()) { if (!passwordController.accountExists()) {
deleteAccount(); deleteAccount();
@@ -134,6 +135,8 @@ public class PasswordActivity extends BaseActivity {
if (result) { if (result) {
setResult(RESULT_OK); setResult(RESULT_OK);
supportFinishAfterTransition(); supportFinishAfterTransition();
// don't show closing animation,
// but one for opening NavDrawerActivity
overridePendingTransition(R.anim.screen_new_in, overridePendingTransition(R.anim.screen_new_in,
R.anim.screen_old_out); R.anim.screen_old_out);
} else { } else {

View File

@@ -50,7 +50,8 @@ public class SetupActivity extends BaseActivity implements OnClickListener,
@Override @Override
public void onCreate(Bundle state) { public void onCreate(Bundle state) {
super.onCreate(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); setContentView(R.layout.activity_setup);
nicknameEntryWrapper = nicknameEntryWrapper =

View File

@@ -230,9 +230,9 @@ public class NavDrawerActivity extends BriarActivity implements
boolean isAddedToBackStack) { boolean isAddedToBackStack) {
FragmentTransaction trans = FragmentTransaction trans =
getSupportFragmentManager().beginTransaction() getSupportFragmentManager().beginTransaction()
.setCustomAnimations(R.anim.dialog_in, .setCustomAnimations(R.anim.fade_in,
R.anim.dialog_out, R.anim.dialog_in, R.anim.fade_out, R.anim.fade_in,
R.anim.dialog_out) R.anim.fade_out)
.replace(R.id.fragmentContainer, fragment, .replace(R.id.fragmentContainer, fragment,
fragment.getUniqueTag()); fragment.getUniqueTag());
if (isAddedToBackStack) { if (isAddedToBackStack) {
@@ -290,10 +290,12 @@ public class NavDrawerActivity extends BriarActivity implements
public View getView(int position, View convertView, public View getView(int position, View convertView,
ViewGroup parent) { ViewGroup parent) {
View view; View view;
if (convertView != null) view = convertView; if (convertView != null) {
else view = view = convertView;
inflater.inflate(R.layout.list_item_transport, parent, } else {
false); view = inflater.inflate(R.layout.list_item_transport,
parent, false);
}
Transport t = getItem(position); Transport t = getItem(position);
int c; int c;

View File

@@ -65,7 +65,6 @@ public class CreateGroupActivity extends BaseGroupInviteActivity implements
} }
private void switchToContactSelectorFragment(GroupId g) { private void switchToContactSelectorFragment(GroupId g) {
setTitle(R.string.groups_invite_members);
showNextFragment(GroupInviteFragment.newInstance(g)); showNextFragment(GroupInviteFragment.newInstance(g));
} }

View File

@@ -5,6 +5,7 @@ import android.os.Bundle;
import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.briar.R;
import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.contactselection.ContactSelectorController; import org.briarproject.briar.android.contactselection.ContactSelectorController;
import org.briarproject.briar.android.contactselection.ContactSelectorFragment; import org.briarproject.briar.android.contactselection.ContactSelectorFragment;
@@ -31,6 +32,12 @@ public class GroupInviteFragment extends ContactSelectorFragment {
return fragment; return fragment;
} }
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getActivity().setTitle(R.string.groups_invite_members);
}
@Override @Override
public void injectFragment(ActivityComponent component) { public void injectFragment(ActivityComponent component) {
component.inject(this); component.inject(this);

View File

@@ -63,8 +63,8 @@
</style> </style>
<style name="DialogAnimation" parent="@android:style/Animation.Dialog"> <style name="DialogAnimation" parent="@android:style/Animation.Dialog">
<item name="android:windowEnterAnimation">@anim/dialog_in</item> <item name="android:windowEnterAnimation">@anim/fade_in</item>
<item name="android:windowExitAnimation">@anim/dialog_out</item> <item name="android:windowExitAnimation">@anim/fade_out</item>
</style> </style>
<style name="OnboardingDialogTheme" parent="BriarDialogTheme"> <style name="OnboardingDialogTheme" parent="BriarDialogTheme">