Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing rest of build warnings. #641

Merged
merged 3 commits into from
Jun 15, 2023
Merged

Fixing rest of build warnings. #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e77f777
Fixing rest of build warnings.
dessalines Jun 14, 2023
3161736
Merge branch 'main' into fix_build_warnings
twizmwazin Jun 14, 2023
f05a603
Merge branch 'main' into fix_build_warnings
twizmwazin Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/jerboa/ui/components/common/Dialogs.kt
View file
Open in desktop
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
8 changes: 6 additions & 2 deletions app/src/main/java/com/jerboa/ui/components/community/list/CommunityList.kt
View file
Open in desktop
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
2 changes: 0 additions & 2 deletions app/src/main/java/com/jerboa/ui/components/post/PostActivity.kt
View file
Open in desktop
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