diff --git a/android/app/build.gradle b/android/app/build.gradle index da69c92..d226a74 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -36,8 +36,8 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } defaultConfig { @@ -45,10 +45,10 @@ android { applicationId = "com.dita.academia" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. - minSdk = flutter.minSdkVersion + minSdk = 34 targetSdk = 34 - versionCode = 7 - versionName = "Prisca" + versionCode = 9 + versionName = "Jessica" } // signingConfigs { diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index e1ca574..8bc9958 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip diff --git a/lib/constants/common.dart b/lib/constants/common.dart index d4fed02..9ead181 100644 --- a/lib/constants/common.dart +++ b/lib/constants/common.dart @@ -18,6 +18,11 @@ extension StringExtension on String { } } +String utf8convert(String text) { + List bytes = text.toString().codeUnits; + return utf8.decode(bytes); +} + String trimTo99Characters(String text) { if (text.length <= 99) { return text; diff --git a/lib/tools/chirp/widgets/comment_widget.dart b/lib/tools/chirp/widgets/comment_widget.dart index 46fb10b..1a336e8 100644 --- a/lib/tools/chirp/widgets/comment_widget.dart +++ b/lib/tools/chirp/widgets/comment_widget.dart @@ -139,7 +139,9 @@ class _CommentWidgetState extends State { ), const SizedBox(height: 4), Text( - widget.comment.content, + utf8convert( + widget.comment.content, + ), style: Theme.of(context).textTheme.bodySmall, ), const SizedBox(height: 4), diff --git a/lib/tools/chirp/widgets/post_card.dart b/lib/tools/chirp/widgets/post_card.dart index 4a3b0d5..6ab8568 100644 --- a/lib/tools/chirp/widgets/post_card.dart +++ b/lib/tools/chirp/widgets/post_card.dart @@ -135,7 +135,7 @@ class _PostCardState extends State { ), const SizedBox(height: 4), Text( - trimTo99Characters(widget.post.content), + utf8convert(trimTo99Characters(widget.post.content)), style: Theme.of(context).textTheme.bodyMedium, ), ],