diff --git a/app/build.gradle b/app/build.gradle index 4e9c836c..2c5dea67 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { defaultConfig { minSdk 21 targetSdk 33 - versionCode 467 - versionName "3.14.5" + versionCode 468 + versionName "3.14.6" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } flavorDimensions "default" diff --git a/app/src/main/assets/release_notes/notes.json b/app/src/main/assets/release_notes/notes.json index 2538385e..67e666c2 100644 --- a/app/src/main/assets/release_notes/notes.json +++ b/app/src/main/assets/release_notes/notes.json @@ -1,4 +1,9 @@ [ + { + "version": "3.14.6", + "code": "468", + "note": "Added:\n- Maths support (view and compose)\n\nChanged:\n- Hide single media with preview is now a setting (default: disabled)" + }, { "version": "3.14.5", "code": "467", diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java index b15fd992..a1e5aca6 100644 --- a/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java +++ b/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java @@ -48,6 +48,7 @@ import android.os.Looper; import android.text.Html; import android.text.SpannableString; import android.text.TextUtils; +import android.util.Log; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -659,31 +660,35 @@ public class StatusAdapter extends RecyclerView.Adapter if (status.mathsShown) { holder.binding.statusContentMaths.setVisibility(View.VISIBLE); holder.binding.statusContent.setVisibility(View.GONE); + holder.binding.statusContentMaths.removeAllViews(); + MathJaxConfig mathJaxConfig = new MathJaxConfig(); + switch (context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) { + case Configuration.UI_MODE_NIGHT_YES: + mathJaxConfig.setTextColor("white"); + break; + case Configuration.UI_MODE_NIGHT_NO: + mathJaxConfig.setTextColor("black"); + break; + } + mathJaxConfig.setAutomaticLinebreaks(true); + + MathJaxView mathview = new MathJaxView(context, mathJaxConfig); + holder.binding.statusContentMaths.addView(mathview); + if (status.contentSpan != null) { + mathview.setInputText(status.contentSpan.toString()); + } else { + status.mathsShown = false; + holder.binding.statusContentMaths.setVisibility(View.GONE); + holder.binding.statusContent.setVisibility(View.VISIBLE); + } } else { holder.binding.statusContentMaths.setVisibility(View.GONE); holder.binding.statusContent.setVisibility(View.VISIBLE); } holder.binding.actionButtonMaths.setOnClickListener(v -> { - if (status.mathsShown) { - status.mathsShown = false; - } else { - holder.binding.statusContentMaths.removeAllViews(); - MathJaxConfig mathJaxConfig = new MathJaxConfig(); - switch (context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) { - case Configuration.UI_MODE_NIGHT_YES: - mathJaxConfig.setTextColor("white"); - break; - case Configuration.UI_MODE_NIGHT_NO: - mathJaxConfig.setTextColor("black"); - break; - } - mathJaxConfig.setAutomaticLinebreaks(true); - status.mathsShown = true; - MathJaxView mathview = new MathJaxView(context, mathJaxConfig); - holder.binding.statusContentMaths.addView(mathview); - mathview.setInputText(status.contentSpan.toString()); - } + status.mathsShown = !status.mathsShown; + Log.v(Helper.TAG, "notifyItemChanged: " + holder.getBindingAdapterPosition()); adapter.notifyItemChanged(holder.getBindingAdapterPosition()); }); holder.binding.actionButtonFavorite.setActiveImage(R.drawable.ic_round_star_24); diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/468.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/468.txt index 83310083..131b9f73 100644 --- a/src/fdroid/fastlane/metadata/android/en/changelogs/468.txt +++ b/src/fdroid/fastlane/metadata/android/en/changelogs/468.txt @@ -2,7 +2,4 @@ Added: - Maths support (view and compose) Changed: -- Hide single media with preview is now a setting (default: disabled) - -Fixed: -- \ No newline at end of file +- Hide single media with preview is now a setting (default: disabled) \ No newline at end of file