diff --git a/app/build.gradle b/app/build.gradle index 63373c0ac..df9f0e162 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'kotlin-android' android { compileSdkVersion 27 - buildToolsVersion '27.0.0' + buildToolsVersion '27.0.1' defaultConfig { applicationId "com.keylesspalace.tusky" minSdkVersion 15 @@ -39,10 +39,10 @@ android { } } -ext.supportLibraryVersion = '27.0.0' +ext.supportLibraryVersion = '27.0.1' dependencies { - compile('com.mikepenz:materialdrawer:5.9.5@aar') { + compile('com.mikepenz:materialdrawer:6.0.1@aar') { transitive = true } compile "com.android.support:appcompat-v7:$supportLibraryVersion" @@ -60,7 +60,7 @@ dependencies { compile 'com.pkmmte.view:circularimageview:1.1' compile 'com.github.varunest:sparkbutton:1.0.5' compile 'com.github.chrisbanes:PhotoView:2.1.3' - compile 'com.mikepenz:google-material-typeface:3.0.1.0.original@aar' + compile 'com.mikepenz:google-material-typeface:3.0.1.2.original@aar' compile 'com.theartofdev.edmodo:android-image-cropper:2.5.1' compile 'com.evernote:android-job:1.2.0' implementation 'com.android.support.constraint:constraint-layout:1.0.2' diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java index 663d81a75..33be2ce9d 100644 --- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java @@ -15,7 +15,6 @@ package com.keylesspalace.tusky; -import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Configuration; @@ -97,24 +96,16 @@ public class MainActivity extends BaseActivity implements ActionButtonActivity { TabLayout tabLayout = findViewById(R.id.tab_layout); viewPager = findViewById(R.id.pager); - floatingBtn.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent intent = new Intent(getApplicationContext(), ComposeActivity.class); - startActivityForResult(intent, COMPOSE_RESULT); - } + floatingBtn.setOnClickListener(v -> { + Intent intent = new Intent(getApplicationContext(), ComposeActivity.class); + startActivityForResult(intent, COMPOSE_RESULT); }); setupDrawer(); // Setup the navigation drawer toggle button. ThemeUtils.setDrawableTint(this, drawerToggle.getDrawable(), R.attr.toolbar_icon_tint); - drawerToggle.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - drawer.openDrawer(); - } - }); + drawerToggle.setOnClickListener(v -> drawer.openDrawer()); /* Fetch user info while we're doing other things. This has to be after setting up the * drawer, though, because its callback touches the header in the drawer. */ @@ -302,7 +293,7 @@ public class MainActivity extends BaseActivity implements ActionButtonActivity { DrawerImageLoader.init(new AbstractDrawerImageLoader() { @Override - public void set(ImageView imageView, Uri uri, Drawable placeholder) { + public void set(ImageView imageView, Uri uri, Drawable placeholder, String tag) { Picasso.with(imageView.getContext()).load(uri).placeholder(placeholder).into(imageView); } @@ -338,49 +329,46 @@ public class MainActivity extends BaseActivity implements ActionButtonActivity { .withHasStableIds(true) .withSelectedItem(-1) .addDrawerItems(array) - .withOnDrawerItemClickListener(new Drawer.OnDrawerItemClickListener() { - @Override - public boolean onItemClick(View view, int position, IDrawerItem drawerItem) { - if (drawerItem != null) { - long drawerItemIdentifier = drawerItem.getIdentifier(); + .withOnDrawerItemClickListener((view, position, drawerItem) -> { + if (drawerItem != null) { + long drawerItemIdentifier = drawerItem.getIdentifier(); - if (drawerItemIdentifier == DRAWER_ITEM_EDIT_PROFILE) { - Intent intent = new Intent(MainActivity.this, EditProfileActivity.class); - startActivity(intent); - } else if (drawerItemIdentifier == DRAWER_ITEM_FAVOURITES) { - Intent intent = new Intent(MainActivity.this, FavouritesActivity.class); - startActivity(intent); - } else if (drawerItemIdentifier == DRAWER_ITEM_MUTED_USERS) { - Intent intent = new Intent(MainActivity.this, AccountListActivity.class); - intent.putExtra("type", AccountListActivity.Type.MUTES); - startActivity(intent); - } else if (drawerItemIdentifier == DRAWER_ITEM_BLOCKED_USERS) { - Intent intent = new Intent(MainActivity.this, AccountListActivity.class); - intent.putExtra("type", AccountListActivity.Type.BLOCKS); - startActivity(intent); - } else if (drawerItemIdentifier == DRAWER_ITEM_SEARCH) { - Intent intent = new Intent(MainActivity.this, SearchActivity.class); - startActivity(intent); - } else if (drawerItemIdentifier == DRAWER_ITEM_PREFERENCES) { - Intent intent = new Intent(MainActivity.this, PreferencesActivity.class); - startActivity(intent); - } else if (drawerItemIdentifier == DRAWER_ITEM_ABOUT) { - Intent intent = new Intent(MainActivity.this, AboutActivity.class); - startActivity(intent); - } else if (drawerItemIdentifier == DRAWER_ITEM_LOG_OUT) { - logout(); - } else if (drawerItemIdentifier == DRAWER_ITEM_FOLLOW_REQUESTS) { - Intent intent = new Intent(MainActivity.this, AccountListActivity.class); - intent.putExtra("type", AccountListActivity.Type.FOLLOW_REQUESTS); - startActivity(intent); - } else if (drawerItemIdentifier == DRAWER_ITEM_SAVED_TOOT) { - Intent intent = new Intent(MainActivity.this, SavedTootActivity.class); - startActivity(intent); - } + if (drawerItemIdentifier == DRAWER_ITEM_EDIT_PROFILE) { + Intent intent = new Intent(MainActivity.this, EditProfileActivity.class); + startActivity(intent); + } else if (drawerItemIdentifier == DRAWER_ITEM_FAVOURITES) { + Intent intent = new Intent(MainActivity.this, FavouritesActivity.class); + startActivity(intent); + } else if (drawerItemIdentifier == DRAWER_ITEM_MUTED_USERS) { + Intent intent = new Intent(MainActivity.this, AccountListActivity.class); + intent.putExtra("type", AccountListActivity.Type.MUTES); + startActivity(intent); + } else if (drawerItemIdentifier == DRAWER_ITEM_BLOCKED_USERS) { + Intent intent = new Intent(MainActivity.this, AccountListActivity.class); + intent.putExtra("type", AccountListActivity.Type.BLOCKS); + startActivity(intent); + } else if (drawerItemIdentifier == DRAWER_ITEM_SEARCH) { + Intent intent = new Intent(MainActivity.this, SearchActivity.class); + startActivity(intent); + } else if (drawerItemIdentifier == DRAWER_ITEM_PREFERENCES) { + Intent intent = new Intent(MainActivity.this, PreferencesActivity.class); + startActivity(intent); + } else if (drawerItemIdentifier == DRAWER_ITEM_ABOUT) { + Intent intent = new Intent(MainActivity.this, AboutActivity.class); + startActivity(intent); + } else if (drawerItemIdentifier == DRAWER_ITEM_LOG_OUT) { + logout(); + } else if (drawerItemIdentifier == DRAWER_ITEM_FOLLOW_REQUESTS) { + Intent intent = new Intent(MainActivity.this, AccountListActivity.class); + intent.putExtra("type", AccountListActivity.Type.FOLLOW_REQUESTS); + startActivity(intent); + } else if (drawerItemIdentifier == DRAWER_ITEM_SAVED_TOOT) { + Intent intent = new Intent(MainActivity.this, SavedTootActivity.class); + startActivity(intent); } - - return false; } + + return false; }) .build(); } @@ -389,21 +377,18 @@ public class MainActivity extends BaseActivity implements ActionButtonActivity { new AlertDialog.Builder(this) .setTitle(R.string.action_logout) .setMessage(R.string.action_logout_confirm) - .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - if (arePushNotificationsEnabled()) disablePushNotifications(); + .setPositiveButton(android.R.string.yes, (dialog, which) -> { + if (arePushNotificationsEnabled()) disablePushNotifications(); - getPrivatePreferences().edit() - .remove("domain") - .remove("accessToken") - .remove("appAccountId") - .apply(); + getPrivatePreferences().edit() + .remove("domain") + .remove("accessToken") + .remove("appAccountId") + .apply(); - Intent intent = new Intent(MainActivity.this, LoginActivity.class); - startActivity(intent); - finish(); - } + Intent intent = new Intent(MainActivity.this, LoginActivity.class); + startActivity(intent); + finish(); }) .setNegativeButton(android.R.string.no, null) .show();