mirror/Infinity-For-Reddit
3
0
Fork 0
mirror of https://github.com/Docile-Alligator/Infinity-For-Reddit.git synced 2026-08-18 11:03:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Continue implementing NewFeaturesActivity. Remove some fields in OnboardingActivity.

Browse Source
This commit is contained in:
Docile-Alligator
2026-08-12 16:41:23 -04:00
parent e71b922f66
commit cde8fa9186
2 changed files with 11 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/java/ml/docilealligator/infinityforreddit/activities/NewFeaturesActivity.kt
View File

@ -39,7 +39,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
@ -52,7 +51,6 @@ import androidx.window.core.layout.WindowWidthSizeClass
import ml.docilealligator.infinityforreddit.BuildConfig import ml.docilealligator.infinityforreddit.BuildConfig
import ml.docilealligator.infinityforreddit.Infinity import ml.docilealligator.infinityforreddit.Infinity
import ml.docilealligator.infinityforreddit.R import ml.docilealligator.infinityforreddit.R
import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase
import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper
import ml.docilealligator.infinityforreddit.customviews.compose.AppTheme import ml.docilealligator.infinityforreddit.customviews.compose.AppTheme
import ml.docilealligator.infinityforreddit.customviews.compose.ColorAccentText import ml.docilealligator.infinityforreddit.customviews.compose.ColorAccentText
@ -63,26 +61,14 @@ import ml.docilealligator.infinityforreddit.customviews.compose.PrimaryIcon
import ml.docilealligator.infinityforreddit.customviews.compose.PrimaryText import ml.docilealligator.infinityforreddit.customviews.compose.PrimaryText
import ml.docilealligator.infinityforreddit.customviews.compose.SecondaryText import ml.docilealligator.infinityforreddit.customviews.compose.SecondaryText
import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils
import retrofit2.Retrofit
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Named import javax.inject.Named
class NewFeaturesActivity: BaseActivity() { class NewFeaturesActivity: BaseActivity() {
@Inject
@Named("no_oauth")
lateinit var mRetrofit: Retrofit
@Inject
@Named("oauth")
lateinit var mOauthRetrofit: Retrofit
@Inject
lateinit var mRedditDataRoomDatabase: RedditDataRoomDatabase
@Inject @Inject
@Named("default") @Named("default")
lateinit var mSharedPreferences: SharedPreferences lateinit var mSharedPreferences: SharedPreferences
@Inject @Inject
@Named("post_layout")
lateinit var mPostLayoutSharedPreferences: SharedPreferences
@Inject
@Named("current_account") @Named("current_account")
lateinit var mCurrentAccountSharedPreferences: SharedPreferences lateinit var mCurrentAccountSharedPreferences: SharedPreferences
@Inject @Inject
@ -115,9 +101,9 @@ class NewFeaturesActivity: BaseActivity() {
setContent { setContent {
AppTheme(mCustomThemeWrapper.themeType, mSharedPreferences) { AppTheme(mCustomThemeWrapper.themeType, mSharedPreferences) {
val context = LocalContext.current
val windowSizeClass = currentWindowAdaptiveInfo().windowSizeClass val windowSizeClass = currentWindowAdaptiveInfo().windowSizeClass
val isCompactWidth = windowSizeClass.windowWidthSizeClass == WindowWidthSizeClass.COMPACT val isCompactWidth = windowSizeClass.windowWidthSizeClass == WindowWidthSizeClass.COMPACT
|| windowSizeClass.windowWidthSizeClass == WindowWidthSizeClass.MEDIUM
Scaffold( Scaffold(
topBar = { topBar = {
@ -200,11 +186,11 @@ class NewFeaturesActivity: BaseActivity() {
if (isCompactWidth) { if (isCompactWidth) {
Spacer(modifier = Modifier.height(16.dp)) Spacer(modifier = Modifier.height(16.dp))
JoinSubredditButton() JoinSubredditButton(true)
Spacer(modifier = Modifier.height(8.dp)) Spacer(modifier = Modifier.height(8.dp))
ContinueToAppButton() ContinueToAppButton(true)
Spacer(modifier = Modifier.height(16.dp)) Spacer(modifier = Modifier.height(16.dp))
} }
@ -219,11 +205,11 @@ class NewFeaturesActivity: BaseActivity() {
verticalArrangement = Arrangement.Center, verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally horizontalAlignment = Alignment.CenterHorizontally
) { ) {
JoinSubredditButton() JoinSubredditButton(false)
Spacer(modifier = Modifier.height(8.dp)) Spacer(modifier = Modifier.height(8.dp))
ContinueToAppButton() ContinueToAppButton(false)
} }
} }
} }
@ -244,7 +230,7 @@ class NewFeaturesActivity: BaseActivity() {
} }
@Composable @Composable
private fun JoinSubredditButton() { private fun JoinSubredditButton(isCompactWidth: Boolean) {
ColorAccentText( ColorAccentText(
R.string.important_info_post_comments_rework_join_subreddit, R.string.important_info_post_comments_rework_join_subreddit,
modifier = Modifier modifier = Modifier
@ -270,17 +256,19 @@ class NewFeaturesActivity: BaseActivity() {
finish() finish()
} }
.padding(horizontal = 16.dp), .padding(horizontal = 16.dp),
textAlign = TextAlign.Center textAlign = TextAlign.Center,
fontSize = if (isCompactWidth) LocalTypography.current.fontSize.default else LocalTypography.current.fontSize.size18
) )
} }
@Composable @Composable
private fun ContinueToAppButton() { private fun ContinueToAppButton(isCompactWidth: Boolean) {
CustomFilledButton( CustomFilledButton(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(horizontal = 16.dp), .padding(horizontal = 16.dp),
stringResId = R.string.continue_to_app stringResId = R.string.continue_to_app,
fontSize = if (isCompactWidth) LocalTypography.current.fontSize.default else LocalTypography.current.fontSize.size18
) { ) {
triggerBackPress() triggerBackPress()
} }

11
app/src/main/java/ml/docilealligator/infinityforreddit/activities/OnboardingActivity.kt
View File

@ -93,21 +93,10 @@ import javax.inject.Named
import kotlin.math.roundToInt import kotlin.math.roundToInt
class OnboardingActivity: BaseActivity() { class OnboardingActivity: BaseActivity() {
@Inject
@Named("no_oauth")
lateinit var mRetrofit: Retrofit
@Inject
@Named("oauth")
lateinit var mOauthRetrofit: Retrofit
@Inject
lateinit var mRedditDataRoomDatabase: RedditDataRoomDatabase
@Inject @Inject
@Named("default") @Named("default")
lateinit var mSharedPreferences: SharedPreferences lateinit var mSharedPreferences: SharedPreferences
@Inject @Inject
@Named("post_layout")
lateinit var mPostLayoutSharedPreferences: SharedPreferences
@Inject
@Named("current_account") @Named("current_account")
lateinit var mCurrentAccountSharedPreferences: SharedPreferences lateinit var mCurrentAccountSharedPreferences: SharedPreferences
@Inject @Inject