Use same layout for viewing identities and contacts

This commit is contained in:
str4d
2014-11-25 04:12:06 +00:00
parent 03ecb06475
commit f16c90d8d1
4 changed files with 19 additions and 141 deletions

View File

@@ -64,7 +64,7 @@ public class ViewContactFragment extends Fragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
return inflater.inflate(R.layout.fragment_view_contact, container, false);
return inflater.inflate(R.layout.fragment_view_address, container, false);
}
@Override
@@ -72,11 +72,11 @@ public class ViewContactFragment extends Fragment {
super.onViewCreated(view, savedInstanceState);
mToolbar = (Toolbar) view.findViewById(R.id.main_toolbar);
mContactPicture = (ImageView) view.findViewById(R.id.contact_picture);
mNameField = (TextView) view.findViewById(R.id.contact_name);
mTextField = (TextView) view.findViewById(R.id.text);
mCryptoField = (TextView) view.findViewById(R.id.crypto_impl);
mDestinationField = (TextView) view.findViewById(R.id.destination);
mContactPicture = (ImageView) view.findViewById(R.id.picture);
mNameField = (TextView) view.findViewById(R.id.public_name);
mTextField = (TextView) view.findViewById(R.id.description);
mCryptoField = (TextView) view.findViewById(R.id.crypto_impl_name);
mDestinationField = (TextView) view.findViewById(R.id.email_dest);
mFingerprintField = (TextView) view.findViewById(R.id.fingerprint);
if (mDestination != null) {

View File

@@ -91,7 +91,7 @@ public class ViewIdentityFragment extends Fragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
return inflater.inflate(R.layout.fragment_view_identity, container, false);
return inflater.inflate(R.layout.fragment_view_address, container, false);
}
@Override
@@ -99,13 +99,13 @@ public class ViewIdentityFragment extends Fragment {
super.onViewCreated(view, savedInstanceState);
mToolbar = (Toolbar) view.findViewById(R.id.main_toolbar);
mIdentityPicture = (ImageView) view.findViewById(R.id.identity_picture);
mIdentityPicture = (ImageView) view.findViewById(R.id.picture);
mNameField = (TextView) view.findViewById(R.id.public_name);
mDescField = (TextView) view.findViewById(R.id.description);
mFingerprintField = (TextView) view.findViewById(R.id.fingerprint);
mCryptoField = (TextView) view.findViewById(R.id.crypto_impl);
mKeyField = (TextView) view.findViewById(R.id.key);
mKeyQrCode = (ImageView) view.findViewById(R.id.key_qr_code);
mCryptoField = (TextView) view.findViewById(R.id.crypto_impl_name);
mKeyField = (TextView) view.findViewById(R.id.email_dest);
mKeyQrCode = (ImageView) view.findViewById(R.id.email_dest_qr_code);
mExpandedQrCode = (ImageView) view.findViewById(R.id.expanded_qr_code);
if (mKey != null) {