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

Consistent titles

Browse Source
This commit is contained in:
str4d
2014-12-17 02:33:56 +00:00
parent 05f277b550
commit 3abc522157
9 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/i2p/bote/android/NetworkInfoActivity.java
View File

@@ -9,7 +9,6 @@ public class NetworkInfoActivity extends ActionBarActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_toolbar);
setTitle(R.string.network_status);
// Initialize I2P settings
InitActivities init = new InitActivities(this);

1
app/src/main/java/i2p/bote/android/NewEmailActivity.java
View File

@@ -11,7 +11,6 @@ public class NewEmailActivity extends ActionBarActivity implements
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_toolbar);
setTitle(R.string.compose);
// Initialize I2P settings
InitActivities init = new InitActivities(this);

1
app/src/main/java/i2p/bote/android/addressbook/AddressBookActivity.java
View File

@@ -21,7 +21,6 @@ public class AddressBookActivity extends ActionBarActivity implements
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_toolbar);
setTitle(R.string.address_book);
// Initialize I2P settings
InitActivities init = new InitActivities(this);

2
app/src/main/java/i2p/bote/android/addressbook/EditContactActivity.java
View File

@@ -44,6 +44,8 @@ public class EditContactActivity extends ActionBarActivity {
destination = args.getString(EditContactFragment.CONTACT_DESTINATION);
f = EditContactFragment.newInstance(destination);
}
if (destination != null)
getSupportActionBar().setDisplayShowTitleEnabled(false);
} else
f = EditContactFragment.newInstance(null);
getSupportFragmentManager().beginTransaction()

2
app/src/main/java/i2p/bote/android/config/EditIdentityActivity.java
View File

@@ -30,6 +30,8 @@ public class EditIdentityActivity extends ActionBarActivity implements
Bundle args = getIntent().getExtras();
if (args != null)
key = args.getString(EditIdentityFragment.IDENTITY_KEY);
if (key != null)
getSupportActionBar().setDisplayShowTitleEnabled(false);
EditIdentityFragment f = EditIdentityFragment.newInstance(key);
getSupportFragmentManager().beginTransaction()
.add(R.id.edit_identity_frag, f).commit();

19
app/src/main/java/i2p/bote/android/config/IdentityShipFragment.java
View File

@@ -10,11 +10,9 @@ import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
@@ -83,6 +81,12 @@ public abstract class IdentityShipFragment extends Fragment {
mError = (TextView) view.findViewById(R.id.error);
}
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
getActivity().setTitle(getTitle());
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == SHIP_WAITER) {
@@ -97,6 +101,7 @@ public abstract class IdentityShipFragment extends Fragment {
}
}
protected abstract int getTitle();
protected abstract void setInterfaceEnabled(boolean enabled);
public static class ShipWaiterFrag extends TaskFragment<Object, String, String> {
@@ -238,6 +243,11 @@ public abstract class IdentityShipFragment extends Fragment {
.commit();
}
@Override
protected int getTitle() {
return R.string.export_identities;
}
@Override
protected void setInterfaceEnabled(boolean enabled) {
mExportFilename.setEnabled(enabled);
@@ -365,6 +375,11 @@ public abstract class IdentityShipFragment extends Fragment {
.commit();
}
@Override
protected int getTitle() {
return R.string.import_identities;
}
@Override
protected void setInterfaceEnabled(boolean enabled) {
mPassword.setEnabled(enabled);

1
app/src/main/java/i2p/bote/android/config/SetPasswordActivity.java
View File

@@ -12,7 +12,6 @@ public class SetPasswordActivity extends ActionBarActivity implements
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setTitle(R.string.pref_title_change_password);
setContentView(R.layout.activity_set_password);
// Initialize I2P settings