diff --git a/src/main/java/fr/unix_experience/owncloud_sms/activities/MainActivity.java b/src/main/java/fr/unix_experience/owncloud_sms/activities/MainActivity.java index 1a99617..8f74294 100644 --- a/src/main/java/fr/unix_experience/owncloud_sms/activities/MainActivity.java +++ b/src/main/java/fr/unix_experience/owncloud_sms/activities/MainActivity.java @@ -39,6 +39,7 @@ import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; import android.view.MenuItem; +import android.view.Window; import android.widget.Toast; import org.json.JSONArray; @@ -66,15 +67,19 @@ public class MainActivity extends AppCompatActivity MainActivity.mConnectivityMonitor = new ConnectivityMonitor(getApplicationContext()); } - super.onCreate(savedInstanceState); + requestWindowFeature(Window.FEATURE_NO_TITLE); + + super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( this, drawer, null, R.string.navigation_drawer_open, R.string.navigation_drawer_close); - drawer.setDrawerListener(toggle); + assert drawer != null; + drawer.addDrawerListener(toggle); toggle.syncState(); NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view); + assert navigationView != null; navigationView.setNavigationItemSelectedListener(this); drawer.openDrawer(GravityCompat.START); @@ -83,6 +88,7 @@ public class MainActivity extends AppCompatActivity @Override public void onBackPressed() { DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); + assert drawer != null; if (drawer.isDrawerOpen(GravityCompat.START)) { drawer.closeDrawer(GravityCompat.START); } else { @@ -104,6 +110,7 @@ public class MainActivity extends AppCompatActivity case R.id.nav_appinfo_perms: res = openAppInfos(); break; } DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); + assert drawer != null; drawer.closeDrawer(GravityCompat.START); return res; } diff --git a/src/main/java/fr/unix_experience/owncloud_sms/activities/OCSMSSettingsActivity.java b/src/main/java/fr/unix_experience/owncloud_sms/activities/OCSMSSettingsActivity.java index 090c075..3a9fba9 100644 --- a/src/main/java/fr/unix_experience/owncloud_sms/activities/OCSMSSettingsActivity.java +++ b/src/main/java/fr/unix_experience/owncloud_sms/activities/OCSMSSettingsActivity.java @@ -41,23 +41,23 @@ public class OCSMSSettingsActivity extends VirtualSettingsActivity { @Override protected void onPostCreate(Bundle savedInstanceState) { - _accountMgr = AccountManager.get(getBaseContext()); - _accountAuthority = getString(R.string.account_authority); - _accountType = getString(R.string.account_type); - _prefsRessourceFile = R.xml.pref_data_sync; + OCSMSSettingsActivity._accountMgr = AccountManager.get(getBaseContext()); + OCSMSSettingsActivity._accountAuthority = getString(R.string.account_authority); + OCSMSSettingsActivity._accountType = getString(R.string.account_type); + VirtualSettingsActivity._prefsRessourceFile = R.xml.pref_data_sync; // Bind our boolean preferences - _boolPrefs.add(new BindObjectPref("push_on_receive", DefaultPrefs.pushOnReceive)); - _boolPrefs.add(new BindObjectPref("sync_wifi", DefaultPrefs.syncWifi)); - _boolPrefs.add(new BindObjectPref("sync_4g", DefaultPrefs.sync4G)); - _boolPrefs.add(new BindObjectPref("sync_3g", DefaultPrefs.sync3G)); - _boolPrefs.add(new BindObjectPref("sync_gprs", DefaultPrefs.syncGPRS)); - _boolPrefs.add(new BindObjectPref("sync_2g", DefaultPrefs.sync2G)); - _boolPrefs.add(new BindObjectPref("sync_others", DefaultPrefs.syncOthers)); + VirtualSettingsActivity._boolPrefs.add(new BindObjectPref("push_on_receive", DefaultPrefs.pushOnReceive)); + VirtualSettingsActivity._boolPrefs.add(new BindObjectPref("sync_wifi", DefaultPrefs.syncWifi)); + VirtualSettingsActivity._boolPrefs.add(new BindObjectPref("sync_4g", DefaultPrefs.sync4G)); + VirtualSettingsActivity._boolPrefs.add(new BindObjectPref("sync_3g", DefaultPrefs.sync3G)); + VirtualSettingsActivity._boolPrefs.add(new BindObjectPref("sync_gprs", DefaultPrefs.syncGPRS)); + VirtualSettingsActivity._boolPrefs.add(new BindObjectPref("sync_2g", DefaultPrefs.sync2G)); + VirtualSettingsActivity._boolPrefs.add(new BindObjectPref("sync_others", DefaultPrefs.syncOthers)); // Bind our string preferences - _stringPrefs.add(new BindObjectPref("sync_frequency", "15")); - _stringPrefs.add(new BindObjectPref("sync_bulk_messages", "-1")); + VirtualSettingsActivity._stringPrefs.add(new BindObjectPref("sync_frequency", "15")); + VirtualSettingsActivity._stringPrefs.add(new BindObjectPref("sync_bulk_messages", "-1")); // Must be at the end, after preference bind super.onPostCreate(savedInstanceState); @@ -69,8 +69,8 @@ public class OCSMSSettingsActivity extends VirtualSettingsActivity { "sync_wifi".equals(key) || "sync_2g".equals(key) || "sync_3g".equals(key) || "sync_gprs".equals(key) || "sync_4g".equals(key) || "sync_others".equals(key)) { - OCSMSSharedPrefs prefs = new OCSMSSharedPrefs(_context); - Log.d(TAG,"OCSMSSettingsActivity.handleCheckboxPreference: set " + key + " to " + OCSMSSharedPrefs prefs = new OCSMSSharedPrefs(VirtualSettingsActivity._context); + Log.d(OCSMSSettingsActivity.TAG,"OCSMSSettingsActivity.handleCheckboxPreference: set " + key + " to " + value.toString()); prefs.putBoolean(key, value); } @@ -87,19 +87,19 @@ public class OCSMSSettingsActivity extends VirtualSettingsActivity { .setSummary((index >= 0) ? preference.getEntries()[index] : null); - Log.d(TAG, "Modifying listPreference " + key); + Log.d(OCSMSSettingsActivity.TAG, "Modifying listPreference " + key); - OCSMSSharedPrefs prefs = new OCSMSSharedPrefs(_context); + OCSMSSharedPrefs prefs = new OCSMSSharedPrefs(VirtualSettingsActivity._context); // Handle sync frequency change if ("sync_frequency".equals(key)) { - Account[] myAccountList = _accountMgr.getAccountsByType(_accountType); + Account[] myAccountList = OCSMSSettingsActivity._accountMgr.getAccountsByType(OCSMSSettingsActivity._accountType); long syncFreq = Long.parseLong(value); // Get ownCloud SMS account list for (Account acct: myAccountList) { // And get all authorities for this account - List syncList = ContentResolver.getPeriodicSyncs(acct, _accountAuthority); + List syncList = ContentResolver.getPeriodicSyncs(acct, OCSMSSettingsActivity._accountAuthority); boolean foundSameSyncCycle = false; for (PeriodicSync ps: syncList) { @@ -112,9 +112,9 @@ public class OCSMSSettingsActivity extends VirtualSettingsActivity { Bundle b = new Bundle(); b.putInt("synctype", 1); - ContentResolver.removePeriodicSync(acct, _accountAuthority, b); + ContentResolver.removePeriodicSync(acct, OCSMSSettingsActivity._accountAuthority, b); if (syncFreq > 0) { - ContentResolver.addPeriodicSync(acct, _accountAuthority, b, syncFreq * 60); + ContentResolver.addPeriodicSync(acct, OCSMSSettingsActivity._accountAuthority, b, syncFreq * 60); } } diff --git a/src/main/res/layout/activity_main.xml b/src/main/res/layout/activity_main.xml index 864713a..c701829 100644 --- a/src/main/res/layout/activity_main.xml +++ b/src/main/res/layout/activity_main.xml @@ -55,6 +55,7 @@ android:layout_height="wrap_content" android:gravity="top" android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_below="@+id/main_title_welcome" android:text="@string/ma_content_welcome" android:textAppearance="?android:attr/textAppearanceMedium" /> @@ -67,6 +68,7 @@ android:layout_height="wrap_content" android:gravity="top" android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_below="@+id/main_tv_welcome" android:text="@string/ma_content_swipeaction" android:textAppearance="?android:attr/textAppearanceMedium" />