From a4feadec9e595f09fafa60020b44ecfa37d5ce0f Mon Sep 17 00:00:00 2001 From: Miguel Vasco Macamo Date: Wed, 30 Nov 2022 23:15:22 +0200 Subject: [PATCH] Adding New icons (#29) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Adding New icons * Update DropdownComponent.kt Co-authored-by: Andrés Miguel Rubio --- app/src/main/assets/paperwork.json | 2 +- .../home/screens/components/DropdownComponent.kt | 15 ++++++--------- .../src/main/res/drawable/ic_arrow_drop_down.xml | 5 +++++ .../src/main/res/drawable/ic_arrow_drop_up.xml | 5 +++++ 4 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 stock-managment/src/main/res/drawable/ic_arrow_drop_down.xml create mode 100644 stock-managment/src/main/res/drawable/ic_arrow_drop_up.xml diff --git a/app/src/main/assets/paperwork.json b/app/src/main/assets/paperwork.json index e82d1c743a..490e54086d 100644 --- a/app/src/main/assets/paperwork.json +++ b/app/src/main/assets/paperwork.json @@ -1 +1 @@ -{"buildTime":"2022-11-30 14:11","gitSha":"ce4a62731"} \ No newline at end of file +{"buildTime":"2022-11-29 16:42","gitSha":"9b13dc04d"} \ No newline at end of file diff --git a/stock-managment/src/main/java/org/dhis2/android/rtsm/ui/home/screens/components/DropdownComponent.kt b/stock-managment/src/main/java/org/dhis2/android/rtsm/ui/home/screens/components/DropdownComponent.kt index 4878949f48..43122bfd87 100644 --- a/stock-managment/src/main/java/org/dhis2/android/rtsm/ui/home/screens/components/DropdownComponent.kt +++ b/stock-managment/src/main/java/org/dhis2/android/rtsm/ui/home/screens/components/DropdownComponent.kt @@ -23,9 +23,6 @@ import androidx.compose.material.MaterialTheme import androidx.compose.material.OutlinedTextField import androidx.compose.material.Text import androidx.compose.material.TextFieldDefaults -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.KeyboardArrowDown -import androidx.compose.material.icons.filled.KeyboardArrowUp import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue @@ -85,9 +82,9 @@ fun DropdownComponent( var textFieldSize by remember { mutableStateOf(Size.Zero) } val icon = if (isExpanded) { - Icons.Filled.KeyboardArrowUp + painterResource(id = R.drawable.ic_arrow_drop_up) } else { - Icons.Filled.KeyboardArrowDown + painterResource(id = R.drawable.ic_arrow_drop_down) } val interactionSource = remember { MutableInteractionSource() } @@ -219,9 +216,9 @@ fun DropdownComponentFacilities( } val icon = if (isExpanded) { - Icons.Filled.KeyboardArrowUp + painterResource(id = R.drawable.ic_arrow_drop_up) } else { - Icons.Filled.KeyboardArrowDown + painterResource(id = R.drawable.ic_arrow_drop_down) } val interactionSource = remember { MutableInteractionSource() } @@ -353,9 +350,9 @@ fun DropdownComponentDistributedTo( } val icon = if (isExpanded) { - Icons.Filled.KeyboardArrowUp + painterResource(id = R.drawable.ic_arrow_drop_up) } else { - Icons.Filled.KeyboardArrowDown + painterResource(id = R.drawable.ic_arrow_drop_down) } val interactionSource = remember { MutableInteractionSource() } diff --git a/stock-managment/src/main/res/drawable/ic_arrow_drop_down.xml b/stock-managment/src/main/res/drawable/ic_arrow_drop_down.xml new file mode 100644 index 0000000000..c1c897af75 --- /dev/null +++ b/stock-managment/src/main/res/drawable/ic_arrow_drop_down.xml @@ -0,0 +1,5 @@ + + + diff --git a/stock-managment/src/main/res/drawable/ic_arrow_drop_up.xml b/stock-managment/src/main/res/drawable/ic_arrow_drop_up.xml new file mode 100644 index 0000000000..10c5932c46 --- /dev/null +++ b/stock-managment/src/main/res/drawable/ic_arrow_drop_up.xml @@ -0,0 +1,5 @@ + + +