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

View identity: layout changes, removed ShareActionProvider (for now)

Browse Source
This commit is contained in:
str4d
2014-11-18 01:58:22 +00:00
parent c8683aeccd
commit 70c20f0da3
6 changed files with 158 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/i2p/bote/android/config/ViewIdentityActivity.java
View File

@@ -19,19 +19,11 @@ public class ViewIdentityActivity extends ActionBarActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_toolbar);
// Initialize I2P settings
InitActivities init = new InitActivities(this);
init.initialize();
// Set the action bar
Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
setSupportActionBar(toolbar);
// Enable ActionBar app icon to behave as action to go back
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
if (savedInstanceState == null) {
String key = null;
Bundle args = getIntent().getExtras();
@@ -39,7 +31,7 @@ public class ViewIdentityActivity extends ActionBarActivity {
key = args.getString(ViewIdentityFragment.IDENTITY_KEY);
ViewIdentityFragment f = ViewIdentityFragment.newInstance(key);
getSupportFragmentManager().beginTransaction()
.add(R.id.container, f).commit();
.add(android.R.id.content, f).commit();
}
// NFC send only works on API 10+
@@ -69,7 +61,7 @@ public class ViewIdentityActivity extends ActionBarActivity {
private NdefMessage getNdefMessage() {
ViewIdentityFragment f = (ViewIdentityFragment) getSupportFragmentManager()
.findFragmentById(R.id.container);
.findFragmentById(android.R.id.content);
return f.createNdefMessage();
}

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

@@ -12,8 +12,8 @@ import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.view.MenuItemCompat;
import android.support.v7.widget.ShareActionProvider;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@@ -40,6 +40,7 @@ public class ViewIdentityFragment extends Fragment {
private String mKey;
private EmailIdentity mIdentity;
Toolbar mToolbar;
ImageView mIdentityPicture;
TextView mNameField;
TextView mDescField;
@@ -74,6 +75,7 @@ public class ViewIdentityFragment extends Fragment {
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
mToolbar = (Toolbar) view.findViewById(R.id.main_toolbar);
mIdentityPicture = (ImageView) view.findViewById(R.id.identity_picture);
mNameField = (TextView) view.findViewById(R.id.public_name);
mDescField = (TextView) view.findViewById(R.id.description);
@@ -98,6 +100,18 @@ public class ViewIdentityFragment extends Fragment {
}
}
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
ActionBarActivity activity = ((ActionBarActivity)getActivity());
// Set the action bar
activity.setSupportActionBar(mToolbar);
// Enable ActionBar app icon to behave as action to go back
activity.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
@Override
public void onResume() {
super.onResume();
@@ -112,7 +126,12 @@ public class ViewIdentityFragment extends Fragment {
}
mNameField.setText(mIdentity.getPublicName());
mDescField.setText(mIdentity.getDescription());
if (mIdentity.getDescription().isEmpty())
mDescField.setVisibility(View.GONE);
else {
mDescField.setText(mIdentity.getDescription());
mDescField.setVisibility(View.VISIBLE);
}
try {
String locale = getActivity().getResources().getConfiguration().locale.getLanguage();
mFingerprintField.setText(BoteHelper.getFingerprint(mIdentity, locale));
@@ -136,17 +155,6 @@ public class ViewIdentityFragment extends Fragment {
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
inflater.inflate(R.menu.view_identity, menu);
MenuItem item = menu.findItem(R.id.menu_item_share);
ShareActionProvider shareActionProvider = (ShareActionProvider) MenuItemCompat.getActionProvider(item);
if (mKey != null) {
Intent shareIntent = new Intent();
shareIntent.setAction(Intent.ACTION_SEND);
shareIntent.putExtra(Intent.EXTRA_TEXT, mKey);
shareIntent.setType("text/plain");
shareActionProvider.setShareIntent(shareIntent);
}
}
@Override

219
app/src/main/res/layout/fragment_view_identity.xml
View File

@@ -1,111 +1,138 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<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:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin">
android:orientation="vertical">
<RelativeLayout
<android.support.v7.widget.Toolbar
android:id="@+id/main_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
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="96dp"
android:layout_height="96dp"
android:layout_centerHorizontal="true"
android:background="@drawable/picture_background">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal">
<ImageView
android:id="@+id/identity_picture"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_centerHorizontal="true"
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:background="@color/background_material_light"
android:scaleType="centerCrop"
android:src="@drawable/ic_contact_picture" />
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/identity_picture"
android:layout_toRightOf="@id/identity_picture"
android:orientation="vertical">
<TextView
android:id="@+id/public_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/description"
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:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:text="Key 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_alignParentLeft="true"
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/key"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/crypto_impl"
android:layout_marginTop="8dp"
android:text="Key"
android:textAppearance="@style/TextAppearance.AppCompat.Secondary"/>
<TextView
android:id="@+id/title_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@id/key"
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_alignParentLeft="true"
android:layout_below="@+id/title_fingerprint"
android:layout_marginTop="8dp"
android:text="Fingerprint"
android:textAppearance="@style/TextAppearance.AppCompat.Primary"
android:visibility="gone"/>
<Button
android:id="@+id/generate_qr"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/fingerprint"
android:layout_marginTop="8dp"
android:text="Generate QR code"/>
</RelativeLayout>
<TextView
android:id="@+id/public_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/picture_layout"
android:layout_marginTop="8dp"
android:ems="10"
android:gravity="center_horizontal"
android:text="@string/public_name"
android:textSize="20dp" />
<TextView
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/public_name"
android:layout_marginTop="5dp"
android:ems="10"
android:gravity="center_horizontal"
android:text="@string/description" />
<TextView
android:id="@+id/title_key_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@id/description"
android:layout_marginTop="5dp"
android:text="Key information"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/crypto_impl"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/title_key_info"
android:layout_marginTop="5dp"
android:text="Crypto implementation" />
<TextView
android:id="@+id/key"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/crypto_impl"
android:layout_marginTop="5dp"
android:text="Key" />
<TextView
android:id="@+id/title_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@id/key"
android:layout_marginTop="5dp"
android:text="Fingerprint"
android:textAppearance="?android:attr/textAppearanceMedium"
android:visibility="gone" />
<TextView
android:id="@+id/fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/title_fingerprint"
android:layout_marginTop="5dp"
android:text="Fingerprint"
android:visibility="gone" />
<Button
android:id="@+id/generate_qr"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/fingerprint"
android:layout_marginTop="5dp"
android:text="Generate QR code" />
</RelativeLayout>
</ScrollView>
</ScrollView>
</LinearLayout>

6
app/src/main/res/menu/view_identity.xml
View File

@@ -2,12 +2,6 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:i2pandroid="http://schemas.android.com/apk/res-auto" >
<item
android:id="@+id/menu_item_share"
android:title="@string/share"
i2pandroid:showAsAction="ifRoom"
i2pandroid:actionProviderClass="android.support.v7.widget.ShareActionProvider"/>
<item
android:id="@+id/action_edit_identity"
android:icon="@drawable/ic_create_white_24dp"

3
app/src/main/res/values/dimens.xml
View File

@@ -3,6 +3,9 @@
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="toolbar_height_with_picture">120dp</dimen>
<dimen name="toolbar_picture_size">64dp</dimen>
<dimen name="nav_max_width">320dp</dimen>
<dimen name="nav_horizontal_margin">16dp</dimen>
<dimen name="nav_entry_height">48dp</dimen>

8
app/src/main/res/values/styles.xml
View File

@@ -20,6 +20,10 @@
<!-- The rest of your attributes -->
</style>
<style name="TextAppearance.AppCompat.Headline.Inverse" parent="TextAppearance.AppCompat.Headline">
<item name="android:textColor">@color/primary_text_default_material_dark</item>
</style>
<style name="TextAppearance.AppCompat.Primary" parent="TextAppearance.AppCompat.Body1">
<item name="android:textColor">@color/primary_text_default_material_light</item>
<item name="android:textSize">@dimen/text_size_primary</item>
@@ -34,6 +38,10 @@
<item name="android:textSize">@dimen/text_size_secondary</item>
</style>
<style name="TextAppearance.AppCompat.Secondary.Inverse" parent="TextAppearance.AppCompat.Secondary">
<item name="android:textColor">@color/secondary_text_default_material_dark</item>
</style>
<style name="Divider">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">1dp</item>