Skip to content

Commit 08150ac

Browse files
committed
1.0.6
1 parent 51fe3cf commit 08150ac

File tree

8 files changed

+243
-211
lines changed

8 files changed

+243
-211
lines changed

app/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ android {
1414
applicationId = "com.troplo.privateuploader"
1515
minSdk = 28
1616
targetSdk = 34
17-
versionCode = 5
18-
versionName = "1.0.5"
17+
versionCode = 6
18+
versionName = "1.0.6"
1919
multiDexEnabled = true
2020
buildConfigField("String", "SERVER_URL", "\"https://privateuploader.com\"")
2121
buildConfigField("String", "BUILD_TIME", "\"${System.currentTimeMillis()}\"")
22-
buildConfigField("Integer", "BETA_VERSION", "5")
22+
buildConfigField("Integer", "BETA_VERSION", "6")
2323

2424
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2525
vectorDrawables {

app/src/main/java/com/troplo/privateuploader/App.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ class TpuApp : Application() {
1111
* Application scope bound emojiManager, you could keep a reference to this object in a
1212
* dependency injector framework like as a singleton in `Hilt`, `Dagger` or `Koin`
1313
*/
14-
internal val emojiManager: EmojiManager by lazy {
14+
/*internal val emojiManager: EmojiManager by lazy {
1515
// should already be initialized if we haven't disabled initialization in manifest
1616
// see: https://developer.android.com/topic/libraries/app-startup#disable-individual
1717
AppInitializer.getInstance(this)
1818
.initializeComponent(EmojiInitializer::class.java)
19-
}
19+
}*/
2020
}

app/src/main/java/com/troplo/privateuploader/MainScreen.kt

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import androidx.compose.foundation.rememberScrollState
1414
import androidx.compose.foundation.verticalScroll
1515
import androidx.compose.material.ExperimentalMaterialApi
1616
import androidx.compose.material.LinearProgressIndicator
17+
import androidx.compose.material3.DrawerDefaults
1718
import androidx.compose.material3.ExperimentalMaterial3Api
1819
import androidx.compose.material3.ModalDrawerSheet
1920
import androidx.compose.material3.Scaffold
@@ -32,7 +33,9 @@ import androidx.compose.ui.platform.LocalContext
3233
import androidx.compose.ui.unit.dp
3334
import androidx.navigation.compose.rememberNavController
3435
import com.troplo.privateuploader.api.ChatStore
36+
import com.troplo.privateuploader.api.SessionManager
3537
import com.troplo.privateuploader.api.SocketHandler
38+
import com.troplo.privateuploader.api.ThemeOption
3639
import com.troplo.privateuploader.api.stores.UploadStore
3740
import com.troplo.privateuploader.api.stores.UserStore
3841
import com.troplo.privateuploader.components.chat.MemberSidebar
@@ -43,7 +46,6 @@ import com.troplo.privateuploader.components.core.NavRoute
4346
import com.troplo.privateuploader.components.core.OverlappingPanels
4447
import com.troplo.privateuploader.components.core.PanelSurface
4548
import com.troplo.privateuploader.components.core.TopBarNav
46-
import com.troplo.privateuploader.components.core.debug.recomposeHighlighter
4749
import com.troplo.privateuploader.components.core.dialogs.EmailVerificationDialog
4850
import com.troplo.privateuploader.components.core.rememberOverlappingPanelsState
4951
import com.troplo.privateuploader.screens.HomeScreen
@@ -63,7 +65,9 @@ fun MainScreen() {
6365
val panelState = rememberOverlappingPanelsState()
6466
var closePanels by remember { mutableStateOf(false) }
6567
var openPanel by remember { mutableStateOf(false) }
66-
68+
val theme = SessionManager(context).theme.collectAsState()
69+
val isAMOLED = rememberUpdatedState(theme.value == ThemeOption.AMOLED)
70+
Log.d("MainScreen", "isAMOLED: ${isAMOLED.value}")
6771
val closePanelsFunc = {
6872
closePanels = true
6973
}
@@ -126,7 +130,8 @@ fun MainScreen() {
126130
BottomBarNav(
127131
navController = navController,
128132
panelState = panelState,
129-
closePanels = closePanelsFunc
133+
closePanels = closePanelsFunc,
134+
isAMOLED = isAMOLED
130135
)
131136
}
132137
) { paddingValues ->
@@ -140,7 +145,8 @@ fun MainScreen() {
140145
modifier = Modifier.padding(
141146
top = paddingValues.calculateTopPadding(),
142147
bottom = paddingValues.calculateBottomPadding()
143-
)
148+
),
149+
drawerTonalElevation = if(isAMOLED.value) 0.dp else DrawerDefaults.ModalDrawerElevation
144150
) {
145151
Spacer(Modifier.height(12.dp))
146152
HomeScreen(
@@ -177,7 +183,8 @@ fun MainScreen() {
177183
modifier = Modifier.padding(
178184
top = paddingValues.calculateTopPadding(),
179185
bottom = paddingValues.calculateBottomPadding()
180-
)
186+
),
187+
drawerTonalElevation = if(isAMOLED.value) 0.dp else DrawerDefaults.ModalDrawerElevation
181188
) {
182189
Column(
183190
modifier = Modifier

0 commit comments

Comments
 (0)