I2P_Developers/i2p.i2p-bote.android
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use same layout for viewing identities and contacts

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/i2p/bote/android/addressbook/ViewContactFragment.java
View File

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

10
app/src/main/java/i2p/bote/android/config/ViewIdentityFragment.java
View File

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

16
app/src/main/res/layout/fragment_view_identity.xml → app/src/main/res/layout/fragment_view_address.xml
View File

@@ -29,7 +29,7 @@
android:layout_gravity="bottom|center_horizontal"> android:layout_gravity="bottom|center_horizontal">
<ImageView <ImageView
android:id="@+id/identity_picture" android:id="@+id/picture"
android:layout_width="@dimen/toolbar_picture_size" android:layout_width="@dimen/toolbar_picture_size"
android:layout_height="@dimen/toolbar_picture_size" android:layout_height="@dimen/toolbar_picture_size"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
@@ -44,8 +44,8 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/listitem_horizontal_margin" android:layout_marginLeft="@dimen/listitem_horizontal_margin"
android:layout_marginStart="@dimen/listitem_horizontal_margin" android:layout_marginStart="@dimen/listitem_horizontal_margin"
android:layout_toEndOf="@id/identity_picture" android:layout_toEndOf="@id/picture"
android:layout_toRightOf="@id/identity_picture" android:layout_toRightOf="@id/picture"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
@@ -79,14 +79,14 @@
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/title_key_info" android:id="@+id/title_address_info"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Key information" android:text="Address information"
android:textAppearance="@style/TextAppearance.AppCompat.Subject"/> android:textAppearance="@style/TextAppearance.AppCompat.Subject"/>
<TextView <TextView
android:id="@+id/crypto_impl" android:id="@+id/crypto_impl_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
@@ -94,14 +94,14 @@
android:textAppearance="@style/TextAppearance.AppCompat.Primary"/> android:textAppearance="@style/TextAppearance.AppCompat.Primary"/>
<ImageView <ImageView
android:id="@+id/key_qr_code" android:id="@+id/email_dest_qr_code"
android:layout_width="200dp" android:layout_width="200dp"
android:layout_height="200dp" android:layout_height="200dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp"/> android:layout_marginTop="8dp"/>
<TextView <TextView
android:id="@+id/key" android:id="@+id/email_dest"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"

122
app/src/main/res/layout/fragment_view_contact.xml
View File

@@ -1,122 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.Toolbar
android:id="@+id/main_toolbar"
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height_with_picture"
android:background="?attr/colorPrimary"
android:minHeight="?attr/actionBarSize"
app:contentInsetEnd="0dp"
app:contentInsetStart="0dp"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
<RelativeLayout
android:id="@+id/picture_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal">
<ImageView
android:id="@+id/contact_picture"
android:layout_width="@dimen/toolbar_picture_size"
android:layout_height="@dimen/toolbar_picture_size"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:scaleType="centerCrop"
android:src="@drawable/ic_contact_picture"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/listitem_horizontal_margin"
android:layout_marginStart="@dimen/listitem_horizontal_margin"
android:layout_toEndOf="@id/contact_picture"
android:layout_toRightOf="@id/contact_picture"
android:orientation="vertical">
<TextView
android:id="@+id/contact_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/public_name"
android:textAppearance="@style/TextAppearance.AppCompat.Headline.Inverse"/>
<TextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/description"
android:textAppearance="@style/TextAppearance.AppCompat.Secondary.Inverse"/>
</LinearLayout>
</RelativeLayout>
</android.support.v7.widget.Toolbar>
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/title_key_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Address information"
android:textAppearance="@style/TextAppearance.AppCompat.Subject"/>
<TextView
android:id="@+id/crypto_impl"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/title_key_info"
android:layout_marginTop="8dp"
android:text="Crypto implementation"
android:textAppearance="@style/TextAppearance.AppCompat.Primary"/>
<TextView
android:id="@+id/destination"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/crypto_impl"
android:layout_marginTop="8dp"
android:text="Destination"
android:textAppearance="@style/TextAppearance.AppCompat.Secondary"/>
<TextView
android:id="@+id/title_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/destination"
android:layout_marginTop="8dp"
android:text="Fingerprint"
android:textAppearance="@style/TextAppearance.AppCompat.Subject"
android:visibility="gone"/>
<TextView
android:id="@+id/fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/title_fingerprint"
android:layout_marginTop="8dp"
android:text="Fingerprint"
android:textAppearance="@style/TextAppearance.AppCompat.Primary"
android:visibility="gone"/>
</RelativeLayout>
</ScrollView>
</LinearLayout>