Label Tweaks (#805)

mlemgroup · Dec 18, 2023 · 765ee3b · 765ee3b
1 parent e16af92
commit 765ee3b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/Mlem/Logic/Abbreviate Numbers.swift b/Mlem/Logic/Abbreviate Numbers.swift
@@ -8,8 +8,11 @@
 import Foundation
 
 func abbreviateNumber(_ number: Int) -> String {
+    if number >= 10_000_000 {
+        return "\(Int(round(Double(number) / 1_000_000)))M"
+    }
     if number >= 1_000_000 {
-        return "\(Double(round(Double(number) / 100) / 10))M"
+        return "\(Double(round(Double(number) / 100_000) / 10))M"
     }
     if number >= 10_000 {
         return "\(Int(round(Double(number) / 1000)))K"

diff --git a/Mlem/Models/Content/Inbox/MentionModel.swift b/Mlem/Models/Content/Inbox/MentionModel.swift
@@ -210,7 +210,7 @@ extension MentionModel {
 
         // upvote
         ret.append(MenuFunction.standardMenuFunction(
-            text: votes.myVote == .upvote ? "Undo upvote" : "Upvote",
+            text: votes.myVote == .upvote ? "Undo Upvote" : "Upvote",
             imageName: votes.myVote == .upvote ? Icons.upvoteSquareFill : Icons.upvoteSquare,
             destructiveActionPrompt: nil,
             enabled: true
@@ -222,7 +222,7 @@ extension MentionModel {
 
         // downvote
         ret.append(MenuFunction.standardMenuFunction(
-            text: votes.myVote == .downvote ? "Undo downvote" : "Downvote",
+            text: votes.myVote == .downvote ? "Undo Downvote" : "Downvote",
             imageName: votes.myVote == .downvote ? Icons.downvoteSquareFill : Icons.downvoteSquare,
             destructiveActionPrompt: nil,
             enabled: true
@@ -234,7 +234,7 @@ extension MentionModel {
 
         // toggle read
         ret.append(MenuFunction.standardMenuFunction(
-            text: personMention.read ? "Mark unread" : "Mark read",
+            text: personMention.read ? "Mark Unread" : "Mark Read",
             imageName: personMention.read ? Icons.markUnread : Icons.markRead,
             destructiveActionPrompt: nil,
             enabled: true

diff --git a/Mlem/Models/Content/Inbox/ReplyModel.swift b/Mlem/Models/Content/Inbox/ReplyModel.swift
@@ -205,7 +205,7 @@ extension ReplyModel {
 
         // upvote
         ret.append(MenuFunction.standardMenuFunction(
-            text: votes.myVote == .upvote ? "Undo upvote" : "Upvote",
+            text: votes.myVote == .upvote ? "Undo Upvote" : "Upvote",
             imageName: votes.myVote == .upvote ? Icons.upvoteSquareFill : Icons.upvoteSquare,
             destructiveActionPrompt: nil,
             enabled: true
@@ -217,7 +217,7 @@ extension ReplyModel {
 
         // downvote
         ret.append(MenuFunction.standardMenuFunction(
-            text: votes.myVote == .downvote ? "Undo downvote" : "Downvote",
+            text: votes.myVote == .downvote ? "Undo Downvote" : "Downvote",
             imageName: votes.myVote == .downvote ? Icons.downvoteSquareFill : Icons.downvoteSquare,
             destructiveActionPrompt: nil,
             enabled: true
@@ -229,7 +229,7 @@ extension ReplyModel {
 
         // toggle read
         ret.append(MenuFunction.standardMenuFunction(
-            text: commentReply.read ? "Mark unread" : "Mark read",
+            text: commentReply.read ? "Mark Unread" : "Mark Read",
             imageName: commentReply.read ? Icons.markUnread : Icons.markRead,
             destructiveActionPrompt: nil,
             enabled: true

diff --git a/Mlem/Views/Shared/Posts/ExpandedPostLogic.swift b/Mlem/Views/Shared/Posts/ExpandedPostLogic.swift
@@ -96,7 +96,7 @@ extension ExpandedPost {
 
         // upvote
         let (upvoteText, upvoteImg) = post.votes.myVote == .upvote ?
-            ("Undo upvote", Icons.upvoteSquareFill) :
+            ("Undo Upvote", Icons.upvoteSquareFill) :
             ("Upvote", Icons.upvoteSquare)
         ret.append(MenuFunction.standardMenuFunction(
             text: upvoteText,
@@ -111,7 +111,7 @@ extension ExpandedPost {
 
         // downvote
         let (downvoteText, downvoteImg) = post.votes.myVote == .downvote ?
-            ("Undo downvote", Icons.downvoteSquareFill) :
+            ("Undo Downvote", Icons.downvoteSquareFill) :
             ("Downvote", Icons.downvoteSquare)
         ret.append(MenuFunction.standardMenuFunction(
             text: downvoteText,

diff --git a/Mlem/Views/Shared/Posts/Feed Post.swift b/Mlem/Views/Shared/Posts/Feed Post.swift
@@ -298,7 +298,7 @@ struct FeedPost: View {
 
         // upvote
         let (upvoteText, upvoteImg) = post.votes.myVote == .upvote ?
-            ("Undo upvote", Icons.upvoteSquareFill) :
+            ("Undo Upvote", Icons.upvoteSquareFill) :
             ("Upvote", Icons.upvoteSquare)
         ret.append(MenuFunction.standardMenuFunction(
             text: upvoteText,
@@ -313,7 +313,7 @@ struct FeedPost: View {
 
         // downvote
         let (downvoteText, downvoteImg) = post.votes.myVote == .downvote ?
-            ("Undo downvote", Icons.downvoteSquareFill) :
+            ("Undo Downvote", Icons.downvoteSquareFill) :
             ("Downvote", Icons.downvoteSquare)
         ret.append(MenuFunction.standardMenuFunction(
             text: downvoteText,
@@ -404,7 +404,7 @@ struct FeedPost: View {
         ret.append(MenuFunction.standardMenuFunction(
             text: "Block Community",
             imageName: Icons.hide,
-            destructiveActionPrompt: nil,
+            destructiveActionPrompt: AppConstants.blockCommunityPrompt,
             enabled: true
         ) {
             Task(priority: .userInitiated) {