diff --git a/app/src/main/java/i2p/bote/android/config/ViewIdentityActivity.java b/app/src/main/java/i2p/bote/android/config/ViewIdentityActivity.java index ead8d97..c38aa2c 100644 --- a/app/src/main/java/i2p/bote/android/config/ViewIdentityActivity.java +++ b/app/src/main/java/i2p/bote/android/config/ViewIdentityActivity.java @@ -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(); } diff --git a/app/src/main/java/i2p/bote/android/config/ViewIdentityFragment.java b/app/src/main/java/i2p/bote/android/config/ViewIdentityFragment.java index 5a78545..e84f68b 100644 --- a/app/src/main/java/i2p/bote/android/config/ViewIdentityFragment.java +++ b/app/src/main/java/i2p/bote/android/config/ViewIdentityFragment.java @@ -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 diff --git a/app/src/main/res/layout/fragment_view_identity.xml b/app/src/main/res/layout/fragment_view_identity.xml index 68cf707..63adfe0 100644 --- a/app/src/main/res/layout/fragment_view_identity.xml +++ b/app/src/main/res/layout/fragment_view_identity.xml @@ -1,111 +1,138 @@ - + android:orientation="vertical"> - + 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"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom|center_horizontal"> + android:src="@drawable/ic_contact_picture"/> + + + + + + + + + + + + + + + + + + + + + + + + +