feat(settings): fully fledged AniList settings (#453)

app/src/main/AndroidManifest.xml

@@ -132,10 +132,11 @@
         </activity>
         <activity android:name=".others.calc.CalcActivity"
             android:parentActivityName=".MainActivity" />
-        <activity android:name=".settings.FAQActivity" />
+        <activity android:name=".settings.AnilistSettingsActivity"/>
-        <activity android:name=".settings.ReaderSettingsActivity" />
         <activity android:name=".settings.UserInterfaceSettingsActivity" />
         <activity android:name=".settings.PlayerSettingsActivity" />
+        <activity android:name=".settings.ReaderSettingsActivity" />
+        <activity android:name=".settings.FAQActivity" />
         <activity
             android:name=".settings.SettingsActivity"
             android:parentActivityName=".MainActivity" />

app/src/main/java/ani/dantotsu/connections/anilist/Anilist.kt

@@ -15,6 +15,8 @@ import ani.dantotsu.snackString
 import ani.dantotsu.toast
 import ani.dantotsu.util.Logger
 import java.util.Calendar
+import java.util.Locale
+import kotlin.math.abs
 
 object Anilist {
     val query: AnilistQueries = AnilistQueries()
@@ -22,7 +24,7 @@ object Anilist {
 
     var token: String? = null
     var username: String? = null
-    var adult: Boolean = false
+
     var userid: Int? = null
     var avatar: String? = null
     var bg: String? = null
@@ -36,6 +38,17 @@ object Anilist {
     var rateLimitReset: Long = 0
 
     var initialized = false
+    var adult: Boolean = false
+    var titleLanguage: String? = null
+    var staffNameLanguage: String? = null
+    var airingNotifications: Boolean = false
+    var restrictMessagesToFollowing: Boolean = false
+    var scoreFormat: String? = null
+    var rowOrder: String? = null
+    var activityMergeTime: Int? = null
+    var timezone: String? = null
+    var animeCustomLists: List<String>? = null
+    var mangaCustomLists: List<String>? = null
 
     val sortBy = listOf(
         "SCORE_DESC",
@@ -96,6 +109,86 @@ object Anilist {
         "Original Creator", "Story & Art", "Story"
     )
 
+    val timeZone = listOf(
+        "(GMT-11:00) Pago Pago",
+        "(GMT-10:00) Hawaii Time",
+        "(GMT-09:00) Alaska Time",
+        "(GMT-08:00) Pacific Time",
+        "(GMT-07:00) Mountain Time",
+        "(GMT-06:00) Central Time",
+        "(GMT-05:00) Eastern Time",
+        "(GMT-04:00) Atlantic Time - Halifax",
+        "(GMT-03:00) Sao Paulo",
+        "(GMT-02:00) Mid-Atlantic",
+        "(GMT-01:00) Azores",
+        "(GMT+00:00) London",
+        "(GMT+01:00) Berlin",
+        "(GMT+02:00) Helsinki",
+        "(GMT+03:00) Istanbul",
+        "(GMT+04:00) Dubai",
+        "(GMT+04:30) Kabul",
+        "(GMT+05:00) Maldives",
+        "(GMT+05:30) India Standard Time",
+        "(GMT+05:45) Kathmandu",
+        "(GMT+06:00) Dhaka",
+        "(GMT+06:30) Cocos",
+        "(GMT+07:00) Bangkok",
+        "(GMT+08:00) Hong Kong",
+        "(GMT+08:30) Pyongyang",
+        "(GMT+09:00) Tokyo",
+        "(GMT+09:30) Central Time - Darwin",
+        "(GMT+10:00) Eastern Time - Brisbane",
+        "(GMT+10:30) Central Time - Adelaide",
+        "(GMT+11:00) Eastern Time - Melbourne, Sydney",
+        "(GMT+12:00) Nauru",
+        "(GMT+13:00) Auckland",
+        "(GMT+14:00) Kiritimati",
+    )
+
+    val titleLang = listOf(
+        "English (Attack on Titan)",
+        "Romaji (Shingeki no Kyojin)",
+        "Native (進撃の巨人)"
+    )
+
+    val staffNameLang = listOf(
+        "Romaji, Western Order (Killua Zoldyck)",
+        "Romaji (Zoldyck Killua)",
+        "Native (キルア=ゾルディック)"
+    )
+
+    val ScoreFormat = listOf(
+        "100 Point (55/100)",
+        "10 Point Decimal (5.5/10)",
+        "10 Point (5/10)",
+        "5 Star (3/5)",
+        "3 Point Smiley :)"
+    )
+
+    val rowOrderMap = mapOf(
+        "Score" to "score",
+        "Title" to "title",
+        "Last Updated" to "updatedAt",
+        "Last Added" to "id"
+    )
+
+    val activityMergeTimeMap = mapOf(
+        "Never" to 0,
+        "30 mins" to 30,
+        "69 mins" to 69,
+        "1 hour" to 60,
+        "2 hours" to 120,
+        "3 hours" to 180,
+        "6 hours" to 360,
+        "12 hours" to 720,
+        "1 day" to 1440,
+        "2 days" to 2880,
+        "3 days" to 4320,
+        "1 week" to 10080,
+        "2 weeks" to 20160,
+        "Always" to 29160
+    )
+
     private val cal: Calendar = Calendar.getInstance()
     private val currentYear = cal.get(Calendar.YEAR)
     private val currentSeason: Int = when (cal.get(Calendar.MONTH)) {
@@ -106,6 +199,32 @@ object Anilist {
         else -> 0
     }
 
+    fun getDisplayTimezone(apiTimezone: String): String {
+        val parts = apiTimezone.split(":")
+        if (parts.size != 2) return "(GMT+00:00) London"
+
+        val hours = parts[0].toIntOrNull() ?: 0
+        val minutes = parts[1].toIntOrNull() ?: 0
+        val sign = if (hours >= 0) "+" else "-"
+        val formattedHours = String.format(Locale.US, "%02d", abs(hours))
+        val formattedMinutes = String.format(Locale.US, "%02d", minutes)
+
+        val searchString = "(GMT$sign$formattedHours:$formattedMinutes)"
+        return timeZone.find { it.contains(searchString) } ?: "(GMT+00:00) London"
+    }
+
+    fun getApiTimezone(displayTimezone: String): String {
+        val regex = """\(GMT([+-])(\d{2}):(\d{2})\)""".toRegex()
+        val matchResult = regex.find(displayTimezone)
+        return if (matchResult != null) {
+            val (sign, hours, minutes) = matchResult.destructured
+            val formattedSign = if (sign == "+") "" else "-"
+            "$formattedSign$hours:$minutes"
+        } else {
+            "00:00"
+        }
+    }
+
     private fun getSeason(next: Boolean): Pair<String, Int> {
         var newSeason = if (next) currentSeason + 1 else currentSeason - 1
         var newYear = currentYear

app/src/main/java/ani/dantotsu/connections/anilist/AnilistMutations.kt

@@ -10,9 +10,92 @@ import kotlinx.serialization.json.JsonObject
 
 class AnilistMutations {
 
+    suspend fun updateSettings(
+        timezone: String? = null,
+        titleLanguage: String? = null,
+        staffNameLanguage: String? = null,
+        activityMergeTime: Int? = null,
+        airingNotifications: Boolean? = null,
+        displayAdultContent: Boolean? = null,
+        restrictMessagesToFollowing: Boolean? = null,
+        scoreFormat: String? = null,
+        rowOrder: String? = null,
+    ) {
+        val query = """
+            mutation (
+                ${"$"}timezone: String,
+                ${"$"}titleLanguage: UserTitleLanguage,
+                ${"$"}staffNameLanguage: UserStaffNameLanguage,
+                ${"$"}activityMergeTime: Int,
+                ${"$"}airingNotifications: Boolean,
+                ${"$"}displayAdultContent: Boolean,
+                ${"$"}restrictMessagesToFollowing: Boolean,
+                ${"$"}scoreFormat: ScoreFormat,
+                ${"$"}rowOrder: String
+            ) {
+                UpdateUser(
+                    timezone: ${"$"}timezone,
+                    titleLanguage: ${"$"}titleLanguage,
+                    staffNameLanguage: ${"$"}staffNameLanguage,
+                    activityMergeTime: ${"$"}activityMergeTime,
+                    airingNotifications: ${"$"}airingNotifications,
+                    displayAdultContent: ${"$"}displayAdultContent,
+                    restrictMessagesToFollowing: ${"$"}restrictMessagesToFollowing,
+                    scoreFormat: ${"$"}scoreFormat,
+                    rowOrder: ${"$"}rowOrder,
+                ) {
+                    id
+                    options {
+                        timezone
+                        titleLanguage
+                        staffNameLanguage
+                        activityMergeTime
+                        airingNotifications
+                        displayAdultContent
+                        restrictMessagesToFollowing
+                    }
+                    mediaListOptions {
+                      scoreFormat
+                      rowOrder
+                    }
+                }
+            }
+        """.trimIndent()
+
+        val variables = """
+            {
+                ${timezone?.let { """"timezone":"$it"""" } ?: ""}
+                ${titleLanguage?.let { """"titleLanguage":"$it"""" } ?: ""}
+                ${staffNameLanguage?.let { """"staffNameLanguage":"$it"""" } ?: ""}
+                ${activityMergeTime?.let { """"activityMergeTime":$it""" } ?: ""}
+                ${airingNotifications?.let { """"airingNotifications":$it""" } ?: ""}
+                ${displayAdultContent?.let { """"displayAdultContent":$it""" } ?: ""}
+                ${restrictMessagesToFollowing?.let { """"restrictMessagesToFollowing":$it""" } ?: ""}
+                ${scoreFormat?.let { """"scoreFormat":"$it"""" } ?: ""}
+                ${rowOrder?.let { """"rowOrder":"$it"""" } ?: ""}
+            }
+        """.trimIndent().replace("\n", "").replace("""    """, "").replace(",}", "}")
+
+        executeQuery<JsonObject>(query, variables)
+    }
+
     suspend fun toggleFav(anime: Boolean = true, id: Int) {
-        val query =
+        val query = """
-            """mutation (${"$"}animeId: Int,${"$"}mangaId:Int) { ToggleFavourite(animeId:${"$"}animeId,mangaId:${"$"}mangaId){ anime { edges { id } } manga { edges { id } } } }"""
+            mutation (${"$"}animeId: Int, ${"$"}mangaId: Int) {
+                ToggleFavourite(animeId: ${"$"}animeId, mangaId: ${"$"}mangaId) {
+                    anime {
+                        edges {
+                            id
+                        }
+                    }
+                    manga {
+                        edges {
+                            id
+                        }
+                    }
+                }
+            }
+        """.trimIndent()
         val variables = if (anime) """{"animeId":"$id"}""" else """{"mangaId":"$id"}"""
         executeQuery<JsonObject>(query, variables)
     }
@@ -25,7 +108,17 @@ class AnilistMutations {
             FavType.STAFF -> "staffId"
             FavType.STUDIO -> "studioId"
         }
-        val query = """mutation{ToggleFavourite($filter:$id){anime{pageInfo{total}}}}"""
+        val query = """
+            mutation {
+                ToggleFavourite($filter: $id) {
+                    anime {
+                        pageInfo {
+                            total
+                        }
+                    }
+                }
+            }
+        """.trimIndent()
         val result = executeQuery<JsonObject>(query)
         return result?.get("errors") == null && result != null
     }
@@ -34,6 +127,51 @@ class AnilistMutations {
         ANIME, MANGA, CHARACTER, STAFF, STUDIO
     }
 
+    suspend fun deleteCustomList(name: String, type: String): Boolean {
+        val query = """
+            mutation (${"$"}name: String, ${"$"}type: MediaType) {
+                DeleteCustomList(customList: ${"$"}name, type: ${"$"}type) {
+                    deleted
+                }
+            }
+        """.trimIndent()
+        val variables = """
+            {
+                "name": "$name",
+                "type": "$type"
+            }
+        """.trimIndent()
+        val result = executeQuery<JsonObject>(query, variables)
+        return result?.get("errors") == null
+    }
+
+    suspend fun updateCustomLists(animeCustomLists: List<String>?, mangaCustomLists: List<String>?): Boolean {
+        val query = """
+            mutation (${"$"}animeListOptions: MediaListOptionsInput, ${"$"}mangaListOptions: MediaListOptionsInput) {
+                UpdateUser(animeListOptions: ${"$"}animeListOptions, mangaListOptions: ${"$"}mangaListOptions) {
+                    mediaListOptions {
+                        animeList {
+                            customLists
+                        }
+                        mangaList {
+                            customLists
+                        }
+                    }
+                }
+            }
+        """.trimIndent()
+        val variables = """
+            {
+                ${animeCustomLists?.let { """"animeListOptions": {"customLists": ${Gson().toJson(it)}}""" } ?: ""}
+                ${if (animeCustomLists != null && mangaCustomLists != null) "," else ""}
+                ${mangaCustomLists?.let { """"mangaListOptions": {"customLists": ${Gson().toJson(it)}}""" } ?: ""}
+            }
+        """.trimIndent().replace("\n", "").replace("""    """, "").replace(",}", "}")
+
+        val result = executeQuery<JsonObject>(query, variables)
+        return result?.get("errors") == null
+    }
+
     suspend fun editList(
         mediaID: Int,
         progress: Int? = null,
@@ -46,14 +184,45 @@ class AnilistMutations {
         completedAt: FuzzyDate? = null,
         customList: List<String>? = null
     ) {
-
         val query = """
-            mutation ( ${"$"}mediaID: Int, ${"$"}progress: Int,${"$"}private:Boolean,${"$"}repeat: Int, ${"$"}notes: String, ${"$"}customLists: [String], ${"$"}scoreRaw:Int, ${"$"}status:MediaListStatus, ${"$"}start:FuzzyDateInput${if (startedAt != null) "=" + startedAt.toVariableString() else ""}, ${"$"}completed:FuzzyDateInput${if (completedAt != null) "=" + completedAt.toVariableString() else ""} ) {
+            mutation (
-                SaveMediaListEntry( mediaId: ${"$"}mediaID, progress: ${"$"}progress, repeat: ${"$"}repeat, notes: ${"$"}notes, private: ${"$"}private, scoreRaw: ${"$"}scoreRaw, status:${"$"}status, startedAt: ${"$"}start, completedAt: ${"$"}completed , customLists: ${"$"}customLists ) {
+                ${"$"}mediaID: Int,
-                    score(format:POINT_10_DECIMAL) startedAt{year month day} completedAt{year month day}
+                ${"$"}progress: Int,
+                ${"$"}private: Boolean,
+                ${"$"}repeat: Int,
+                ${"$"}notes: String,
+                ${"$"}customLists: [String],
+                ${"$"}scoreRaw: Int,
+                ${"$"}status: MediaListStatus,
+                ${"$"}start: FuzzyDateInput${if (startedAt != null) "=" + startedAt.toVariableString() else ""},
+                ${"$"}completed: FuzzyDateInput${if (completedAt != null) "=" + completedAt.toVariableString() else ""}
+            ) {
+                SaveMediaListEntry(
+                    mediaId: ${"$"}mediaID,
+                    progress: ${"$"}progress,
+                    repeat: ${"$"}repeat,
+                    notes: ${"$"}notes,
+                    private: ${"$"}private,
+                    scoreRaw: ${"$"}scoreRaw,
+                    status: ${"$"}status,
+                    startedAt: ${"$"}start,
+                    completedAt: ${"$"}completed,
+                    customLists: ${"$"}customLists
+                ) {
+                    score(format: POINT_10_DECIMAL)
+                    startedAt {
+                        year
+                        month
+                        day
+                    }
+                    completedAt {
+                        year
+                        month
+                        day
                     }
                 }
-        """.replace("\n", "").replace("""    """, "")
+            }
+        """.trimIndent()
 
         val variables = """{"mediaID":$mediaID
             ${if (private != null) ""","private":$private""" else ""}
@@ -69,91 +238,170 @@ class AnilistMutations {
     }
 
     suspend fun deleteList(listId: Int) {
-        val query = "mutation(${"$"}id:Int){DeleteMediaListEntry(id:${"$"}id){deleted}}"
+        val query = """
+            mutation(${"$"}id: Int) {
+                DeleteMediaListEntry(id: ${"$"}id) {
+                    deleted
+                }
+            }
+        """.trimIndent()
         val variables = """{"id":"$listId"}"""
         executeQuery<JsonObject>(query, variables)
     }
 
-
     suspend fun rateReview(reviewId: Int, rating: String): Query.RateReviewResponse? {
-        val query =
+        val query = """
-            "mutation{RateReview(reviewId:$reviewId,rating:$rating){id mediaId mediaType summary body(asHtml:true)rating ratingAmount userRating score private siteUrl createdAt updatedAt user{id name bannerImage avatar{medium large}}}}"
+            mutation {
+                RateReview(reviewId: $reviewId, rating: $rating) {
+                    id
+                    mediaId
+                    mediaType
+                    summary
+                    body(asHtml: true)
+                    rating
+                    ratingAmount
+                    userRating
+                    score
+                    private
+                    siteUrl
+                    createdAt
+                    updatedAt
+                    user {
+                        id
+                        name
+                        bannerImage
+                        avatar {
+                            medium
+                            large
+                        }
+                    }
+                }
+            }
+        """.trimIndent()
         return executeQuery<Query.RateReviewResponse>(query)
     }
 
     suspend fun toggleFollow(id: Int): Query.ToggleFollow? {
         return executeQuery<Query.ToggleFollow>(
-            """mutation{ToggleFollow(userId:$id){id, isFollowing, isFollower}}"""
+            """
-        )
+            mutation {
+                ToggleFollow(userId: $id) {
+                    id
+                    isFollowing
+                    isFollower
+                }
+            }
+        """.trimIndent())
     }
 
     suspend fun toggleLike(id: Int, type: String): ToggleLike? {
         return executeQuery<ToggleLike>(
-            """mutation Like{ToggleLikeV2(id:$id,type:$type){__typename}}"""
+            """
-        )
+            mutation Like {
+                ToggleLikeV2(id: $id, type: $type) {
+                    __typename
+                }
+            }
+        """.trimIndent())
     }
 
     suspend fun postActivity(text: String, edit: Int? = null): String {
         val encodedText = text.stringSanitizer()
-        val query =
+        val query = """
-            "mutation{SaveTextActivity(${if (edit != null) "id:$edit," else ""} text:$encodedText){siteUrl}}"
+            mutation {
+                SaveTextActivity(${if (edit != null) "id: $edit," else ""} text: $encodedText) {
+                    siteUrl
+                }
+            }
+        """.trimIndent()
         val result = executeQuery<JsonObject>(query)
         val errors = result?.get("errors")
-        return errors?.toString()
+        return errors?.toString() ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
-            ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
     }
 
-    suspend fun postMessage(
+    suspend fun postMessage(userId: Int, text: String, edit: Int? = null, isPrivate: Boolean = false): String {
-        userId: Int,
-        text: String,
-        edit: Int? = null,
-        isPrivate: Boolean = false
-    ): String {
         val encodedText = text.replace("", "").stringSanitizer()
-        val query =
+        val query = """
-            "mutation{SaveMessageActivity(${if (edit != null) "id:$edit," else ""} recipientId:$userId,message:$encodedText,private:$isPrivate){id}}"
+            mutation {
+                SaveMessageActivity(
+                    ${if (edit != null) "id: $edit," else ""}
+                    recipientId: $userId,
+                    message: $encodedText,
+                    private: $isPrivate
+                ) {
+                    id
+                }
+            }
+        """.trimIndent()
         val result = executeQuery<JsonObject>(query)
         val errors = result?.get("errors")
-        return errors?.toString()
+        return errors?.toString() ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
-            ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
     }
 
     suspend fun postReply(activityId: Int, text: String, edit: Int? = null): String {
         val encodedText = text.stringSanitizer()
-        val query =
+        val query = """
-            "mutation{SaveActivityReply(${if (edit != null) "id:$edit," else ""} activityId:$activityId,text:$encodedText){id}}"
+            mutation {
+                SaveActivityReply(
+                    ${if (edit != null) "id: $edit," else ""}
+                    activityId: $activityId,
+                    text: $encodedText
+                ) {
+                    id
+                }
+            }
+        """.trimIndent()
         val result = executeQuery<JsonObject>(query)
         val errors = result?.get("errors")
-        return errors?.toString()
+        return errors?.toString() ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
-            ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
     }
 
     suspend fun postReview(summary: String, body: String, mediaId: Int, score: Int): String {
         val encodedSummary = summary.stringSanitizer()
         val encodedBody = body.stringSanitizer()
-        val query =
+        val query = """
-            "mutation{SaveReview(mediaId:$mediaId,summary:$encodedSummary,body:$encodedBody,score:$score){siteUrl}}"
+            mutation {
+                SaveReview(
+                    mediaId: $mediaId,
+                    summary: $encodedSummary,
+                    body: $encodedBody,
+                    score: $score
+                ) {
+                    siteUrl
+                }
+            }
+        """.trimIndent()
         val result = executeQuery<JsonObject>(query)
         val errors = result?.get("errors")
-        return errors?.toString()
+        return errors?.toString() ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
-            ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
     }
 
     suspend fun deleteActivityReply(activityId: Int): Boolean {
-        val query = "mutation{DeleteActivityReply(id:$activityId){deleted}}"
+        val query = """
+            mutation {
+                DeleteActivityReply(id: $activityId) {
+                    deleted
+                }
+            }
+        """.trimIndent()
         val result = executeQuery<JsonObject>(query)
         val errors = result?.get("errors")
         return errors == null
     }
 
     suspend fun deleteActivity(activityId: Int): Boolean {
-        val query = "mutation{DeleteActivity(id:$activityId){deleted}}"
+        val query = """
+            mutation {
+                DeleteActivity(id: $activityId) {
+                    deleted
+                }
+            }
+        """.trimIndent()
         val result = executeQuery<JsonObject>(query)
         val errors = result?.get("errors")
         return errors == null
     }
 
-
     private fun String.stringSanitizer(): String {
         val sb = StringBuilder()
         var i = 0

app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt

@@ -43,8 +43,8 @@ class AnilistQueries {
     suspend fun getUserData(): Boolean {
         val response: Query.Viewer?
         measureTimeMillis {
-            response =
+            response = executeQuery(
-                executeQuery("""{Viewer{name options{displayAdultContent}avatar{medium}bannerImage id mediaListOptions{rowOrder animeList{sectionOrder customLists}mangaList{sectionOrder customLists}}statistics{anime{episodesWatched}manga{chaptersRead}}unreadNotificationCount}}""")
+                """{Viewer{name options{timezone titleLanguage staffNameLanguage activityMergeTime airingNotifications displayAdultContent restrictMessagesToFollowing} avatar{medium} bannerImage id mediaListOptions{scoreFormat rowOrder animeList{customLists} mangaList{customLists}} statistics{anime{episodesWatched} manga{chaptersRead}} unreadNotificationCount}}""")
         }.also { println("time : $it") }
         val user = response?.data?.user ?: return false
 
@@ -61,6 +61,27 @@ class AnilistQueries {
         val unread = PrefManager.getVal<Int>(PrefName.UnreadCommentNotifications)
         Anilist.unreadNotificationCount += unread
         Anilist.initialized = true
+
+        user.options?.let {
+            Anilist.titleLanguage = it.titleLanguage.toString()
+            Anilist.staffNameLanguage = it.staffNameLanguage.toString()
+            Anilist.airingNotifications = it.airingNotifications ?: false
+            Anilist.restrictMessagesToFollowing = it.restrictMessagesToFollowing ?: false
+            Anilist.timezone = it.timezone
+            Anilist.activityMergeTime = it.activityMergeTime
+        }
+        user.mediaListOptions?.let {
+            Anilist.scoreFormat = it.scoreFormat.toString()
+            Anilist.rowOrder = it.rowOrder
+
+            it.animeList?.let { animeList ->
+                Anilist.animeCustomLists = animeList.customLists
+            }
+
+            it.mangaList?.let { mangaList ->
+                Anilist.mangaCustomLists = mangaList.customLists
+            }
+        }
         return true
     }
 

app/src/main/java/ani/dantotsu/connections/anilist/api/User.kt

@@ -74,7 +74,7 @@ data class User(
 @Serializable
 data class UserOptions(
     // The language the user wants to see media titles in
-    // @SerialName("titleLanguage") var titleLanguage: UserTitleLanguage?,
+    @SerialName("titleLanguage") var titleLanguage: UserTitleLanguage?,
 
     // Whether the user has enabled viewing of 18+ content
     @SerialName("displayAdultContent") var displayAdultContent: Boolean?,
@@ -88,17 +88,17 @@ data class UserOptions(
     //    // Notification options
     //    // @SerialName("notificationOptions") var notificationOptions: List<NotificationOption>?,
     //
-    //    // The user's timezone offset (Auth user only)
+    // The user's timezone offset (Auth user only)
-    //    @SerialName("timezone") var timezone: String?,
+    @SerialName("timezone") var timezone: String?,
     //
-    //    // Minutes between activity for them to be merged together. 0 is Never, Above 2 weeks (20160 mins) is Always.
+    // Minutes between activity for them to be merged together. 0 is Never, Above 2 weeks (20160 mins) is Always.
-    //    @SerialName("activityMergeTime") var activityMergeTime: Int?,
+    @SerialName("activityMergeTime") var activityMergeTime: Int?,
     //
-    //    // The language the user wants to see staff and character names in
+    // The language the user wants to see staff and character names in
-    //    // @SerialName("staffNameLanguage") var staffNameLanguage: UserStaffNameLanguage?,
+    @SerialName("staffNameLanguage") var staffNameLanguage: UserStaffNameLanguage?,
     //
-    //    // Whether the user only allow messages from users they follow
+    // Whether the user only allow messages from users they follow
-    //    @SerialName("restrictMessagesToFollowing") var restrictMessagesToFollowing: Boolean?,
+    @SerialName("restrictMessagesToFollowing") var restrictMessagesToFollowing: Boolean?,
 
     // The list activity types the user has disabled from being created from list updates
     // @SerialName("disabledListActivity") var disabledListActivity: List<ListActivityOption>?,
@@ -119,6 +119,26 @@ data class UserStatisticTypes(
     @SerialName("manga") var manga: UserStatistics?
 )
 
+@Serializable
+enum class UserTitleLanguage {
+    @SerialName("ENGLISH")
+    ENGLISH,
+    @SerialName("ROMAJI")
+    ROMAJI,
+    @SerialName("NATIVE")
+    NATIVE
+}
+
+@Serializable
+enum class UserStaffNameLanguage {
+    @SerialName("ENGLISH")
+    ENGLISH,
+    @SerialName("ROMAJI")
+    ROMAJI,
+    @SerialName("NATIVE")
+    NATIVE
+}
+
 @Serializable
 data class UserStatistics(
     //
@@ -164,7 +184,7 @@ data class Favourites(
 @Serializable
 data class MediaListOptions(
     // The score format the user is using for media lists
-    @SerialName("scoreFormat") var scoreFormat: String?,
+    @SerialName("scoreFormat") var scoreFormat: ScoreFormat?,
 
     // The default order list rows should be displayed in
     @SerialName("rowOrder") var rowOrder: String?,
@@ -176,13 +196,27 @@ data class MediaListOptions(
     @SerialName("mangaList") var mangaList: MediaListTypeOptions?,
 )
 
+@Serializable
+enum class ScoreFormat {
+    @SerialName("POINT_100")
+    POINT_100,
+    @SerialName("POINT_10_DECIMAL")
+    POINT_10_DECIMAL,
+    @SerialName("POINT_10")
+    POINT_10,
+    @SerialName("POINT_5")
+    POINT_5,
+    @SerialName("POINT_3")
+    POINT_3,
+}
+
 @Serializable
 data class MediaListTypeOptions(
     // The order each list should be displayed in
     @SerialName("sectionOrder") var sectionOrder: List<String>?,
 
-    // If the completed sections of the list should be separated by format
+    //    // If the completed sections of the list should be separated by format
-    @SerialName("splitCompletedSectionByFormat") var splitCompletedSectionByFormat: Boolean?,
+    //    @SerialName("splitCompletedSectionByFormat") var splitCompletedSectionByFormat: Boolean?,
 
     // The names of the user's custom lists
     @SerialName("customLists") var customLists: List<String>?,

app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt

@@ -293,7 +293,7 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
                 binding.mediaTotal.visibility = View.VISIBLE
                 binding.mediaAddToList.text = userStatus
             } else {
-                binding.mediaAddToList.setText(R.string.add)
+                binding.mediaAddToList.setText(R.string.add_list)
             }
             total()
             binding.mediaAddToList.setOnClickListener {

app/src/main/java/ani/dantotsu/profile/StatsFragment.kt

@@ -252,14 +252,14 @@ class StatsFragment :
                 stat?.statistics?.anime?.scores?.map {
                     convertScore(
                         it.score,
-                        stat.mediaListOptions.scoreFormat
+                        stat.mediaListOptions.scoreFormat.toString()
                     )
                 } ?: emptyList()
             } else {
                 stat?.statistics?.manga?.scores?.map {
                     convertScore(
                         it.score,
-                        stat.mediaListOptions.scoreFormat
+                        stat.mediaListOptions.scoreFormat.toString()
                     )
                 } ?: emptyList()
             }

app/src/main/java/ani/dantotsu/settings/AnilistSettingsActivity.kt

@@ -0,0 +1,340 @@
+package ani.dantotsu.settings
+
+import android.os.Bundle
+import android.view.ViewGroup
+import android.widget.ArrayAdapter
+import android.widget.LinearLayout
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.children
+import androidx.core.view.updateLayoutParams
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import ani.dantotsu.R
+import ani.dantotsu.connections.anilist.Anilist
+import ani.dantotsu.connections.anilist.Anilist.ScoreFormat
+import ani.dantotsu.connections.anilist.Anilist.activityMergeTimeMap
+import ani.dantotsu.connections.anilist.Anilist.rowOrderMap
+import ani.dantotsu.connections.anilist.Anilist.staffNameLang
+import ani.dantotsu.connections.anilist.Anilist.titleLang
+import ani.dantotsu.connections.anilist.AnilistMutations
+import ani.dantotsu.databinding.ActivitySettingsAnilistBinding
+import ani.dantotsu.initActivity
+import ani.dantotsu.navBarHeight
+import ani.dantotsu.restartApp
+import ani.dantotsu.statusBarHeight
+import ani.dantotsu.themes.ThemeManager
+import ani.dantotsu.toast
+import ani.dantotsu.util.customAlertDialog
+import com.google.android.material.textfield.TextInputEditText
+import com.google.android.material.textfield.TextInputLayout
+import kotlinx.coroutines.launch
+
+class AnilistSettingsActivity : AppCompatActivity() {
+    private lateinit var binding: ActivitySettingsAnilistBinding
+    private lateinit var anilistMutations: AnilistMutations
+
+    enum class FormatLang {
+        ENGLISH,
+        ROMAJI,
+        NATIVE
+    }
+
+    enum class FormatScore {
+        POINT_100,
+        POINT_10_DECIMAL,
+        POINT_10,
+        POINT_5,
+        POINT_3,
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
+        initActivity(this)
+        val context = this
+        binding = ActivitySettingsAnilistBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        anilistMutations = AnilistMutations()
+
+        binding.apply {
+            settingsAnilistLayout.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                topMargin = statusBarHeight
+                bottomMargin = navBarHeight
+            }
+            binding.anilistSettingsBack.setOnClickListener {
+                onBackPressedDispatcher.onBackPressed()
+            }
+
+            val currentTitleLang = Anilist.titleLanguage
+            val titleFormat = FormatLang.entries.firstOrNull { it.name == currentTitleLang } ?: FormatLang.ENGLISH
+
+            settingsAnilistTitleLanguage.setText(titleLang[titleFormat.ordinal])
+            settingsAnilistTitleLanguage.setAdapter(
+                ArrayAdapter(context, R.layout.item_dropdown, titleLang)
+            )
+            settingsAnilistTitleLanguage.setOnItemClickListener { _, _, i, _ ->
+                val selectedLanguage = when (i) {
+                    0 -> "ENGLISH"
+                    1 -> "ROMAJI"
+                    2 -> "NATIVE"
+                    else -> "ENGLISH"
+                }
+                lifecycleScope.launch {
+                    anilistMutations.updateSettings(titleLanguage = selectedLanguage)
+                    Anilist.titleLanguage = selectedLanguage
+                    restartApp()
+                }
+                settingsAnilistTitleLanguage.clearFocus()
+            }
+
+            val currentStaffNameLang = Anilist.staffNameLanguage
+            val staffNameFormat = FormatLang.entries.firstOrNull { it.name == currentStaffNameLang } ?: FormatLang.ENGLISH
+
+            settingsAnilistStaffLanguage.setText(staffNameLang[staffNameFormat.ordinal])
+            settingsAnilistStaffLanguage.setAdapter(
+                ArrayAdapter(context, R.layout.item_dropdown, staffNameLang)
+            )
+            settingsAnilistStaffLanguage.setOnItemClickListener { _, _, i, _ ->
+                val selectedLanguage = when (i) {
+                    0 -> "ENGLISH"
+                    1 -> "ROMAJI"
+                    2 -> "NATIVE"
+                    else -> "ENGLISH"
+                }
+                lifecycleScope.launch {
+                    anilistMutations.updateSettings(staffNameLanguage = selectedLanguage)
+                    Anilist.staffNameLanguage = selectedLanguage
+                    restartApp()
+                }
+                settingsAnilistStaffLanguage.clearFocus()
+            }
+
+            val currentMergeTimeDisplay = activityMergeTimeMap.entries.firstOrNull { it.value == Anilist.activityMergeTime }?.key
+                ?: "${Anilist.activityMergeTime} mins"
+            settingsAnilistActivityMergeTime.setText(currentMergeTimeDisplay)
+            settingsAnilistActivityMergeTime.setAdapter(
+                ArrayAdapter(context, R.layout.item_dropdown, activityMergeTimeMap.keys.toList())
+            )
+            settingsAnilistActivityMergeTime.setOnItemClickListener { _, _, i, _ ->
+                val selectedDisplayTime = activityMergeTimeMap.keys.toList()[i]
+                val selectedApiTime = activityMergeTimeMap[selectedDisplayTime] ?: 0
+                lifecycleScope.launch {
+                    anilistMutations.updateSettings(activityMergeTime = selectedApiTime)
+                    Anilist.activityMergeTime = selectedApiTime
+                    restartApp()
+                }
+                settingsAnilistActivityMergeTime.clearFocus()
+            }
+
+            val currentScoreFormat = Anilist.scoreFormat
+            val scoreFormat = FormatScore.entries.firstOrNull{ it.name == currentScoreFormat } ?: FormatScore.POINT_100
+            settingsAnilistScoreFormat.setText(ScoreFormat[scoreFormat.ordinal])
+            settingsAnilistScoreFormat.setAdapter(
+                ArrayAdapter(context, R.layout.item_dropdown, ScoreFormat)
+            )
+            settingsAnilistScoreFormat.setOnItemClickListener { _, _, i, _ ->
+                val selectedFormat = when (i) {
+                    0 -> "POINT_100"
+                    1 -> "POINT_10_DECIMAL"
+                    2 -> "POINT_10"
+                    3 -> "POINT_5"
+                    4 -> "POINT_3"
+                    else -> "POINT_100"
+                }
+                lifecycleScope.launch {
+                    anilistMutations.updateSettings(scoreFormat = selectedFormat)
+                    Anilist.scoreFormat = selectedFormat
+                    restartApp()
+                }
+                settingsAnilistScoreFormat.clearFocus()
+            }
+
+            val currentRowOrder = rowOrderMap.entries.firstOrNull { it.value == Anilist.rowOrder }?.key ?: "Score"
+            settingsAnilistRowOrder.setText(currentRowOrder)
+            settingsAnilistRowOrder.setAdapter(
+                ArrayAdapter(context, R.layout.item_dropdown, rowOrderMap.keys.toList())
+            )
+            settingsAnilistRowOrder.setOnItemClickListener { _, _, i, _ ->
+                val selectedDisplayOrder = rowOrderMap.keys.toList()[i]
+                val selectedApiOrder = rowOrderMap[selectedDisplayOrder] ?: "score"
+                lifecycleScope.launch {
+                    anilistMutations.updateSettings(rowOrder = selectedApiOrder)
+                    Anilist.rowOrder = selectedApiOrder
+                    restartApp()
+                }
+                settingsAnilistRowOrder.clearFocus()
+            }
+
+            val containers = listOf(binding.animeCustomListsContainer, binding.mangaCustomListsContainer)
+            val customLists = listOf(Anilist.animeCustomLists, Anilist.mangaCustomLists)
+            val buttons = listOf(binding.addAnimeListButton, binding.addMangaListButton)
+
+            containers.forEachIndexed { index, container ->
+                customLists[index]?.forEach { listName ->
+                    addCustomListItem(listName, container, index == 0)
+                }
+            }
+
+            buttons.forEachIndexed { index, button ->
+                button.setOnClickListener {
+                    addCustomListItem("", containers[index], index == 0)
+                }
+            }
+
+            binding.SettingsAnilistCustomListSave.setOnClickListener {
+                saveCustomLists()
+            }
+
+            val currentTimezone = Anilist.timezone?.let { Anilist.getDisplayTimezone(it) } ?: "(GMT+00:00) London"
+            settingsAnilistTimezone.setText(currentTimezone)
+            settingsAnilistTimezone.setAdapter(
+                ArrayAdapter(context, R.layout.item_dropdown, Anilist.timeZone)
+            )
+            settingsAnilistTimezone.setOnItemClickListener { _, _, i, _ ->
+                val selectedTimezone = Anilist.timeZone[i]
+                val apiTimezone = Anilist.getApiTimezone(selectedTimezone)
+                lifecycleScope.launch {
+                    anilistMutations.updateSettings(timezone = apiTimezone)
+                    Anilist.timezone = apiTimezone
+                    restartApp()
+                }
+                settingsAnilistTimezone.clearFocus()
+            }
+
+            val displayAdultContent = Anilist.adult
+            val airingNotifications = Anilist.airingNotifications
+
+            binding.settingsRecyclerView1.adapter = SettingsAdapter(
+                arrayListOf(
+                    Settings(
+                        type = 2,
+                        name = getString(R.string.airing_notifications),
+                        desc = getString(R.string.airing_notifications_desc),
+                        icon = R.drawable.ic_round_notifications_active_24,
+                        isChecked = airingNotifications,
+                        switch = { isChecked, _ ->
+                            lifecycleScope.launch {
+                                anilistMutations.updateSettings(airingNotifications = isChecked)
+                                Anilist.airingNotifications = isChecked
+                                restartApp()
+                            }
+                        }
+                    ),
+                    Settings(
+                        type = 2,
+                        name = getString(R.string.display_adult_content),
+                        desc = getString(R.string.display_adult_content_desc),
+                        icon = R.drawable.ic_round_nsfw_24,
+                        isChecked = displayAdultContent,
+                        switch = { isChecked, _ ->
+                            lifecycleScope.launch {
+                                anilistMutations.updateSettings(displayAdultContent = isChecked)
+                                Anilist.adult = isChecked
+                                restartApp()
+                            }
+                        }
+                    ),
+                )
+            )
+            binding.settingsRecyclerView1.layoutManager =
+                LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+
+        }
+
+        binding.settingsRecyclerView2.adapter = SettingsAdapter(
+            arrayListOf(
+                Settings(
+                    type = 2,
+                    name = getString(R.string.restrict_messages),
+                    desc = getString(R.string.restrict_messages_desc),
+                    icon = R.drawable.ic_round_lock_open_24,
+                    isChecked = Anilist.restrictMessagesToFollowing,
+                    switch = { isChecked, _ ->
+                        lifecycleScope.launch {
+                            anilistMutations.updateSettings(restrictMessagesToFollowing = isChecked)
+                            Anilist.restrictMessagesToFollowing = isChecked
+                            restartApp()
+                        }
+                    }
+                ),
+            )
+        )
+        binding.settingsRecyclerView2.layoutManager =
+            LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+
+    }
+
+    private fun addCustomListItem(listName: String, container: LinearLayout, isAnime: Boolean) {
+        val customListItemView = layoutInflater.inflate(R.layout.item_custom_list, container, false)
+        val textInputLayout = customListItemView.findViewById<TextInputLayout>(R.id.customListItem)
+        val editText = textInputLayout.editText as? TextInputEditText
+        editText?.setText(listName)
+        textInputLayout.setEndIconOnClickListener {
+            val name = editText?.text.toString()
+            if (name.isNotEmpty()) {
+                val listExists = if (isAnime) {
+                    Anilist.animeCustomLists?.contains(name) ?: false
+                } else {
+                    Anilist.mangaCustomLists?.contains(name) ?: false
+                }
+
+                if (listExists) {
+                    customAlertDialog().apply {
+                        setTitle(getString(R.string.delete_custom_list))
+                        setMessage(getString(R.string.delete_custom_list_confirm, name))
+                        setPosButton(getString(R.string.delete)) {
+                            deleteCustomList(name, isAnime)
+                            container.removeView(customListItemView)
+                        }
+                        setNegButton(getString(R.string.cancel))
+                    }.show()
+                } else {
+                    container.removeView(customListItemView)
+                }
+            } else {
+                container.removeView(customListItemView)
+            }
+        }
+        container.addView(customListItemView)
+    }
+
+    private fun deleteCustomList(name: String, isAnime: Boolean) {
+        lifecycleScope.launch {
+            val type = if (isAnime) "ANIME" else "MANGA"
+            val success = anilistMutations.deleteCustomList(name, type)
+            if (success) {
+                if (isAnime) {
+                    Anilist.animeCustomLists = Anilist.animeCustomLists?.filter { it != name }
+                } else {
+                    Anilist.mangaCustomLists = Anilist.mangaCustomLists?.filter { it != name }
+                }
+                toast("Custom list deleted")
+            } else {
+                toast("Failed to delete custom list")
+            }
+        }
+    }
+
+    private fun saveCustomLists() {
+        val animeCustomLists = binding.animeCustomListsContainer.children
+            .mapNotNull { (it.findViewById<TextInputLayout>(R.id.customListItem).editText as? TextInputEditText)?.text?.toString() }
+            .filter { it.isNotEmpty() }
+            .toList()
+        val mangaCustomLists = binding.mangaCustomListsContainer.children
+            .mapNotNull { (it.findViewById<TextInputLayout>(R.id.customListItem).editText as? TextInputEditText)?.text?.toString() }
+            .filter { it.isNotEmpty() }
+            .toList()
+
+        lifecycleScope.launch {
+            val success = anilistMutations.updateCustomLists(animeCustomLists, mangaCustomLists)
+            if (success) {
+                Anilist.animeCustomLists = animeCustomLists
+                Anilist.mangaCustomLists = mangaCustomLists
+                toast("Custom lists saved")
+            } else {
+                toast("Failed to save custom lists")
+            }
+        }
+    }
+}

app/src/main/java/ani/dantotsu/settings/ExtensionsActivity.kt

@@ -21,7 +21,6 @@ import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
 import ani.dantotsu.R
 import ani.dantotsu.copyToClipboard
-import ani.dantotsu.currContext
 import ani.dantotsu.databinding.ActivityExtensionsBinding
 import ani.dantotsu.databinding.DialogRepositoriesBinding
 import ani.dantotsu.databinding.ItemRepositoryBinding
@@ -321,7 +320,7 @@ class ExtensionsActivity : AppCompatActivity() {
                 customAlertDialog().apply {
                     setTitle(R.string.edit_repositories)
                     setCustomView(dialogView.root)
-                    setPosButton(R.string.add) {
+                    setPosButton(R.string.add_list) {
                         if (!dialogView.repositoryTextBox.text.isNullOrBlank()) {
                             processUserInput(dialogView.repositoryTextBox.text.toString(), type)
                         }

app/src/main/java/ani/dantotsu/settings/SettingsAccountActivity.kt

@@ -1,5 +1,6 @@
 package ani.dantotsu.settings
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.HapticFeedbackConstants
 import android.view.View
@@ -9,6 +10,8 @@ import android.widget.TextView
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.updateLayoutParams
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
 import ani.dantotsu.R
 import ani.dantotsu.connections.anilist.Anilist
 import ani.dantotsu.connections.discord.Discord
@@ -26,6 +29,7 @@ import ani.dantotsu.statusBarHeight
 import ani.dantotsu.themes.ThemeManager
 import io.noties.markwon.Markwon
 import io.noties.markwon.SoftBreakAddsNewLinePlugin
+import kotlinx.coroutines.launch
 
 class SettingsAccountActivity : AppCompatActivity() {
     private lateinit var binding: ActivitySettingsAccountsBinding
@@ -111,6 +115,7 @@ class SettingsAccountActivity : AppCompatActivity() {
                 } else {
                     settingsAnilistAvatar.setImageResource(R.drawable.ic_round_person_24)
                     settingsAnilistUsername.visibility = View.GONE
+                    settingsRecyclerView.visibility = View.GONE
                     settingsAnilistLogin.setText(R.string.login)
                     settingsAnilistLogin.setOnClickListener {
                         Anilist.loginIntent(context)
@@ -142,7 +147,7 @@ class SettingsAccountActivity : AppCompatActivity() {
                         reload()
                     }
 
-                    settingsImageSwitcher.visibility = View.VISIBLE
+                    settingsPresenceSwitcher.visibility = View.VISIBLE
                     var initialStatus = when (PrefManager.getVal<String>(PrefName.DiscordStatus)) {
                         "online" -> R.drawable.discord_status_online
                         "idle" -> R.drawable.discord_status_idle
@@ -150,11 +155,11 @@ class SettingsAccountActivity : AppCompatActivity() {
                         "invisible" -> R.drawable.discord_status_invisible
                         else -> R.drawable.discord_status_online
                     }
-                    settingsImageSwitcher.setImageResource(initialStatus)
+                    settingsPresenceSwitcher.setImageResource(initialStatus)
 
                     val zoomInAnimation =
                         AnimationUtils.loadAnimation(context, R.anim.bounce_zoom)
-                    settingsImageSwitcher.setOnClickListener {
+                    settingsPresenceSwitcher.setOnClickListener {
                         var status = "online"
                         initialStatus = when (initialStatus) {
                             R.drawable.discord_status_online -> {
@@ -181,16 +186,16 @@ class SettingsAccountActivity : AppCompatActivity() {
                         }
 
                         PrefManager.setVal(PrefName.DiscordStatus, status)
-                        settingsImageSwitcher.setImageResource(initialStatus)
+                        settingsPresenceSwitcher.setImageResource(initialStatus)
-                        settingsImageSwitcher.startAnimation(zoomInAnimation)
+                        settingsPresenceSwitcher.startAnimation(zoomInAnimation)
                     }
-                    settingsImageSwitcher.setOnLongClickListener {
+                    settingsPresenceSwitcher.setOnLongClickListener {
                         it.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
                         DiscordDialogFragment().show(supportFragmentManager, "dialog")
                         true
                     }
                 } else {
-                    settingsImageSwitcher.visibility = View.GONE
+                    settingsPresenceSwitcher.visibility = View.GONE
                     settingsDiscordAvatar.setImageResource(R.drawable.ic_round_person_24)
                     settingsDiscordUsername.visibility = View.GONE
                     settingsDiscordLogin.setText(R.string.login)
@@ -202,6 +207,25 @@ class SettingsAccountActivity : AppCompatActivity() {
             }
             reload()
         }
+        binding.settingsRecyclerView.adapter = SettingsAdapter(
+            arrayListOf(
+                Settings(
+                    type = 1,
+                    name = getString(R.string.anilist_settings),
+                    desc = getString(R.string.alsettings_desc),
+                    icon = R.drawable.ic_anilist,
+                    onClick = {
+                        lifecycleScope.launch {
+                            Anilist.query.getUserData()
+                            startActivity(Intent(context, AnilistSettingsActivity::class.java))
                         }
+                    },
+                    isActivity = true
+                ),
+            )
+        )
+        binding.settingsRecyclerView.layoutManager =
+            LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
 
+    }
 }

app/src/main/res/drawable/ic_round_lock_24.xml

@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path

app/src/main/res/layout-land/activity_media.xml

@@ -122,7 +122,7 @@
                             android:marqueeRepeatLimit="marquee_forever"
                             android:padding="8dp"
                             android:singleLine="true"
-                            android:text="@string/add"
+                            android:text="@string/add_list"
                             android:textAllCaps="true"
                             android:textColor="?attr/colorSecondary"
                             android:textSize="14sp"

app/src/main/res/layout/activity_media.xml

@@ -121,7 +121,7 @@
                     android:marqueeRepeatLimit="marquee_forever"
                     android:padding="8dp"
                     android:singleLine="true"
-                    android:text="@string/add"
+                    android:text="@string/add_list"
                     android:textAllCaps="true"
                     android:textColor="?attr/colorSecondary"
                     android:textSize="14sp"

app/src/main/res/layout/activity_settings_accounts.xml

@@ -186,6 +186,15 @@
 
             </LinearLayout>
 
+            <ImageView
+                android:id="@+id/settingsAccountHelp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/account_help"
+                android:padding="16dp"
+                android:src="@drawable/ic_round_help_24"
+                app:tint="?attr/colorPrimary"/>
+
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/settingsMALAvatarContainer"
                 android:layout_width="51dp"
@@ -256,9 +265,10 @@
             </LinearLayout>
 
             <ImageView
-                android:id="@+id/settingsImageSwitcher"
+                android:id="@+id/settingsPresenceSwitcher"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:contentDescription="@string/discord_rich_presence"
                 android:padding="16dp"
                 android:src="@drawable/discord_status_idle" />
 
@@ -281,27 +291,13 @@
             </com.google.android.material.card.MaterialCardView>
 
         </LinearLayout>
-
+        <ani.dantotsu.FadingEdgeRecyclerView
-        <TextView
+            android:id="@+id/settingsRecyclerView"
-            android:id="@+id/settingsAccountHelp"
             android:layout_width="match_parent"
-            android:layout_height="64dp"
+            android:layout_height="match_parent"
-            android:layout_marginStart="-31dp"
+            android:nestedScrollingEnabled="false"
-            android:layout_marginEnd="-31dp"
+            android:requiresFadingEdge="vertical"
-            android:background="?android:colorBackground"
+            tools:itemCount="1"
-            android:drawablePadding="16dp"
+            tools:listitem="@layout/item_settings" />
-            android:fontFamily="@font/poppins_bold"
-            android:gravity="center_vertical"
-            android:insetTop="0dp"
-            android:insetBottom="0dp"
-            android:paddingStart="31dp"
-            android:paddingEnd="31dp"
-            android:text="@string/account_help"
-            android:textAllCaps="false"
-            android:textColor="?attr/colorOnBackground"
-            app:cornerRadius="0dp"
-            app:drawableStartCompat="@drawable/ic_round_help_24"
-            app:drawableTint="?attr/colorPrimary" />
-
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>

app/src/main/res/layout/activity_settings_anilist.xml

@@ -0,0 +1,419 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".settings.SettingsAccountActivity">
+
+    <LinearLayout
+        android:id="@+id/settingsAnilistLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="32dp"
+            app:cardBackgroundColor="@color/nav_bg_inv"
+            app:cardCornerRadius="16dp"
+            app:cardElevation="0dp">
+
+            <ImageButton
+                android:id="@+id/anilistSettingsBack"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:background="@color/nav_bg_inv"
+                android:padding="16dp"
+                app:srcCompat="@drawable/ic_round_arrow_back_ios_new_24"
+                app:tint="?attr/colorOnBackground"
+                tools:ignore="ContentDescription,SpeakableTextPresentCheck" />
+        </androidx.cardview.widget.CardView>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            tools:ignore="UseCompoundDrawables">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="32dp"
+                android:layout_marginTop="32dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginBottom="32dp"
+                android:layout_weight="1"
+                android:fontFamily="@font/poppins_bold"
+                android:text="@string/anilist_settings"
+                android:textSize="28sp" />
+
+            <ImageView
+                android:layout_width="96dp"
+                android:layout_height="96dp"
+                android:layout_marginEnd="20dp"
+                android:layout_marginBottom="20dp"
+                android:padding="24dp"
+                app:srcCompat="@drawable/ic_anilist"
+                app:tint="?attr/colorOnBackground"
+                tools:ignore="ContentDescription" />
+
+        </LinearLayout>
+
+        <ani.dantotsu.others.Xpandable
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="64dp"
+                android:layout_marginTop="8dp"
+                android:fontFamily="@font/poppins_bold"
+                android:gravity="center_vertical"
+                android:paddingHorizontal="32dp"
+                android:text="@string/anime_manga"
+                android:textColor="?attr/colorSecondary"
+                app:drawableEndCompat="@drawable/ic_round_arrow_drop_down_24"
+                tools:ignore="TextContrastCheck" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="32dp"
+                android:alpha="0.58"
+                android:fontFamily="@font/poppins_bold"
+                android:text="@string/selected_title_language" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="32dp"
+                android:layout_marginBottom="8dp"
+                app:boxCornerRadiusBottomEnd="8dp"
+                app:boxCornerRadiusBottomStart="8dp"
+                app:boxCornerRadiusTopEnd="8dp"
+                app:boxCornerRadiusTopStart="8dp"
+                app:hintAnimationEnabled="true"
+                app:startIconDrawable="@drawable/ic_round_dns_24">
+
+                <AutoCompleteTextView
+                    android:id="@+id/settingsAnilistTitleLanguage"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:fontFamily="@font/poppins_bold"
+                    android:freezesText="false"
+                    android:inputType="none"
+                    android:padding="8dp"
+                    android:text="@string/placeholder"
+                    android:textAllCaps="true"
+                    android:textColor="?android:attr/textColorSecondary"
+                    android:textSize="14sp"
+                    tools:ignore="LabelFor,TextContrastCheck,DuplicateSpeakableTextCheck" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="32dp"
+                android:alpha="0.58"
+                android:fontFamily="@font/poppins_bold"
+                android:text="@string/selected_staff_language" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="32dp"
+                android:layout_marginBottom="8dp"
+                app:boxCornerRadiusBottomEnd="8dp"
+                app:boxCornerRadiusBottomStart="8dp"
+                app:boxCornerRadiusTopEnd="8dp"
+                app:boxCornerRadiusTopStart="8dp"
+                app:hintAnimationEnabled="true"
+                app:startIconDrawable="@drawable/ic_round_dns_24">
+
+                <AutoCompleteTextView
+                    android:id="@+id/settingsAnilistStaffLanguage"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:fontFamily="@font/poppins_bold"
+                    android:freezesText="false"
+                    android:inputType="none"
+                    android:padding="8dp"
+                    android:text="@string/placeholder"
+                    android:textAllCaps="true"
+                    android:textColor="?android:attr/textColorSecondary"
+                    android:textSize="14sp"
+                    tools:ignore="LabelFor,TextContrastCheck,DuplicateSpeakableTextCheck" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="32dp"
+                android:alpha="0.58"
+                android:fontFamily="@font/poppins_bold"
+                android:text="@string/selected_merge_time" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="32dp"
+                android:layout_marginBottom="8dp"
+                app:boxCornerRadiusBottomEnd="8dp"
+                app:boxCornerRadiusBottomStart="8dp"
+                app:boxCornerRadiusTopEnd="8dp"
+                app:boxCornerRadiusTopStart="8dp"
+                app:hintAnimationEnabled="true"
+                app:startIconDrawable="@drawable/ic_round_dns_24">
+
+                <AutoCompleteTextView
+                    android:id="@+id/settingsAnilistActivityMergeTime"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:fontFamily="@font/poppins_bold"
+                    android:freezesText="false"
+                    android:inputType="none"
+                    android:padding="8dp"
+                    android:text="@string/placeholder"
+                    android:textAllCaps="true"
+                    android:textColor="?android:attr/textColorSecondary"
+                    android:textSize="14sp"
+                    tools:ignore="LabelFor,TextContrastCheck,DuplicateSpeakableTextCheck" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <ani.dantotsu.FadingEdgeRecyclerView
+                android:id="@+id/settingsRecyclerView1"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="14dp"
+                android:layout_marginHorizontal="32dp"
+                android:nestedScrollingEnabled="false"
+                android:requiresFadingEdge="vertical"
+                tools:itemCount="2"
+                tools:listitem="@layout/item_settings" />
+        </ani.dantotsu.others.Xpandable>
+
+        <ani.dantotsu.others.Xpandable
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="64dp"
+            android:layout_marginTop="8dp"
+            android:fontFamily="@font/poppins_bold"
+            android:gravity="center_vertical"
+            android:paddingHorizontal="32dp"
+            android:text="@string/list_settings"
+            android:textColor="?attr/colorSecondary"
+            app:drawableEndCompat="@drawable/ic_round_arrow_drop_down_24"
+            tools:ignore="TextContrastCheck" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="32dp"
+                android:alpha="0.58"
+                android:fontFamily="@font/poppins_bold"
+                android:text="@string/selected_score_format" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="32dp"
+                android:layout_marginBottom="8dp"
+                app:boxCornerRadiusBottomEnd="8dp"
+                app:boxCornerRadiusBottomStart="8dp"
+                app:boxCornerRadiusTopEnd="8dp"
+                app:boxCornerRadiusTopStart="8dp"
+                app:hintAnimationEnabled="true"
+                app:startIconDrawable="@drawable/ic_round_dns_24">
+
+                <AutoCompleteTextView
+                    android:id="@+id/settingsAnilistScoreFormat"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:fontFamily="@font/poppins_bold"
+                    android:freezesText="false"
+                    android:inputType="none"
+                    android:padding="8dp"
+                    android:text="@string/placeholder"
+                    android:textAllCaps="true"
+                    android:textColor="?android:attr/textColorSecondary"
+                    android:textSize="14sp"
+                    tools:ignore="LabelFor,TextContrastCheck,DuplicateSpeakableTextCheck" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="32dp"
+                android:alpha="0.58"
+                android:fontFamily="@font/poppins_bold"
+                android:text="@string/selected_row_order" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="32dp"
+                android:layout_marginBottom="8dp"
+                app:boxCornerRadiusBottomEnd="8dp"
+                app:boxCornerRadiusBottomStart="8dp"
+                app:boxCornerRadiusTopEnd="8dp"
+                app:boxCornerRadiusTopStart="8dp"
+                app:hintAnimationEnabled="true"
+                app:startIconDrawable="@drawable/ic_round_dns_24">
+
+                <AutoCompleteTextView
+                    android:id="@+id/settingsAnilistRowOrder"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:fontFamily="@font/poppins_bold"
+                    android:freezesText="false"
+                    android:inputType="none"
+                    android:padding="8dp"
+                    android:text="@string/placeholder"
+                    android:textAllCaps="true"
+                    android:textColor="?android:attr/textColorSecondary"
+                    android:textSize="14sp"
+                    tools:ignore="LabelFor,TextContrastCheck,DuplicateSpeakableTextCheck" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="32dp"
+                android:alpha="0.58"
+                android:fontFamily="@font/poppins_bold"
+                android:text="@string/custom_anime_list" />
+
+            <LinearLayout
+                android:id="@+id/animeCustomListsContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="32dp"
+                android:orientation="vertical" />
+
+            <ImageButton
+                android:id="@+id/addAnimeListButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/custom_anime_list"
+                android:layout_marginHorizontal="36dp"
+                android:layout_marginVertical="12dp"
+                android:src="@drawable/ic_circle_add"
+                android:background="?android:attr/selectableItemBackground"
+                app:tint="?attr/colorPrimary"/>
+
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="32dp"
+                android:alpha="0.58"
+                android:fontFamily="@font/poppins_bold"
+                android:text="@string/custom_manga_list" />
+
+            <LinearLayout
+                android:id="@+id/mangaCustomListsContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="32dp"
+                android:orientation="vertical" />
+
+            <ImageButton
+                android:id="@+id/addMangaListButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/custom_manga_list"
+                android:layout_marginHorizontal="36dp"
+                android:layout_marginVertical="12dp"
+                android:src="@drawable/ic_circle_add"
+                android:background="?android:attr/selectableItemBackground"
+                app:tint="?attr/colorPrimary"/>
+
+            <Button
+                android:id="@+id/SettingsAnilistCustomListSave"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="32dp"
+                android:layout_gravity="end"
+                android:fontFamily="@font/poppins_bold"
+                android:text="@string/save" />
+
+        </ani.dantotsu.others.Xpandable>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/poppins_bold"
+            android:gravity="center_vertical"
+            android:paddingHorizontal="32dp"
+            android:paddingTop="20dp"
+            android:text="@string/other"
+            android:textColor="?attr/colorSecondary"
+            tools:ignore="TextContrastCheck" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginHorizontal="32dp"
+            android:alpha="0.58"
+            android:fontFamily="@font/poppins_bold"
+            android:text="@string/selected_time_zone" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="32dp"
+            android:layout_marginBottom="8dp"
+            app:boxCornerRadiusBottomEnd="8dp"
+            app:boxCornerRadiusBottomStart="8dp"
+            app:boxCornerRadiusTopEnd="8dp"
+            app:boxCornerRadiusTopStart="8dp"
+            app:hintAnimationEnabled="true"
+            app:startIconDrawable="@drawable/ic_round_dns_24">
+
+            <AutoCompleteTextView
+                android:id="@+id/settingsAnilistTimezone"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:fontFamily="@font/poppins_bold"
+                android:freezesText="false"
+                android:inputType="none"
+                android:padding="8dp"
+                android:text="@string/placeholder"
+                android:textAllCaps="true"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textSize="14sp"
+                tools:ignore="LabelFor,TextContrastCheck,DuplicateSpeakableTextCheck" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <ani.dantotsu.FadingEdgeRecyclerView
+            android:id="@+id/settingsRecyclerView2"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginHorizontal="32dp"
+            android:nestedScrollingEnabled="false"
+            android:requiresFadingEdge="vertical"
+            tools:itemCount="1"
+            tools:listitem="@layout/item_settings" />
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>

app/src/main/res/layout/item_custom_list.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="horizontal">
+
+    <com.google.android.material.textfield.TextInputLayout
+        style="?attr/textInputFilledStyle"
+        android:id="@+id/customListItem"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:boxBackgroundColor="?attr/colorSurface"
+        app:boxStrokeColor="?attr/colorPrimaryContainer"
+        app:endIconMode ="custom"
+        app:endIconDrawable ="@drawable/ic_round_delete_24">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+    </com.google.android.material.textfield.TextInputLayout>
+</LinearLayout>

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

@@ -66,7 +66,7 @@
     <string name="empty">All caught up, when New?</string>
     <string name="action_settings">Settings</string>
 
-    <string name="add">Add to List</string>
+    <string name="add_list">Add to List</string>
     <string name="list_editor">List Editor</string>
     <string name="add_fav">Add to Favourites</string>
     <string name="notifications">Notifications</string>
@@ -331,7 +331,19 @@
     <string name="prefer_dub">Prefer Dubbed Anime</string>
     <string name="none">None</string>
     <string name="selected_dns">Selected DNS</string>
+    <string name="anime_manga">Anime and Manga</string>
+    <string name="list_settings">List Settings</string>
     <string name="dns_info">Change if your ISP blocks any source</string>
+    <string name="selected_title_language">Selected Title Language</string>
+    <string name="selected_staff_language">Selected Staff Language</string>
+    <string name="selected_merge_time">Activity Merge Time</string>
+    <string name="selected_score_format">Scoring System</string>
+    <string name="selected_time_zone">Timezone</string>
+    <string name="selected_row_order">Default List Order</string>
+    <string name="custom_anime_list">Custom Anime Lists</string>
+    <string name="custom_manga_list">Custom Manga Lists</string>
+    <string name="delete_custom_list">Delete Custom List</string>
+    <string name="delete_custom_list_confirm">Are you sure you want to delete %1$s ?</string>
     <string name="keep_screen_on">Keep Screen On</string>
     <string name="layout">Layout</string>
     <string name="spaced_pages">Spaced Pages</string>
@@ -390,7 +402,6 @@
     <string name="faq">FAQ</string>
     <string name="accounts">Accounts</string>
     <string name="addons">Add-ons</string>
-    <string name="addons_desc">Get more features out of your app</string>
     <string name="myanimelist">MyAnimeList</string>
     <string name="login_with_anilist">Login with Anilist!</string>
     <string name="anilist">Anilist</string>
@@ -909,11 +920,20 @@ Non quae tempore quo provident laudantium qui illo dolor vel quia dolor et exerc
     <string name="unknown_track">\[%1$s\] Unknown</string>
     <string name="accounts_desc">Anilist, MAL and Discord.\nWhat more could you need?</string>
     <string name="theme_desc">Change the vibe of your app</string>
-    <string name="extensions_desc">Manage your reliable repositories</string>
     <string name="common_desc">UI and other mischievous stuff</string>
-    <string name="notifications_desc">Customise your news and updates</string>
     <string name="anime_desc">Choose how you watch</string>
     <string name="manga_desc">Choose how you read</string>
+    <string name="extensions_desc">Manage your reliable repositories</string>
+    <string name="addons_desc">Get more features out of your app</string>
+    <string name="alsettings_desc">Change your AniList settings</string>
+    <string name="airing_notifications">Airing Anime notifications</string>
+    <string name="airing_notifications_desc">Get notified whenever a new episode drops</string>
+    <string name="display_adult_content">18+ Content</string>
+    <string name="display_adult_content_desc">Enable NSFW content</string>
+    <string name="restrict_messages">Restrict messages to following</string>
+    <string name="restrict_messages_desc">Allow only users I follow to message me</string>
+
+    <string name="notifications_desc">Customise your news and updates</string>
     <string name="about_desc">Learn more about Dantotsu</string>
     <string name="faq_desc">General questions about Dantotsu</string>
     <string name="check_app_updates_desc">Check Github for app updates</string>
@@ -967,6 +987,7 @@ Non quae tempore quo provident laudantium qui illo dolor vel quia dolor et exerc
     <string name="update_addon">Add-on update available</string>
     <string name="install_addon">Install Add-on</string>
     <string name="download_addon_not_found">Add-on not found</string>
+
     <string name="image">Image</string>
     <string name="clear_history">Clear History</string>
     <string name="failed_ext_install_conflict">Failed to install extension due to conflict</string>