Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

upgrade libraries, fix DrawerImagerLoader deprecated warning

This commit is contained in:
Conny Duck 2017-11-15 21:50:15 +01:00
parent c664cb000f
commit 3055e6176e
2 changed files with 56 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/build.gradle
View File

@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
android { android {
compileSdkVersion 27 compileSdkVersion 27
buildToolsVersion '27.0.0' buildToolsVersion '27.0.1'
defaultConfig { defaultConfig {
applicationId "com.keylesspalace.tusky" applicationId "com.keylesspalace.tusky"
minSdkVersion 15 minSdkVersion 15
@ -39,10 +39,10 @@ android {
} }
} }
ext.supportLibraryVersion = '27.0.0' ext.supportLibraryVersion = '27.0.1'
dependencies { dependencies {
compile('com.mikepenz:materialdrawer:5.9.5@aar') { compile('com.mikepenz:materialdrawer:6.0.1@aar') {
transitive = true transitive = true
} }
compile "com.android.support:appcompat-v7:$supportLibraryVersion" compile "com.android.support:appcompat-v7:$supportLibraryVersion"
@ -60,7 +60,7 @@ dependencies {
compile 'com.pkmmte.view:circularimageview:1.1' compile 'com.pkmmte.view:circularimageview:1.1'
compile 'com.github.varunest:sparkbutton:1.0.5' compile 'com.github.varunest:sparkbutton:1.0.5'
compile 'com.github.chrisbanes:PhotoView:2.1.3' 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.theartofdev.edmodo:android-image-cropper:2.5.1'
compile 'com.evernote:android-job:1.2.0' compile 'com.evernote:android-job:1.2.0'
implementation 'com.android.support.constraint:constraint-layout:1.0.2' implementation 'com.android.support.constraint:constraint-layout:1.0.2'

119
app/src/main/java/com/keylesspalace/tusky/MainActivity.java
View File

@ -15,7 +15,6 @@
package com.keylesspalace.tusky; package com.keylesspalace.tusky;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.res.Configuration; import android.content.res.Configuration;
@ -97,24 +96,16 @@ public class MainActivity extends BaseActivity implements ActionButtonActivity {
TabLayout tabLayout = findViewById(R.id.tab_layout); TabLayout tabLayout = findViewById(R.id.tab_layout);
viewPager = findViewById(R.id.pager); viewPager = findViewById(R.id.pager);
floatingBtn.setOnClickListener(new View.OnClickListener() { floatingBtn.setOnClickListener(v -> {
@Override Intent intent = new Intent(getApplicationContext(), ComposeActivity.class);
public void onClick(View v) { startActivityForResult(intent, COMPOSE_RESULT);
Intent intent = new Intent(getApplicationContext(), ComposeActivity.class);
startActivityForResult(intent, COMPOSE_RESULT);
}
}); });
setupDrawer(); setupDrawer();
// Setup the navigation drawer toggle button. // Setup the navigation drawer toggle button.
ThemeUtils.setDrawableTint(this, drawerToggle.getDrawable(), R.attr.toolbar_icon_tint); ThemeUtils.setDrawableTint(this, drawerToggle.getDrawable(), R.attr.toolbar_icon_tint);
drawerToggle.setOnClickListener(new View.OnClickListener() { drawerToggle.setOnClickListener(v -> drawer.openDrawer());
@Override
public void onClick(View v) {
drawer.openDrawer();
}
});
/* Fetch user info while we're doing other things. This has to be after setting up the /* 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. */ * 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() { DrawerImageLoader.init(new AbstractDrawerImageLoader() {
@Override @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); Picasso.with(imageView.getContext()).load(uri).placeholder(placeholder).into(imageView);
} }
@ -338,49 +329,46 @@ public class MainActivity extends BaseActivity implements ActionButtonActivity {
.withHasStableIds(true) .withHasStableIds(true)
.withSelectedItem(-1) .withSelectedItem(-1)
.addDrawerItems(array) .addDrawerItems(array)
.withOnDrawerItemClickListener(new Drawer.OnDrawerItemClickListener() { .withOnDrawerItemClickListener((view, position, drawerItem) -> {
@Override if (drawerItem != null) {
public boolean onItemClick(View view, int position, IDrawerItem drawerItem) { long drawerItemIdentifier = drawerItem.getIdentifier();
if (drawerItem != null) {
long drawerItemIdentifier = drawerItem.getIdentifier();
if (drawerItemIdentifier == DRAWER_ITEM_EDIT_PROFILE) { if (drawerItemIdentifier == DRAWER_ITEM_EDIT_PROFILE) {
Intent intent = new Intent(MainActivity.this, EditProfileActivity.class); Intent intent = new Intent(MainActivity.this, EditProfileActivity.class);
startActivity(intent); startActivity(intent);
} else if (drawerItemIdentifier == DRAWER_ITEM_FAVOURITES) { } else if (drawerItemIdentifier == DRAWER_ITEM_FAVOURITES) {
Intent intent = new Intent(MainActivity.this, FavouritesActivity.class); Intent intent = new Intent(MainActivity.this, FavouritesActivity.class);
startActivity(intent); startActivity(intent);
} else if (drawerItemIdentifier == DRAWER_ITEM_MUTED_USERS) { } else if (drawerItemIdentifier == DRAWER_ITEM_MUTED_USERS) {
Intent intent = new Intent(MainActivity.this, AccountListActivity.class); Intent intent = new Intent(MainActivity.this, AccountListActivity.class);
intent.putExtra("type", AccountListActivity.Type.MUTES); intent.putExtra("type", AccountListActivity.Type.MUTES);
startActivity(intent); startActivity(intent);
} else if (drawerItemIdentifier == DRAWER_ITEM_BLOCKED_USERS) { } else if (drawerItemIdentifier == DRAWER_ITEM_BLOCKED_USERS) {
Intent intent = new Intent(MainActivity.this, AccountListActivity.class); Intent intent = new Intent(MainActivity.this, AccountListActivity.class);
intent.putExtra("type", AccountListActivity.Type.BLOCKS); intent.putExtra("type", AccountListActivity.Type.BLOCKS);
startActivity(intent); startActivity(intent);
} else if (drawerItemIdentifier == DRAWER_ITEM_SEARCH) { } else if (drawerItemIdentifier == DRAWER_ITEM_SEARCH) {
Intent intent = new Intent(MainActivity.this, SearchActivity.class); Intent intent = new Intent(MainActivity.this, SearchActivity.class);
startActivity(intent); startActivity(intent);
} else if (drawerItemIdentifier == DRAWER_ITEM_PREFERENCES) { } else if (drawerItemIdentifier == DRAWER_ITEM_PREFERENCES) {
Intent intent = new Intent(MainActivity.this, PreferencesActivity.class); Intent intent = new Intent(MainActivity.this, PreferencesActivity.class);
startActivity(intent); startActivity(intent);
} else if (drawerItemIdentifier == DRAWER_ITEM_ABOUT) { } else if (drawerItemIdentifier == DRAWER_ITEM_ABOUT) {
Intent intent = new Intent(MainActivity.this, AboutActivity.class); Intent intent = new Intent(MainActivity.this, AboutActivity.class);
startActivity(intent); startActivity(intent);
} else if (drawerItemIdentifier == DRAWER_ITEM_LOG_OUT) { } else if (drawerItemIdentifier == DRAWER_ITEM_LOG_OUT) {
logout(); logout();
} else if (drawerItemIdentifier == DRAWER_ITEM_FOLLOW_REQUESTS) { } else if (drawerItemIdentifier == DRAWER_ITEM_FOLLOW_REQUESTS) {
Intent intent = new Intent(MainActivity.this, AccountListActivity.class); Intent intent = new Intent(MainActivity.this, AccountListActivity.class);
intent.putExtra("type", AccountListActivity.Type.FOLLOW_REQUESTS); intent.putExtra("type", AccountListActivity.Type.FOLLOW_REQUESTS);
startActivity(intent); startActivity(intent);
} else if (drawerItemIdentifier == DRAWER_ITEM_SAVED_TOOT) { } else if (drawerItemIdentifier == DRAWER_ITEM_SAVED_TOOT) {
Intent intent = new Intent(MainActivity.this, SavedTootActivity.class); Intent intent = new Intent(MainActivity.this, SavedTootActivity.class);
startActivity(intent); startActivity(intent);
}
} }
return false;
} }
return false;
}) })
.build(); .build();
} }
@ -389,21 +377,18 @@ public class MainActivity extends BaseActivity implements ActionButtonActivity {
new AlertDialog.Builder(this) new AlertDialog.Builder(this)
.setTitle(R.string.action_logout) .setTitle(R.string.action_logout)
.setMessage(R.string.action_logout_confirm) .setMessage(R.string.action_logout_confirm)
.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() { .setPositiveButton(android.R.string.yes, (dialog, which) -> {
@Override if (arePushNotificationsEnabled()) disablePushNotifications();
public void onClick(DialogInterface dialog, int which) {
if (arePushNotificationsEnabled()) disablePushNotifications();
getPrivatePreferences().edit() getPrivatePreferences().edit()
.remove("domain") .remove("domain")
.remove("accessToken") .remove("accessToken")
.remove("appAccountId") .remove("appAccountId")
.apply(); .apply();
Intent intent = new Intent(MainActivity.this, LoginActivity.class); Intent intent = new Intent(MainActivity.this, LoginActivity.class);
startActivity(intent); startActivity(intent);
finish(); finish();
}
}) })
.setNegativeButton(android.R.string.no, null) .setNegativeButton(android.R.string.no, null)
.show(); .show();