X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=905998c20cf66e031a58838d5e41bcd8a9d85aa7;hp=6a290685636cbf04bb730638d7e5b2db3e545fb2;hb=1e53ced879bdeb01834b6fa092015b58d1d1cd69;hpb=dbbdc8443ad87659433bdb9239cfb3e2732ef2cf diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java index 6a290685..905998c2 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java @@ -22,7 +22,6 @@ import android.content.pm.PackageInfo; import android.content.pm.ShortcutInfo; import android.content.pm.ShortcutManager; import android.content.res.ColorStateList; -import android.content.res.Resources; import android.graphics.Color; import android.graphics.drawable.Icon; import android.os.AsyncTask; @@ -143,7 +142,8 @@ public class MainActivity extends ProfileThemedActivity { barDrawerToggle = null; if (mViewPager != null) mViewPager.removeOnPageChangeListener(pageChangeListener); pageChangeListener = null; - if (mProfileListAdapter != null) mProfileListAdapter.deleteEditingProfilesObserver(editingProfilesObserver); + if (mProfileListAdapter != null) + mProfileListAdapter.deleteEditingProfilesObserver(editingProfilesObserver); editingProfilesObserver = null; super.onDestroy(); } @@ -189,8 +189,8 @@ public class MainActivity extends ProfileThemedActivity { } if (barDrawerToggle == null) { - barDrawerToggle = new ActionBarDrawerToggle(this, drawer, mToolbar, R.string.navigation_drawer_open, - R.string.navigation_drawer_close); + barDrawerToggle = new ActionBarDrawerToggle(this, drawer, mToolbar, + R.string.navigation_drawer_open, R.string.navigation_drawer_close); drawer.addDrawerListener(barDrawerToggle); } barDrawerToggle.syncState(); @@ -227,7 +227,8 @@ public class MainActivity extends ProfileThemedActivity { markDrawerItemCurrent(R.id.nav_latest_transactions); break; default: - Log.e("MainActivity", String.format("Unexpected page index %d", position)); + Log.e("MainActivity", + String.format("Unexpected page index %d", position)); } super.onPageSelected(position); @@ -311,6 +312,9 @@ public class MainActivity extends ProfileThemedActivity { drawer.addDrawerListener(drawerListener); } + findViewById(R.id.nav_profile_list_head_layout) + .setOnClickListener(this::navProfilesHeadClicked); + findViewById(R.id.nav_profiles_label).setOnClickListener(this::navProfilesHeadClicked); setupProfile(); onProfileChanged(null); @@ -328,7 +332,8 @@ public class MainActivity extends ProfileThemedActivity { } } private void createShortcuts() { - Resources rm = getResources(); + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) return; + List shortcuts = new ArrayList<>(); try (LockHolder lh = Data.profiles.lockForReading()) { for (int i = 0; i < Data.profiles.size(); i++) { @@ -340,8 +345,7 @@ public class MainActivity extends ProfileThemedActivity { .setIcon(Icon.createWithResource(this, R.drawable.svg_thick_plus_white)) .setIntent(new Intent(Intent.ACTION_VIEW, null, this, NewTransactionActivity.class).putExtra("profile_uuid", p.getUuid())) - .setRank(i) - .build(); + .setRank(i).build(); shortcuts.add(si); } }