summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/build.gradle4
-rw-r--r--app/src/fdroid/java/app/fedilab/android/activities/BasePeertubeActivity.java2
-rw-r--r--app/src/main/assets/release_notes/notes.json5
-rw-r--r--app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java10
-rw-r--r--app/src/main/res/layouts/peertube/layout/activity_peertube.xml1
-rw-r--r--app/src/main/res/layouts/peertube/layout/peertube_exo_player_control_view.xml (renamed from app/src/main/res/layouts/peertube/layout/exo_player_control_view.xml)0
-rw-r--r--mathjaxandroid/src/main/java/de/timfreiheit/mathjax/android/MathJaxView.java4
-rw-r--r--src/fdroid/fastlane/metadata/android/en/changelogs/473.txt2
-rw-r--r--src/fdroid/fastlane/metadata/android/en/changelogs/474.txt15
9 files changed, 37 insertions, 6 deletions
diff --git a/app/build.gradle b/app/build.gradle
index c62380489..2f198b3dc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
defaultConfig {
minSdk 21
targetSdk 33
- versionCode 473
- versionName "3.16.1"
+ versionCode 474
+ versionName "3.16.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
flavorDimensions "default"
diff --git a/app/src/fdroid/java/app/fedilab/android/activities/BasePeertubeActivity.java b/app/src/fdroid/java/app/fedilab/android/activities/BasePeertubeActivity.java
index 58d82d4bf..cbaac34a0 100644
--- a/app/src/fdroid/java/app/fedilab/android/activities/BasePeertubeActivity.java
+++ b/app/src/fdroid/java/app/fedilab/android/activities/BasePeertubeActivity.java
@@ -63,6 +63,8 @@ public class BasePeertubeActivity extends BaseBarActivity {
binding = ActivityPeertubeBinding.inflate(getLayoutInflater());
View view = binding.getRoot();
setContentView(view);
+
+
binding.minController.castPlay.setOnClickListener(v -> {
binding.minController.castLoader.setVisibility(View.VISIBLE);
if (PeertubeBaseMainActivity.chromeCast != null) {
diff --git a/app/src/main/assets/release_notes/notes.json b/app/src/main/assets/release_notes/notes.json
index 73beee0c1..feca59e65 100644
--- a/app/src/main/assets/release_notes/notes.json
+++ b/app/src/main/assets/release_notes/notes.json
@@ -1,5 +1,10 @@
[
{
+ "version": "3.16.2",
+ "code": "474",
+ "note": "Added:\n- Peertube support\n- Compose shortcut (long press launcher)\n- Long press compose button to write with another account\n- Edit description and focus for media (for the next Mastodon release)\n\nChanged:\n- Cross actions with two accounts display a dialog\n- Order & compact og values when sharing > title - url - content\n- Tap on top message (user info) open threads\n\nFixed:\n- Text cleared when adding a media\n- Fix Maths not working with quotes\n- Fix crashes"
+ },
+ {
"version": "3.16.1",
"code": "473",
"note": "Changed:\n- Edit description and focus for media (for the next Mastodon release)\n\nChanged:\n- Peertube: remove role support to avoid crashes with older instances\n\nFixed:\n- Fix some crashes"
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
index 108634f67..b5abedd87 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
@@ -680,7 +680,10 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
MathJaxView mathview = new MathJaxView(context, mathJaxConfig);
holder.binding.statusContentMaths.addView(mathview);
if (status.contentSpan != null) {
- mathview.setInputText(status.contentSpan.toString());
+ String input = status.contentSpan.toString();
+ input = input.replaceAll("'", "&#39;");
+ input = input.replaceAll("\"", "&#34;");
+ mathview.setInputText(input);
} else {
status.mathsShown = false;
holder.binding.statusContentMaths.setVisibility(View.GONE);
@@ -841,7 +844,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
}
});
holder.binding.actionButtonFavorite.setChecked(statusToDeal.favourited);
- holder.binding.statusUserInfo.setOnClickListener(v -> {
+ holder.binding.avatar.setOnClickListener(v -> {
if (remote) {
Toasty.info(context, context.getString(R.string.retrieve_remote_status), Toasty.LENGTH_SHORT).show();
searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.uri, null, "statuses", false, true, false, 0, null, null, 1)
@@ -1657,6 +1660,9 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
});
if (!minified && canBeFederated) {
holder.binding.mainContainer.setOnClickListener(v -> holder.binding.statusContent.callOnClick());
+ holder.binding.statusUserInfo.setOnClickListener(v -> {
+ holder.binding.statusContent.callOnClick();
+ });
holder.binding.statusContent.setOnClickListener(v -> {
if (status.isFocused || v.getTag() == SpannableHelper.CLICKABLE_SPAN) {
if (v.getTag() == SpannableHelper.CLICKABLE_SPAN) {
diff --git a/app/src/main/res/layouts/peertube/layout/activity_peertube.xml b/app/src/main/res/layouts/peertube/layout/activity_peertube.xml
index 6fe38735b..eaaa551f9 100644
--- a/app/src/main/res/layouts/peertube/layout/activity_peertube.xml
+++ b/app/src/main/res/layouts/peertube/layout/activity_peertube.xml
@@ -56,6 +56,7 @@
android:layout_height="match_parent"
android:animateLayoutChanges="true"
app:dtpv_controller="@+id/media_video"
+ app:controller_layout_id="@layout/peertube_exo_player_control_view"
app:use_controller="true" />
<com.github.vkay94.dtpv.youtube.YouTubeOverlay
diff --git a/app/src/main/res/layouts/peertube/layout/exo_player_control_view.xml b/app/src/main/res/layouts/peertube/layout/peertube_exo_player_control_view.xml
index 0301ca16a..0301ca16a 100644
--- a/app/src/main/res/layouts/peertube/layout/exo_player_control_view.xml
+++ b/app/src/main/res/layouts/peertube/layout/peertube_exo_player_control_view.xml
diff --git a/mathjaxandroid/src/main/java/de/timfreiheit/mathjax/android/MathJaxView.java b/mathjaxandroid/src/main/java/de/timfreiheit/mathjax/android/MathJaxView.java
index 8754c5d28..57e4c7df7 100644
--- a/mathjaxandroid/src/main/java/de/timfreiheit/mathjax/android/MathJaxView.java
+++ b/mathjaxandroid/src/main/java/de/timfreiheit/mathjax/android/MathJaxView.java
@@ -167,7 +167,9 @@ public class MathJaxView extends FrameLayout {
mWebView.setHorizontalScrollBarEnabled(horizontalScrollbarsEnabled);
mWebView.setBackgroundColor(0);
mWebView.getSettings().setLoadWithOverviewMode(true);
-
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+ WebView.setWebContentsDebuggingEnabled(true);
+ }
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
String process = getProcessName(context);
if (!context.getPackageName().equals(process))
diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/473.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/473.txt
index c51e0f106..39f995286 100644
--- a/src/fdroid/fastlane/metadata/android/en/changelogs/473.txt
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/473.txt
@@ -1,4 +1,4 @@
-Changed:
+Added:
- Edit description and focus for media (for the next Mastodon release)
Changed:
diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/474.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/474.txt
new file mode 100644
index 000000000..8d142c306
--- /dev/null
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/474.txt
@@ -0,0 +1,15 @@
+Added:
+- Peertube support
+- Compose shortcut (long press launcher)
+- Long press compose button to write with another account
+- Edit description and focus for media (for the next Mastodon release)
+
+Changed:
+- Cross actions with two accounts display a dialog
+- Order & compact og values when sharing > title - url - content
+- Tap on top message (user info) open threads
+
+Fixed:
+- Text cleared when adding a media
+- Fix Maths not working with quotes
+- Fix crashes \ No newline at end of file