diff options
Diffstat (limited to 'app/src/main/java')
73 files changed, 1549 insertions, 1601 deletions
diff --git a/app/src/main/java/app/fedilab/android/activities/BaseActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseActivity.java index 96f7a25d9..a1a7fef80 100644 --- a/app/src/main/java/app/fedilab/android/activities/BaseActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/BaseActivity.java @@ -5,9 +5,11 @@ import android.app.ProgressDialog; import android.content.Context; import android.content.pm.PackageManager; import android.content.res.Configuration; +import android.os.Build; import android.os.Bundle; import android.view.ActionMode; import android.view.View; +import android.view.Window; import android.widget.Toast; import androidx.annotation.NonNull; @@ -67,6 +69,9 @@ public class BaseActivity extends CyaneaAppCompatActivity { .build()); }*/ canShowActionMode = true; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + getWindow().requestFeature(Window.FEATURE_CONTENT_TRANSITIONS); + } super.onCreate(savedInstanceState); } diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java index f22ff876b..06e9fcfb4 100644 --- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java @@ -986,8 +986,8 @@ public abstract class BaseMainActivity extends BaseActivity SeekBar set_icon_size = popup_quick_settings.findViewById(R.id.set_icon_size); final TextView set_text_size_value = popup_quick_settings.findViewById(R.id.set_text_size_value); final TextView set_icon_size_value = popup_quick_settings.findViewById(R.id.set_icon_size_value); - set_text_size_value.setText(String.format("%s%%", String.valueOf(textSize))); - set_icon_size_value.setText(String.format("%s%%", String.valueOf(iconSize))); + set_text_size_value.setText(String.format("%s%%", textSize)); + set_icon_size_value.setText(String.format("%s%%", iconSize)); set_text_size.setMax(20); set_icon_size.setMax(20); @@ -1008,7 +1008,7 @@ public abstract class BaseMainActivity extends BaseActivity public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { int value = 80 + progress * 5; - set_text_size_value.setText(String.format("%s%%", String.valueOf(value))); + set_text_size_value.setText(String.format("%s%%", value)); SharedPreferences.Editor editor = sharedpreferences1.edit(); editor.putInt(Helper.SET_TEXT_SIZE, value); editor.apply(); @@ -1026,7 +1026,7 @@ public abstract class BaseMainActivity extends BaseActivity @Override public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { int value = 80 + progress * 5; - set_icon_size_value.setText(String.format("%s%%", String.valueOf(value))); + set_icon_size_value.setText(String.format("%s%%", value)); SharedPreferences.Editor editor = sharedpreferences1.edit(); editor.putInt(Helper.SET_ICON_SIZE, value); editor.apply(); @@ -1503,9 +1503,9 @@ public abstract class BaseMainActivity extends BaseActivity } } else if (type.startsWith("image/") || type.startsWith("video/")) { - + Uri imageUri = intent.getParcelableExtra(Intent.EXTRA_STREAM); if (!TootActivity.active) { - Uri imageUri = intent.getParcelableExtra(Intent.EXTRA_STREAM); + if (imageUri != null) { Bundle b = new Bundle(); b.putParcelable("sharedUri", imageUri); @@ -1513,7 +1513,6 @@ public abstract class BaseMainActivity extends BaseActivity CrossActions.doCrossShare(BaseMainActivity.this, b); } } else { - Uri imageUri = intent.getParcelableExtra(Intent.EXTRA_STREAM); if (imageUri != null) { intent = new Intent(BaseMainActivity.this, TootActivity.class); intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); @@ -2381,7 +2380,13 @@ public abstract class BaseMainActivity extends BaseActivity } } final NavigationView navigationView = findViewById(R.id.nav_view); + if (navigationView == null) { + return; + } MenuItem item = navigationView.getMenu().findItem(R.id.nav_announcements); + if (item == null || item.getActionView() == null) { + return; + } TextView actionView = item.getActionView().findViewById(R.id.counter); if (actionView != null) { if (unread > 0) { diff --git a/app/src/main/java/app/fedilab/android/activities/InstanceProfileActivity.java b/app/src/main/java/app/fedilab/android/activities/InstanceProfileActivity.java index 25a67d6f3..9c6ded35e 100644 --- a/app/src/main/java/app/fedilab/android/activities/InstanceProfileActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/InstanceProfileActivity.java @@ -122,7 +122,7 @@ public class InstanceProfileActivity extends BaseActivity { finish(); return; } - if (instanceNodeInfo.getThumbnail() != null && !instanceNodeInfo.getThumbnail().equals("null")) + if (instanceNodeInfo.getThumbnail() != null && !instanceNodeInfo.getThumbnail().equals("null") && Helper.isValidContextForGlide(InstanceProfileActivity.this)) Glide.with(InstanceProfileActivity.this) .asBitmap() .load(instanceNodeInfo.getThumbnail()) @@ -149,7 +149,7 @@ public class InstanceProfileActivity extends BaseActivity { accounts.add(instanceNodeInfo.getStaffAccount()); final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null); - AccountsListAdapter accountsListAdapter = new AccountsListAdapter(RetrieveAccountsAsyncTask.Type.FOLLOWERS, userId, accounts); + AccountsListAdapter accountsListAdapter = new AccountsListAdapter(RetrieveAccountsAsyncTask.Type.FOLLOWERS, userId, true, accounts); lv_accounts.setAdapter(accountsListAdapter); final LinearLayoutManager mLayoutManager; mLayoutManager = new LinearLayoutManager(InstanceProfileActivity.this); diff --git a/app/src/main/java/app/fedilab/android/activities/OwnerChartsActivity.java b/app/src/main/java/app/fedilab/android/activities/OwnerChartsActivity.java index e105a3212..4b9238b14 100644 --- a/app/src/main/java/app/fedilab/android/activities/OwnerChartsActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/OwnerChartsActivity.java @@ -175,7 +175,7 @@ public class OwnerChartsActivity extends BaseActivity implements OnRetrieveChart dateEnd = new StatusCacheDAO(OwnerChartsActivity.this, db).getGreaterDate(StatusCacheDAO.ARCHIVE_CACHE); - if( dateIni == null){ + if (dateIni == null) { dateIni = new Date(); dateEnd = new Date(); } @@ -417,7 +417,7 @@ public class OwnerChartsActivity extends BaseActivity implements OnRetrieveChart @Override public MPPointF getOffset() { if (mOffset == null) { - mOffset = new MPPointF(-((float)getWidth() / 2), -getHeight()); + mOffset = new MPPointF(-((float) getWidth() / 2), -getHeight()); } return mOffset; } diff --git a/app/src/main/java/app/fedilab/android/activities/OwnerNotificationChartsActivity.java b/app/src/main/java/app/fedilab/android/activities/OwnerNotificationChartsActivity.java index a63462210..47799e275 100644 --- a/app/src/main/java/app/fedilab/android/activities/OwnerNotificationChartsActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/OwnerNotificationChartsActivity.java @@ -15,6 +15,7 @@ package app.fedilab.android.activities; +import android.annotation.SuppressLint; import android.app.DatePickerDialog; import android.content.Context; import android.content.SharedPreferences; @@ -260,27 +261,26 @@ public class OwnerNotificationChartsActivity extends BaseActivity implements OnR List<Entry> boostsEntry = new ArrayList<>(); - - Iterator it = charts.getReblogs().entrySet().iterator(); + Iterator<Map.Entry<Long, Integer>> it = charts.getReblogs().entrySet().iterator(); while (it.hasNext()) { - Map.Entry pair = (Map.Entry) it.next(); - boostsEntry.add(new Entry((long) pair.getKey(), (int) pair.getValue())); + Map.Entry<Long, Integer> pair = it.next(); + boostsEntry.add(new Entry(pair.getKey(), pair.getValue())); it.remove(); } List<Entry> favEntry = new ArrayList<>(); it = charts.getFavourites().entrySet().iterator(); while (it.hasNext()) { - Map.Entry pair = (Map.Entry) it.next(); - favEntry.add(new Entry((long) pair.getKey(), (int) pair.getValue())); + Map.Entry<Long, Integer> pair = it.next(); + favEntry.add(new Entry(pair.getKey(), pair.getValue())); it.remove(); } List<Entry> mentionEntry = new ArrayList<>(); it = charts.getMentions().entrySet().iterator(); while (it.hasNext()) { - Map.Entry pair = (Map.Entry) it.next(); - mentionEntry.add(new Entry((long) pair.getKey(), (int) pair.getValue())); + Map.Entry<Long, Integer> pair = it.next(); + mentionEntry.add(new Entry(pair.getKey(), pair.getValue())); it.remove(); } @@ -288,8 +288,8 @@ public class OwnerNotificationChartsActivity extends BaseActivity implements OnR List<Entry> followEntry = new ArrayList<>(); it = charts.getFollows().entrySet().iterator(); while (it.hasNext()) { - Map.Entry pair = (Map.Entry) it.next(); - followEntry.add(new Entry((long) pair.getKey(), (int) pair.getValue())); + Map.Entry<Long, Integer> pair = it.next(); + followEntry.add(new Entry(pair.getKey(), pair.getValue())); it.remove(); } @@ -482,6 +482,7 @@ public class OwnerNotificationChartsActivity extends BaseActivity implements OnR super.onDestroy(); } + @SuppressLint("ViewConstructor") public static class CustomMarkerView extends MarkerView { private TextView tvContent; private MPPointF mOffset; @@ -503,7 +504,7 @@ public class OwnerNotificationChartsActivity extends BaseActivity implements OnR @Override public MPPointF getOffset() { if (mOffset == null) { - mOffset = new MPPointF(-(getWidth() / 2), -getHeight()); + mOffset = new MPPointF(-((float) getWidth() / 2), -getHeight()); } return mOffset; } diff --git a/app/src/main/java/app/fedilab/android/activities/OwnerStatusActivity.java b/app/src/main/java/app/fedilab/android/activities/OwnerStatusActivity.java index 4d738d412..9c73f9646 100644 --- a/app/src/main/java/app/fedilab/android/activities/OwnerStatusActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/OwnerStatusActivity.java @@ -522,11 +522,11 @@ public class OwnerStatusActivity extends BaseActivity implements OnRetrieveFeeds frequency.setText(getString(R.string.toot_per_day, df.format(statistics.getFrequency()))); if (statistics.getTagsTrend() != null && statistics.getTagsTrend().size() > 0) { - Iterator it = statistics.getTagsTrend().entrySet().iterator(); + Iterator<Map.Entry<String, Integer>> it = statistics.getTagsTrend().entrySet().iterator(); StringBuilder text = new StringBuilder(); int i = 1; while (it.hasNext() && i <= 10) { - Map.Entry pair = (Map.Entry) it.next(); + Map.Entry<String, Integer> pair = it.next(); System.out.println(pair.getKey() + " = " + pair.getValue()); text.append(i).append(" - ").append(pair.getKey()).append(" → ").append(pair.getValue()).append("\r\n"); i++; diff --git a/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java b/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java index f05ad7b91..002d1f101 100644 --- a/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java @@ -639,26 +639,18 @@ public class PeertubeActivity extends BaseActivity implements OnRetrievePeertube @Override public void onConfigurationChanged(@NotNull Configuration newConfig) { super.onConfigurationChanged(newConfig); - - if (mode != Helper.VIDEO_MODE_WEBVIEW) { - if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) { + if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) { + if (mode != Helper.VIDEO_MODE_WEBVIEW) { openFullscreenDialog(); - setFullscreen(FullScreenMediaController.fullscreen.ON); - } else if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) { - closeFullscreenDialog(); - setFullscreen(FullScreenMediaController.fullscreen.OFF); } - change(); - } else { - if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) { - setFullscreen(FullScreenMediaController.fullscreen.ON); - } else if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) { - setFullscreen(FullScreenMediaController.fullscreen.OFF); + setFullscreen(FullScreenMediaController.fullscreen.ON); + } else if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) { + if (mode != Helper.VIDEO_MODE_W |