Skip to content

Commit

Permalink
Fixing rest of build warnings. (LemmyNet#641)
Browse files Browse the repository at this point in the history
Co-authored-by: Kevin Phoenix <[email protected]>
  • Loading branch information
2 people authored and Chris-Kropp committed Jun 16, 2023
1 parent 236f042 commit 77dc03c
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 10 deletions.
1 change: 0 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />

<application
android:name=".JerboaApplication"
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/java/com/jerboa/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,6 @@ class MainActivity : ComponentActivity() {
commentReplyViewModel = commentReplyViewModel,
postEditViewModel = postEditViewModel,
navController = navController,
appSettingsViewModel = appSettingsViewModel,
showCollapsedCommentContent = appSettings?.showCollapsedCommentContent ?: false,
showActionBarByDefault = appSettings?.showCommentActionBarByDefault ?: true,
showVotingArrowsInListView = appSettings?.showVotingArrowsInListView ?: true,
Expand Down Expand Up @@ -488,7 +487,6 @@ class MainActivity : ComponentActivity() {
commentReplyViewModel = commentReplyViewModel,
postEditViewModel = postEditViewModel,
navController = navController,
appSettingsViewModel = appSettingsViewModel,
showCollapsedCommentContent = appSettings?.showCollapsedCommentContent ?: false,
showActionBarByDefault = appSettings?.showCommentActionBarByDefault ?: true,
showVotingArrowsInListView = appSettings?.showVotingArrowsInListView ?: true,
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/java/com/jerboa/Utils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -930,7 +930,6 @@ fun getLocalizedSortingTypeName(context: Context, sortingType: SortType): String
SortType.TopAll -> context.getString(R.string.sorttype_topall)
SortType.MostComments -> context.getString(R.string.sorttype_mostcomments)
SortType.NewComments -> context.getString(R.string.sorttype_newcomments)
else -> "Missing String Localization for Enum SortType"
}
return returnString
}
Expand All @@ -940,7 +939,6 @@ fun getLocalizedStringForUserTab(ctx: Context, tab: UserTab): String {
UserTab.About -> ctx.getString(R.string.person_profile_activity_about)
UserTab.Posts -> ctx.getString(R.string.person_profile_activity_posts)
UserTab.Comments -> ctx.getString(R.string.person_profile_activity_comments)
else -> "Missing String Localization for Enum UserTab"
}
return returnString
}
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ fun ShowChangelog(appSettingsViewModel: AppSettingsViewModel) {
val releasesUrl = "https://raw.githubusercontent.com/dessalines/jerboa/main/RELEASES.md".toHttpUrl()
val req = Request.Builder().url(releasesUrl).build()
val res = client.newCall(req).execute()
markdown.value = res.body?.string() ?: ""
markdown.value = res.body.string()
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,15 @@ fun CommunityTopBarSearchView(
}
},
singleLine = true,
colors = TextFieldDefaults.textFieldColors(
containerColor = Color.Transparent,
colors = TextFieldDefaults.colors(
focusedContainerColor = Color.Transparent,
unfocusedContainerColor = Color.Transparent,
disabledContainerColor = Color.Transparent,
errorContainerColor = Color.Transparent,
focusedIndicatorColor = Color.Transparent,
unfocusedIndicatorColor = Color.Transparent,
disabledIndicatorColor = Color.Transparent,

),
keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ import com.jerboa.R
import com.jerboa.VoteType
import com.jerboa.datatypes.CommentSortType
import com.jerboa.db.AccountViewModel
import com.jerboa.db.AppSettingsViewModel
import com.jerboa.getCommentParentId
import com.jerboa.getDepthFromComment
import com.jerboa.isModerator
Expand Down Expand Up @@ -86,7 +85,6 @@ fun PostActivity(
commentReplyViewModel: CommentReplyViewModel,
postEditViewModel: PostEditViewModel,
navController: NavController,
appSettingsViewModel: AppSettingsViewModel,
showCollapsedCommentContent: Boolean,
showActionBarByDefault: Boolean,
showVotingArrowsInListView: Boolean,
Expand Down

0 comments on commit 77dc03c

Please sign in to comment.