Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Release 2.35.8

This commit is contained in:
Thomas 2020-06-15 19:14:11 +02:00
parent 5f481da403
commit 9854537f23
4 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -6,8 +6,8 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 29 targetSdkVersion 29
versionCode 371 versionCode 372
versionName "2.35.7" versionName "2.35.8"
multiDexEnabled true multiDexEnabled true
renderscriptTargetApi 28 as int renderscriptTargetApi 28 as int
renderscriptSupportModeEnabled true renderscriptSupportModeEnabled true

3
app/src/main/assets/changelogs/372.txt
View File

@ -1,3 +1,4 @@
Fixed: Fixed:
- Issue with not clickable URLs - Issue with not clickable URLs
- Custom emoji in polls not displayed - Custom emoji in polls not displayed
- Auto-split toots feature

23
app/src/main/java/app/fedilab/android/activities/OwnerChartsActivity.java
View File

@ -15,6 +15,7 @@
package app.fedilab.android.activities; package app.fedilab.android.activities;
import android.annotation.SuppressLint;
import android.app.DatePickerDialog; import android.app.DatePickerDialog;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
@ -174,6 +175,11 @@ public class OwnerChartsActivity extends BaseActivity implements OnRetrieveChart
dateEnd = new StatusCacheDAO(OwnerChartsActivity.this, db).getGreaterDate(StatusCacheDAO.ARCHIVE_CACHE); dateEnd = new StatusCacheDAO(OwnerChartsActivity.this, db).getGreaterDate(StatusCacheDAO.ARCHIVE_CACHE);
if( dateIni == null){
dateIni = new Date();
dateEnd = new Date();
}
int style; int style;
if (theme == Helper.THEME_DARK) { if (theme == Helper.THEME_DARK) {
style = R.style.DialogDark; style = R.style.DialogDark;
@ -264,26 +270,26 @@ public class OwnerChartsActivity extends BaseActivity implements OnRetrieveChart
public void onCharts(Charts charts) { public void onCharts(Charts charts) {
List<Entry> boostsEntry = new ArrayList<>(); List<Entry> boostsEntry = new ArrayList<>();
Iterator it = charts.getBoosts().entrySet().iterator(); Iterator<Map.Entry<Long, Integer>> it = charts.getBoosts().entrySet().iterator();
while (it.hasNext()) { while (it.hasNext()) {
Map.Entry pair = (Map.Entry) it.next(); Map.Entry<Long, Integer> pair = it.next();
boostsEntry.add(new Entry((long) pair.getKey(), (int) pair.getValue())); boostsEntry.add(new Entry(pair.getKey(), pair.getValue()));
it.remove(); it.remove();
} }
List<Entry> repliesEntry = new ArrayList<>(); List<Entry> repliesEntry = new ArrayList<>();
it = charts.getReplies().entrySet().iterator(); it = charts.getReplies().entrySet().iterator();
while (it.hasNext()) { while (it.hasNext()) {
Map.Entry pair = (Map.Entry) it.next(); Map.Entry<Long, Integer> pair = it.next();
repliesEntry.add(new Entry((long) pair.getKey(), (int) pair.getValue())); repliesEntry.add(new Entry(pair.getKey(), pair.getValue()));
it.remove(); it.remove();
} }
List<Entry> statusesEntry = new ArrayList<>(); List<Entry> statusesEntry = new ArrayList<>();
it = charts.getStatuses().entrySet().iterator(); it = charts.getStatuses().entrySet().iterator();
while (it.hasNext()) { while (it.hasNext()) {
Map.Entry pair = (Map.Entry) it.next(); Map.Entry<Long, Integer> pair = it.next();
statusesEntry.add(new Entry((long) pair.getKey(), (int) pair.getValue())); statusesEntry.add(new Entry(pair.getKey(), pair.getValue()));
it.remove(); it.remove();
} }
@ -389,6 +395,7 @@ public class OwnerChartsActivity extends BaseActivity implements OnRetrieveChart
chart.invalidate(); chart.invalidate();
} }
@SuppressLint("ViewConstructor")
public static class CustomMarkerView extends MarkerView { public static class CustomMarkerView extends MarkerView {
private TextView tvContent; private TextView tvContent;
private MPPointF mOffset; private MPPointF mOffset;
@ -410,7 +417,7 @@ public class OwnerChartsActivity extends BaseActivity implements OnRetrieveChart
@Override @Override
public MPPointF getOffset() { public MPPointF getOffset() {
if (mOffset == null) { if (mOffset == null) {
mOffset = new MPPointF(-(getWidth() / 2), -getHeight()); mOffset = new MPPointF(-((float)getWidth() / 2), -getHeight());
} }
return mOffset; return mOffset;
} }

12
app/src/main/java/app/fedilab/android/drawers/TrendsAdapter.java
View File

@ -110,8 +110,10 @@ public class TrendsAdapter extends BaseAdapter {
uses += _th.getUses(); uses += _th.getUses();
tendency.put(_th.getDays(), _th.getUses()); tendency.put(_th.getDays(), _th.getUses());
} }
people = people / days; if( days > 0 ) {
uses = uses / days; people = people / days;
uses = uses / days;
}
holder.count.setText(String.valueOf(uses)); holder.count.setText(String.valueOf(uses));
holder.tag_stats.setText(context.getString(R.string.talking_about, people)); holder.tag_stats.setText(context.getString(R.string.talking_about, people));
holder.tag_name.setText(String.format("#%s", trend.getName())); holder.tag_name.setText(String.format("#%s", trend.getName()));
@ -126,10 +128,10 @@ public class TrendsAdapter extends BaseAdapter {
List<Entry> trendsEntry = new ArrayList<>(); List<Entry> trendsEntry = new ArrayList<>();
Iterator it = tendency.entrySet().iterator(); Iterator<Map.Entry<Long, Integer>> it = tendency.entrySet().iterator();
while (it.hasNext()) { while (it.hasNext()) {
Map.Entry pair = (Map.Entry) it.next(); Map.Entry<Long, Integer> pair = it.next();
trendsEntry.add(0, new Entry((long) pair.getKey(), (int) pair.getValue())); trendsEntry.add(0, new Entry(pair.getKey(), pair.getValue()));
it.remove(); it.remove();
} }
LineDataSet dataTrending = new LineDataSet(trendsEntry, context.getString(R.string.trending)); LineDataSet dataTrending = new LineDataSet(trendsEntry, context.getString(R.string.trending));