resolve conflicts

.idea/kotlinc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.8.0" />
+    <option name="version" value="1.8.10" />
   </component>
 </project>

app/src/main/java/com/vitorpamplona/amethyst/service/model/ReportEvent.kt

@@ -60,6 +60,8 @@ class ReportEvent (
     EXPLICIT,
     ILLEGAL,
     SPAM,
-    IMPERSONATION
+    IMPERSONATION,
+    NUDITY,
+    PROFANITY
   }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt

@@ -21,6 +21,7 @@ import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.ui.screen.AccountScreen
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.theme.AmethystTheme
+import java.util.Locale
 
 class MainActivity : ComponentActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
@@ -61,6 +62,8 @@ class MainActivity : ComponentActivity() {
     }
 
     Client.lenient = true
+
+    Locale.setDefault(Locale.ENGLISH)
   }
 
   override fun onResume() {

app/src/main/java/com/vitorpamplona/amethyst/ui/note/BlankNote.kt

@@ -39,7 +39,7 @@ fun BlankNote(modifier: Modifier = Modifier, isQuote: Boolean = false) {
           horizontalArrangement = Arrangement.Center
         ) {
           Text(
-            text = stringResource(R.string.referenced_post_not_found),
+            text = stringResource(R.string.post_not_found),
             modifier = Modifier.padding(30.dp),
             color = Color.Gray,
           )

app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt

@@ -322,6 +322,8 @@ fun NoteCompose(
                                 ReportEvent.ReportType.SPAM -> stringResource(R.string.spam)
                                 ReportEvent.ReportType.IMPERSONATION -> stringResource(R.string.impersonation)
                                 ReportEvent.ReportType.ILLEGAL -> stringResource(R.string.illegal_behavior)
+                                ReportEvent.ReportType.NUDITY -> stringResource(R.string.nudity)
+                                ReportEvent.ReportType.PROFANITY -> stringResource(R.string.profanity_hateful_speech)
                                 else -> stringResource(R.string.unknown)
                             }
                         }.joinToString(", ")

app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReplyInformation.kt

@@ -92,7 +92,7 @@ fun ReplyInformation(replyTo: List<Note>?, dupMentions: List<User>?, account: Ac
                 )
 
                 Text(
-                  " others",
+                  " ${stringResource(R.string.others)}",
                   fontSize = 13.sp,
                   color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                 )

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt

@@ -829,6 +829,14 @@ fun UserProfileDropDownMenu(user: User, popupExpanded: Boolean, onDismiss: () ->
             }) {
                 Text(stringResource(id = R.string.report_spam_scam))
             }
+            DropdownMenuItem(onClick = {
+                accountViewModel.report(user, ReportEvent.ReportType.PROFANITY);
+                user.let { accountViewModel.hide(it, context) }
+                onDismiss()
+            }) {
+                Text(stringResource(R.string.report_hateful_speech))
+            }
+
             DropdownMenuItem(onClick = {
                 accountViewModel.report(user, ReportEvent.ReportType.IMPERSONATION);
                 user.let { accountViewModel.hide(it, context) }
@@ -837,11 +845,11 @@ fun UserProfileDropDownMenu(user: User, popupExpanded: Boolean, onDismiss: () ->
                 Text(stringResource(id = R.string.report_impersonation))
             }
             DropdownMenuItem(onClick = {
-                accountViewModel.report(user, ReportEvent.ReportType.EXPLICIT);
+                accountViewModel.report(user, ReportEvent.ReportType.NUDITY);
                 user.let { accountViewModel.hide(it, context) }
                 onDismiss()
             }) {
-                Text(stringResource(id = R.string.report_explicit_content))
+                Text(stringResource(R.string.report_nudity_porn))
             }
             DropdownMenuItem(onClick = {
                 accountViewModel.report(user, ReportEvent.ReportType.ILLEGAL);

app/src/main/res/values-ar/strings.xml

@@ -8,13 +8,13 @@
     <string name="scan_qr">مسح QR</string>
     <string name="show_anyway">عرض على أي حال</string>
     <string name="post_was_flagged_as_inappropriate_by">تم وضع علامة على المنشور على أنه غير لائق بواسطة</string>
-    <string name="referenced_post_not_found">المنشور المشار إليه غير موجود</string>
+    <string name="post_not_found">المنشور غير موجود</string>
     <string name="channel_image">صورة القناة</string>
     <string name="referenced_event_not_found">لم يتم العثور على الحدث المشار إليه</string>
     <string name="could_not_decrypt_the_message">لا يمكن فك تشفير الرسالة</string>
     <string name="group_picture">صورة المجموعة</string>
     <string name="explicit_content">محتوى فاضح</string>
-    <string name="spam">زسائل عشوائية</string>
+    <string name="spam">رسائل عشوائية</string>
     <string name="impersonation">التمثيل</string>
     <string name="illegal_behavior">تصرف غير قانوني</string>
     <string name="unknown">غير معروف</string>
@@ -170,4 +170,9 @@
     <string name="h">س</string>
     <string name="m">د</string>
     <string name="d">يوم</string>
+    <string name="nudity">عُري</string>
+    <string name="profanity_hateful_speech">الألفاظ النابية / خطاب كراهية</string>
+    <string name="report_hateful_speech">أبلغ عن كلام يحض على الكراهية</string>
+    <string name="report_nudity_porn">الإبلاغ عن عُري / إباحي</string>
+    <string name="others">others</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -7,7 +7,7 @@
     <string name="scan_qr">Scan QR</string>
     <string name="show_anyway">Show Anyway</string>
     <string name="post_was_flagged_as_inappropriate_by">Post was flagged as inappropriate by</string>
-    <string name="referenced_post_not_found">Referenced post not found</string>
+    <string name="post_not_found">post not found</string>
     <string name="channel_image">Channel Image</string>
     <string name="referenced_event_not_found">Referenced event not found</string>
     <string name="could_not_decrypt_the_message">Could Not decrypt the message</string>
@@ -172,4 +172,9 @@
     <string name="h">h</string>
     <string name="m">m</string>
     <string name="d">d</string>
+    <string name="nudity">Nudity</string>
+    <string name="profanity_hateful_speech">Profanity / Hateful speech</string>
+    <string name="report_hateful_speech">Report Hateful speech</string>
+    <string name="report_nudity_porn">Report Nudity / Porn</string>
+    <string name="others">others</string>
 </resources>