-
Notifications
You must be signed in to change notification settings - Fork 349
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'evaluate-replacing-collapsing-toolbar-droid-272'
- Loading branch information
Showing
17 changed files
with
573 additions
and
820 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
89 changes: 0 additions & 89 deletions
89
...app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CollapsingToolbarScaffold.kt
This file was deleted.
Oops, something went wrong.
112 changes: 0 additions & 112 deletions
112
android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CollapsingTopBar.kt
This file was deleted.
Oops, something went wrong.
27 changes: 27 additions & 0 deletions
27
...id/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/NavigateBackIconButton.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
) | ||
} | ||
} |
Oops, something went wrong.