Prepares release 1.8.4
This commit is contained in:
parent
1d95bb2f95
commit
a7157d42ef
|
@ -7,8 +7,8 @@ android {
|
||||||
applicationId "fr.gouv.etalab.mastodon"
|
applicationId "fr.gouv.etalab.mastodon"
|
||||||
minSdkVersion 15
|
minSdkVersion 15
|
||||||
targetSdkVersion 27
|
targetSdkVersion 27
|
||||||
versionCode 115
|
versionCode 116
|
||||||
versionName "1.8.3"
|
versionName "1.8.4"
|
||||||
}
|
}
|
||||||
flavorDimensions "default"
|
flavorDimensions "default"
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
@ -34,7 +34,7 @@ allprojects {
|
||||||
maven { url "https://maven.google.com"}
|
maven { url "https://maven.google.com"}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ext.supportLibraryVersion = '27.0.2'
|
ext.supportLibraryVersion = '27.1.0'
|
||||||
ext.glideLibraryVersion = '4.6.1'
|
ext.glideLibraryVersion = '4.6.1'
|
||||||
ext.conscryptLibraryVersion = '1.0.1'
|
ext.conscryptLibraryVersion = '1.0.1'
|
||||||
ext.evernoteLibraryVersion = '1.2.2'
|
ext.evernoteLibraryVersion = '1.2.2'
|
||||||
|
|
|
@ -172,8 +172,10 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
|
||||||
swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
|
swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onRefresh() {
|
public void onRefresh() {
|
||||||
if( statuses.size() > 0)
|
if( statuses.size() > 0) {
|
||||||
retrieveMissingToots(statuses.get(0).getId());
|
MainActivity.countNewStatus = 0;
|
||||||
|
retrieveMissingToots(null);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
swipeRefreshLayout.setColorSchemeResources(R.color.mastodonC4,
|
swipeRefreshLayout.setColorSchemeResources(R.color.mastodonC4,
|
||||||
|
@ -434,7 +436,8 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
|
||||||
Account account = new AccountDAO(context, db).getAccountByID(userId);
|
Account account = new AccountDAO(context, db).getAccountByID(userId);
|
||||||
List<String> mutedAccount = new TempMuteDAO(context, db).getAllTimeMuted(account);
|
List<String> mutedAccount = new TempMuteDAO(context, db).getAllTimeMuted(account);
|
||||||
statusListAdapter.updateMuted(mutedAccount);
|
statusListAdapter.updateMuted(mutedAccount);
|
||||||
|
if( statuses != null && statuses.size() > 0)
|
||||||
|
retrieveMissingToots(statuses.get(0).getId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -43,9 +43,6 @@ import android.content.res.Resources;
|
||||||
import android.database.sqlite.SQLiteDatabase;
|
import android.database.sqlite.SQLiteDatabase;
|
||||||
import android.graphics.Bitmap;
|
import android.graphics.Bitmap;
|
||||||
import android.graphics.Canvas;
|
import android.graphics.Canvas;
|
||||||
import android.graphics.ColorFilter;
|
|
||||||
import android.graphics.LightingColorFilter;
|
|
||||||
import android.graphics.Matrix;
|
|
||||||
import android.graphics.Paint;
|
import android.graphics.Paint;
|
||||||
import android.graphics.PorterDuff;
|
import android.graphics.PorterDuff;
|
||||||
import android.graphics.drawable.BitmapDrawable;
|
import android.graphics.drawable.BitmapDrawable;
|
||||||
|
@ -234,7 +231,6 @@ public class Helper {
|
||||||
public static final String SET_DISABLE_GIF = "set_disable_gif";
|
public static final String SET_DISABLE_GIF = "set_disable_gif";
|
||||||
public static final String SET_CAPITALIZE = "set_capitalize";
|
public static final String SET_CAPITALIZE = "set_capitalize";
|
||||||
public static final String SET_PICTURE_RESIZE = "set_picture_resize";
|
public static final String SET_PICTURE_RESIZE = "set_picture_resize";
|
||||||
public static final int S_NONE = 0;
|
|
||||||
public static final int S_512KO = 1;
|
public static final int S_512KO = 1;
|
||||||
public static final int S_1MO = 2;
|
public static final int S_1MO = 2;
|
||||||
public static final int S_2MO = 3;
|
public static final int S_2MO = 3;
|
||||||
|
@ -870,7 +866,7 @@ public class Helper {
|
||||||
})
|
})
|
||||||
.into(new SimpleTarget<Bitmap>() {
|
.into(new SimpleTarget<Bitmap>() {
|
||||||
@Override
|
@Override
|
||||||
public void onResourceReady(Bitmap resource, Transition<? super Bitmap> transition) {
|
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> transition) {
|
||||||
notify_user(context, intent, notificationIdTmp, resource, context.getString(R.string.save_over), context.getString(R.string.download_from, fileName));
|
notify_user(context, intent, notificationIdTmp, resource, context.getString(R.string.save_over), context.getString(R.string.download_from, fileName));
|
||||||
Toast.makeText(context, R.string.toast_saved,Toast.LENGTH_LONG).show();
|
Toast.makeText(context, R.string.toast_saved,Toast.LENGTH_LONG).show();
|
||||||
}
|
}
|
||||||
|
@ -1005,7 +1001,7 @@ public class Helper {
|
||||||
.load(url)
|
.load(url)
|
||||||
.into(new SimpleTarget<Bitmap>() {
|
.into(new SimpleTarget<Bitmap>() {
|
||||||
@Override
|
@Override
|
||||||
public void onResourceReady(Bitmap resource, Transition<? super Bitmap> transition) {
|
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> transition) {
|
||||||
item.setIcon(new BitmapDrawable(activity.getResources(), resource));
|
item.setIcon(new BitmapDrawable(activity.getResources(), resource));
|
||||||
item.getIcon().setColorFilter(0xFFFFFFFF, PorterDuff.Mode.MULTIPLY);
|
item.getIcon().setColorFilter(0xFFFFFFFF, PorterDuff.Mode.MULTIPLY);
|
||||||
}
|
}
|
||||||
|
@ -1141,7 +1137,7 @@ public class Helper {
|
||||||
.load(url)
|
.load(url)
|
||||||
.into(new SimpleTarget<Bitmap>() {
|
.into(new SimpleTarget<Bitmap>() {
|
||||||
@Override
|
@Override
|
||||||
public void onResourceReady(Bitmap resource, Transition<? super Bitmap> transition) {
|
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> transition) {
|
||||||
Resources res = activity.getResources();
|
Resources res = activity.getResources();
|
||||||
BitmapDrawable icon = new BitmapDrawable(res, getRoundedCornerBitmap(resource, 20));
|
BitmapDrawable icon = new BitmapDrawable(res, getRoundedCornerBitmap(resource, 20));
|
||||||
imageView.setImageDrawable(icon);
|
imageView.setImageDrawable(icon);
|
||||||
|
@ -1948,7 +1944,7 @@ public class Helper {
|
||||||
})
|
})
|
||||||
.into(new SimpleTarget<Bitmap>() {
|
.into(new SimpleTarget<Bitmap>() {
|
||||||
@Override
|
@Override
|
||||||
public void onResourceReady(Bitmap resource, Transition<? super Bitmap> transition) {
|
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> transition) {
|
||||||
if( resource != null)
|
if( resource != null)
|
||||||
imageView.setImageBitmap(resource);
|
imageView.setImageBitmap(resource);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue