Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Branding color updates #72

Merged
merged 3 commits into from
Oct 27, 2023
Merged

Branding color updates #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db3c5e5
Fix build errors in sample project
Rkareko Oct 27, 2023
d1a88d9
Update branding colors
Rkareko Oct 27, 2023
ee9a4b6
Bump up version
Rkareko Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion p2p-lib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ afterEvaluate {
from(components["release"])
artifactId = "p2p-lib"
groupId = "org.smartregister"
version = "0.6.8-SNAPSHOT"
version = "0.6.9-SNAPSHOT"
pom {
name.set("Peer to Peer Library")
}
Expand Down
2 changes: 1 addition & 1 deletion p2p-lib/src/main/java/org/smartregister/p2p/search/ui/p2p/P2PScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ fun P2PScreen(
TopAppBar(
modifier = modifier.testTag(P2P_SCREEN_TOP_BAR_TEST_TAG),
title = { Text(stringResource(id = R.string.transfer_data)) },
backgroundColor = colorResource(id = R.color.top_appbar_bg),
backgroundColor = colorResource(id = R.color.colorPrimaryLight),
contentColor = colorResource(id = R.color.white),
navigationIcon = {
IconButton(onClick = { p2PViewModel.closeP2PScreen() }) {
Expand Down
4 changes: 2 additions & 2 deletions p2p-lib/src/main/java/org/smartregister/p2p/search/ui/theme/Colors.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ val DefaultColor = Color(0xFF6F7274)
val WhiteColor = Color(0xFFF2F4F7)
val SuccessColor = Color(0xFF1DB11B)

private val PrimaryColor = Color(0xFF005084)
private val PrimaryVariantColor = Color(0xFF003D66)
private val PrimaryColor = Color(0xFF0077CC)
private val PrimaryVariantColor = Color(0xFF006BBA)
private val ErrorColor = Color(0xFFDD0000)

val LightColors =
Expand Down
3 changes: 2 additions & 1 deletion p2p-lib/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<color name="medium_grey">#e6e6e6</color>
<color name="close_btn_grey">#919191</color>
<color name="text_black">#313131</color>
<color name="top_appbar_bg">#155084</color>
<color name="icon_blue_color">#006EB8</color>
<color name="colorPrimaryDark">#006BBA</color>
<color name="colorPrimaryLight">#0077CC</color>
</resources>
5 changes: 3 additions & 2 deletions sample/src/main/java/org/smartregister/p2p/sample/SampleMainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import org.json.JSONArray
import org.smartregister.p2p.P2PLibrary
import org.smartregister.p2p.dao.ReceiverTransferDao
import org.smartregister.p2p.dao.SenderTransferDao
import org.smartregister.p2p.model.RecordCount
import org.smartregister.p2p.search.data.JsonData
import org.smartregister.p2p.sync.DataType
import org.smartregister.p2p.utils.startP2PScreen
Expand All @@ -26,8 +27,8 @@ class SampleMainActivity : AppCompatActivity() {
return TreeSet<DataType>()
}

override fun getTotalRecordCount(highestRecordIdMap: HashMap<String, Long>): Long {
return 0
override fun getTotalRecordCount(highestRecordIdMap: HashMap<String, Long>): RecordCount {
return RecordCount()
}

override fun getJsonData(
Expand Down
5 changes: 3 additions & 2 deletions sample/src/main/java/org/smartregister/p2p/sample/dao/P2PSenderTransferDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.smartregister.p2p.sample.dao

import org.smartregister.p2p.dao.SenderTransferDao
import org.smartregister.p2p.model.RecordCount
import org.smartregister.p2p.search.data.JsonData
import org.smartregister.p2p.sync.DataType
import java.util.TreeSet
Expand All @@ -10,8 +11,8 @@ class P2PSenderTransferDao() :SenderTransferDao {
return TreeSet<DataType>()
}

override fun getTotalRecordCount(highestRecordIdMap: HashMap<String, Long>): Long {
return 0
override fun getTotalRecordCount(highestRecordIdMap: HashMap<String, Long>): RecordCount {
return RecordCount()
}

override fun getJsonData(
Expand Down