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

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

Browse Source
This commit is contained in:
str4d
2014-11-18 02:11:25 +00:00
parent c1e9d8ae27
commit 492218884b
4 changed files with 125 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/i2p/bote/android/addressbook/ViewContactActivity.java
View File

@@ -7,7 +7,6 @@ import android.nfc.NfcEvent;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.widget.Toolbar;
import i2p.bote.android.InitActivities;
import i2p.bote.android.R;
@@ -19,19 +18,11 @@ public class ViewContactActivity 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 destination = null;
Bundle args = getIntent().getExtras();
@@ -39,7 +30,7 @@ public class ViewContactActivity extends ActionBarActivity {
destination = args.getString(ViewContactFragment.CONTACT_DESTINATION);
ViewContactFragment f = ViewContactFragment.newInstance(destination);
getSupportFragmentManager().beginTransaction()
.add(R.id.container, f).commit();
.add(android.R.id.content, f).commit();
}
// NFC send only works on API 10+
@@ -69,7 +60,7 @@ public class ViewContactActivity extends ActionBarActivity {
private NdefMessage getNdefMessage() {
ViewContactFragment f = (ViewContactFragment) getSupportFragmentManager()
.findFragmentById(R.id.container);
.findFragmentById(android.R.id.content);
return f.createNdefMessage();
}

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

@@ -12,15 +12,14 @@ 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;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
@@ -38,6 +37,7 @@ public class ViewContactFragment extends Fragment {
private String mDestination;
private Contact mContact;
Toolbar mToolbar;
ImageView mContactPicture;
TextView mNameField;
TextView mTextField;
@@ -70,6 +70,7 @@ public class ViewContactFragment extends Fragment {
public void onViewCreated(View view, Bundle savedInstanceState) {
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);
@@ -87,6 +88,18 @@ public class ViewContactFragment 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();
@@ -101,7 +114,12 @@ public class ViewContactFragment extends Fragment {
}
mNameField.setText(mContact.getName());
mTextField.setText(mContact.getText());
if (mContact.getText().isEmpty())
mTextField.setVisibility(View.GONE);
else {
mTextField.setText(mContact.getText());
mTextField.setVisibility(View.VISIBLE);
}
mCryptoField.setText(mContact.getDestination().getCryptoImpl().getName());
mDestinationField.setText(mDestination);
try {
@@ -117,17 +135,6 @@ public class ViewContactFragment extends Fragment {
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
inflater.inflate(R.menu.view_contact, menu);
MenuItem item = menu.findItem(R.id.menu_item_share);
ShareActionProvider shareActionProvider = (ShareActionProvider) MenuItemCompat.getActionProvider(item);
if (mDestination != null) {
Intent shareIntent = new Intent();
shareIntent.setAction(Intent.ACTION_SEND);
shareIntent.putExtra(Intent.EXTRA_TEXT, mDestination);
shareIntent.setType("text/plain");
shareActionProvider.setShareIntent(shareIntent);
}
}
@Override