Skip to content

Commit

Permalink
Merge branch 'evaluate-replacing-collapsing-toolbar-droid-272'
Browse files Browse the repository at this point in the history
  • Loading branch information
albin-mullvad committed Oct 6, 2023
2 parents 7256c13 + 7e28f78 commit c1f9e78
Show file tree
Hide file tree
Showing 17 changed files with 573 additions and 820 deletions.
1 change: 0 additions & 1 deletion android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,6 @@ dependencies {
implementation(Dependencies.AndroidX.lifecycleRuntimeKtx)
implementation(Dependencies.AndroidX.lifecycleViewmodelKtx)
implementation(Dependencies.AndroidX.recyclerview)
implementation(Dependencies.Compose.composeCollapsingToolbar)
implementation(Dependencies.Compose.constrainLayout)
implementation(Dependencies.Compose.foundation)
implementation(Dependencies.Compose.viewModelLifecycle)
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package net.mullvad.mullvadvpn.compose.component

import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.rotate
import androidx.compose.ui.res.painterResource
import net.mullvad.mullvadvpn.R

@Composable
fun NavigateBackIconButton(onNavigateBack: () -> Unit) {
IconButton(onClick = onNavigateBack) {
Icon(painter = painterResource(id = R.drawable.icon_back), contentDescription = null)
}
}

@Composable
fun NavigateBackDownIconButton(onNavigateBack: () -> Unit) {
IconButton(onClick = onNavigateBack) {
Icon(
modifier = Modifier.rotate(-90f),
painter = painterResource(id = R.drawable.icon_back),
contentDescription = null
)
}
}
Loading

0 comments on commit c1f9e78

Please sign in to comment.