cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor BaseActivity

Browse Source
This commit is contained in:
Dominik Schürmann
2015-01-13 23:43:18 +01:00
parent d8ff737fc5
commit 7da3ddae7b
26 changed files with 85 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java
View File

@@ -32,7 +32,13 @@ public abstract class BaseActivity extends ActionBarActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(getLayoutResource());
initLayout();
initToolbar();
}
protected abstract void initLayout();
protected void initToolbar() {
toolbar = (Toolbar) findViewById(R.id.toolbar);
if (toolbar != null) {
setSupportActionBar(toolbar);
@@ -40,8 +46,6 @@ public abstract class BaseActivity extends ActionBarActivity {
}
}
protected abstract int getLayoutResource();
protected void setActionBarIcon(int iconRes) {
toolbar.setNavigationIcon(iconRes);
}

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
View File

@@ -33,8 +33,8 @@ public class CertifyKeyActivity extends BaseActivity {
public static final String EXTRA_CERTIFY_KEY_ID = "certify_key_id";
@Override
protected int getLayoutResource() {
return R.layout.certify_key_activity;
protected void initLayout() {
setContentView(R.layout.certify_key_activity);
}
}

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
View File

@@ -47,8 +47,8 @@ public class CreateKeyActivity extends BaseActivity {
}
@Override
protected int getLayoutResource() {
return R.layout.create_key_activity;
protected void initLayout() {
setContentView(R.layout.create_key_activity);
}
public void loadFragment(Bundle savedInstanceState, Fragment fragment, int action) {

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
View File

@@ -65,8 +65,8 @@ public class DecryptActivity extends DrawerActivity {
}
@Override
protected int getLayoutResource() {
return R.layout.decrypt_activity;
protected void initLayout() {
setContentView(R.layout.decrypt_activity);
}
@TargetApi(VERSION_CODES.HONEYCOMB)

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
View File

@@ -96,9 +96,8 @@ public abstract class DrawerActivity extends BaseActivity {
// enable ActionBar app icon to behave as action to toggle nav drawer
// if the drawer is not locked
if (!mIsDrawerLocked) {
// TODO
// getSupportActionBar().setDisplayHomeAsUpEnabled(true);
// getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setHomeButtonEnabled(true);
}
// ActionBarDrawerToggle ties together the the proper interactions

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
View File

@@ -48,8 +48,8 @@ public class EditKeyActivity extends BaseActivity {
}
@Override
protected int getLayoutResource() {
return R.layout.edit_key_activity;
protected void initLayout() {
setContentView(R.layout.edit_key_activity);
}
private void loadFragment(Bundle savedInstanceState, Uri dataUri, SaveKeyringParcel saveKeyringParcel) {

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java
View File

@@ -326,8 +326,8 @@ public class EncryptFilesActivity extends EncryptActivity implements EncryptActi
}
@Override
protected int getLayoutResource() {
return R.layout.encrypt_files_activity;
protected void initLayout() {
setContentView(R.layout.encrypt_files_activity);
}
@Override

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
View File

@@ -303,8 +303,8 @@ public class EncryptTextActivity extends EncryptActivity implements EncryptActiv
}
@Override
protected int getLayoutResource() {
return R.layout.encrypt_text_activity;
protected void initLayout() {
setContentView(R.layout.encrypt_text_activity);
}
@Override

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java
View File

@@ -73,8 +73,8 @@ public class FirstTimeActivity extends BaseActivity {
}
@Override
protected int getLayoutResource() {
return R.layout.first_time_activity;
protected void initLayout() {
setContentView(R.layout.first_time_activity);
}
@Override

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java
View File

@@ -98,7 +98,7 @@ public class HelpActivity extends BaseActivity {
}
@Override
protected int getLayoutResource() {
return R.layout.help_activity;
protected void initLayout() {
setContentView(R.layout.help_activity);
}
}

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
View File

@@ -102,8 +102,8 @@ public class ImportKeysActivity extends BaseActivity {
}
@Override
protected int getLayoutResource() {
return R.layout.import_keys_activity;
protected void initLayout() {
setContentView(R.layout.import_keys_activity);
}
protected void handleActions(Bundle savedInstanceState, Intent intent) {

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
View File

@@ -65,12 +65,12 @@ public class KeyListActivity extends DrawerActivity {
mExportHelper = new ExportHelper(this);
// now setup navigation drawer in DrawerActivity...
// activateDrawerNavigation(savedInstanceState);
activateDrawerNavigation(savedInstanceState);
}
@Override
protected int getLayoutResource() {
return R.layout.key_list_activity;
protected void initLayout() {
setContentView(R.layout.key_list_activity);
}
@Override

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayActivity.java
View File

@@ -45,8 +45,8 @@ public class LogDisplayActivity extends BaseActivity {
}
@Override
protected int getLayoutResource() {
return R.layout.log_display_activity;
protected void initLayout() {
setContentView(R.layout.log_display_activity);
}
}

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcActivity.java
View File

@@ -122,8 +122,8 @@ public class NfcActivity extends BaseActivity {
}
@Override
protected int getLayoutResource() {
return R.layout.nfc_activity;
protected void initLayout() {
setContentView(R.layout.nfc_activity);
}
/**

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcIntentActivity.java
View File

@@ -88,8 +88,8 @@ public class NfcIntentActivity extends BaseActivity {
}
@Override
protected int getLayoutResource() {
return R.layout.nfc_activity;
protected void initLayout() {
setContentView(R.layout.nfc_activity);
}
/**

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeViewActivity.java
View File

@@ -107,8 +107,8 @@ public class QrCodeViewActivity extends BaseActivity {
}
@Override
protected int getLayoutResource() {
return R.layout.qr_code_activity;
protected void initLayout() {
setContentView(R.layout.qr_code_activity);
}
@Override

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
View File

@@ -95,8 +95,8 @@ public class SafeSlingerActivity extends BaseActivity {
}
@Override
protected int getLayoutResource() {
return R.layout.safe_slinger_activity;
protected void initLayout() {
setContentView(R.layout.safe_slinger_activity);
}
private void startExchange(long masterKeyId, int number) {

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java
View File

@@ -100,8 +100,8 @@ public class SelectPublicKeyActivity extends BaseActivity {
}
@Override
protected int getLayoutResource() {
return R.layout.select_public_key_activity;
protected void initLayout() {
setContentView(R.layout.select_public_key_activity);
}
@Override

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
View File

@@ -85,8 +85,8 @@ public class UploadKeyActivity extends BaseActivity {
}
@Override
protected int getLayoutResource() {
return R.layout.upload_key_activity;
protected void initLayout() {
setContentView(R.layout.upload_key_activity);
}
private void uploadKey() {

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
View File

@@ -111,8 +111,8 @@ public class ViewCertActivity extends BaseActivity
}
@Override
protected int getLayoutResource() {
return R.layout.view_cert_activity;
protected void initLayout() {
setContentView(R.layout.view_cert_activity);
}
@Override

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
View File

@@ -168,8 +168,8 @@ public class ViewKeyActivity extends BaseActivity implements
}
@Override
protected int getLayoutResource() {
return R.layout.view_key_activity;
protected void initLayout() {
setContentView(R.layout.view_key_activity);
}
private void initTabs(Uri dataUri) {

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvancedActivity.java
View File

@@ -68,11 +68,10 @@ public class ViewKeyAdvancedActivity extends BaseActivity {
}
@Override
protected int getLayoutResource() {
return R.layout.view_key_advanced_activity;
protected void initLayout() {
setContentView(R.layout.view_key_advanced_activity);
}
private void startFragment(Bundle savedInstanceState, Uri dataUri) {
// However, if we're being restored from a previous state,
// then we don't need to do anything and should return or else