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.

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

Add reconfigurable registers & profiles #676

Open
wants to merge 163 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 89 commits
Commits
Show all changes
163 commits
Select commit Hold shift + click to select a range
e69c6c8
Add configurable register contract
ekigamba Sep 17, 2020
8ea7af9
Add View Configuration interfaces
ekigamba Sep 17, 2020
198bd4c
Include configurable register contract in base register
ekigamba Sep 18, 2020
585bcbd
Code cleanup
ekigamba Sep 18, 2020
53ba300
Add default implementation of new presenter methods
ekigamba Sep 21, 2020
7086c84
Add Module metadata configuration interfaces
ekigamba Sep 21, 2020
f241d41
Add interfaces & default implementations for register page & library …
ekigamba Sep 24, 2020
cd640f5
Add default implementations of RegisterActivity & RegisterFragment
ekigamba Sep 25, 2020
81309e4
Fix import error in BaseConfigurableRegisterFragmen & add BaseConfig.…
ekigamba Sep 28, 2020
185b5ad
Add app version & DB version to CoreLibrary
ekigamba Sep 29, 2020
ab9d1f1
Add configurable register implementation in sample module
ekigamba Sep 29, 2020
04fdd19
Fix register configuration & starting registration form
ekigamba Sep 30, 2020
2cbf2d0
Enable processing registration forms
ekigamba Oct 1, 2020
9327b1a
:arrow_up: Update client-utils version
allan-on Oct 8, 2020
30cd332
:recycle: Add default implementations for starFormActivity
allan-on Oct 8, 2020
144b4d6
Remove OPD references
ekigamba Oct 1, 2020
2f2bb68
Add EventClientRepository method to fetch client as CommonPersonObjec…
ekigamba Oct 9, 2020
94e5f06
:lipstick: Add Configurable Toolbar placeholder layouts
allan-on Oct 16, 2020
a2272e7
:construction: Add new Toolbar UI enabling config
allan-on Oct 16, 2020
678a97d
:construction: Add Toolbar and search drawables
allan-on Oct 18, 2020
1f44de3
:construction: Add/Modify new UI Toolbar layouts
allan-on Oct 18, 2020
18e5711
:construction: Add new UI colours, strings & styles
allan-on Oct 18, 2020
da65e43
Fix closing unique_id after registration for unique_ids labelled as o…
ekigamba Oct 19, 2020
a81955e
:arrow-up: Increment development version to 2.1.2.3-SNAPSHOT
ekigamba Oct 19, 2020
e4ea418
Enable saving form image as contract on ModuleFormProcessor
ekigamba Oct 19, 2020
5707a52
Run saveImage interface implementation
ekigamba Oct 21, 2020
d871b24
:globe_with_meridians: Update register title String
allan-on Oct 21, 2020
d01fbe3
Merge branch 'add-configurability-goldsmith-design' of github.com:Ope…
allan-on Oct 21, 2020
d410ec6
Merge branch 'master' of github.com:OpenSRP/opensrp-client-core into …
allan-on Oct 21, 2020
618ea52
:bug: Handle NPE when new layout is initialized
allan-on Oct 22, 2020
b57df84
:construction: Add 'Add new clients' FAB
allan-on Oct 22, 2020
2fd53c8
:construction: Add initialize new configurable views
allan-on Oct 22, 2020
c80e103
:construction: Add Toolbar back arrow
allan-on Oct 22, 2020
f70187c
:construction: Fix search UI & update Toolbar view references
allan-on Oct 22, 2020
b222da0
:lipstick: Add back arrow Vector
allan-on Oct 22, 2020
9afb800
:lipstick: Style FAB text
allan-on Oct 22, 2020
d9fd86d
:heavy_minus_sign: Remove duplicate dependencies
allan-on Oct 28, 2020
51534da
:bug: FIx search crash due to NPE
allan-on Oct 28, 2020
7f3427c
:construction: Add setting toolbar logo as Register config
allan-on Oct 28, 2020
52397ea
:construction: Set logo & set visible when logo is in config
allan-on Oct 28, 2020
8e61d7f
:lipstick: Change Toolbar icons to material defaults
allan-on Oct 28, 2020
f2529ef
Merge branch 'master' of github.com:OpenSRP/opensrp-client-core into …
allan-on Oct 29, 2020
252ecd7
Merge pull request #654 from OpenSRP/add-configurability-goldsmith-de…
allan-on Oct 29, 2020
896ab81
:arrow_up: Change dependency version
allan-on Oct 29, 2020
aa02a6c
:arrow_up: Update client-core snapshot version
allan-on Oct 30, 2020
07e7eb5
:camera_flash: Update to preview for publishing
allan-on Nov 5, 2020
1a37cec
Merge branch 'master' of github.com:OpenSRP/opensrp-client-core into …
allan-on Nov 5, 2020
9780cea
:construction: Start ConfigurableRegisterActivity with action
allan-on Nov 9, 2020
a8a3047
:construction: Add Toolbar & related config options
allan-on Nov 11, 2020
68686e4
:construction: Add show new toolbar & register dialog
allan-on Nov 11, 2020
3ce4c25
Add method to fetch person details from any table as CommonPersonObje…
ekigamba Nov 13, 2020
e5af240
:construction: Implement Get injected values
allan-on Nov 16, 2020
bb5d53b
Merge branch 'add-reconfigurable-registers-and-profiles' of github.co…
allan-on Nov 16, 2020
7ae882d
:construction: Add set current module
allan-on Nov 16, 2020
54009b5
:construction: Get injected values+table on start form
allan-on Nov 16, 2020
1dc71e2
Update snapshot version to 3.1.0.1-GS-PREVIEW-SNAPSHOT
ekigamba Nov 16, 2020
51e25dc
Merge branch 'add-reconfigurable-registers-and-profiles' of github.co…
ekigamba Nov 16, 2020
db39779
Fix EventClientRepository#fetchCommonPersonObjectClientByBaseEntityId…
ekigamba Nov 16, 2020
fa063d6
:construction: Add configurable member profile layouts
allan-on Nov 17, 2020
a5599c2
:lipstick: Add placeholder configurable MemberProfile icons
allan-on Nov 17, 2020
452dbb3
:lipstick: Add configurable profile placeholder icons
allan-on Nov 18, 2020
0c5f205
:camera_flash: Update client-core snapshot version
allan-on Nov 18, 2020
546b433
:bug: Fix member profile layout & ToolbarOptions NPE
allan-on Nov 18, 2020
d86e2c3
:construction: Add Configurable member profile implementations
allan-on Nov 23, 2020
d57e295
:bug: Fix init presenter & Toolbar layout NPE
allan-on Nov 24, 2020
eb8bdf7
:construction: Implement show profile details in Activity
allan-on Nov 24, 2020
05bb7dc
:construction: Hide profile rows by default
allan-on Nov 24, 2020
f1896f0
:construction: Add Toolbar title -> Set to empty
allan-on Nov 24, 2020
6d34613
:construction: Add member profile options module configurations
allan-on Nov 24, 2020
33d3102
:construction: Add configurable profile to Manifest
allan-on Nov 24, 2020
395a143
:construction: Configurable profile contract + implementations
allan-on Nov 24, 2020
03543b1
:construction: Add configurable profile options interfaces
allan-on Nov 24, 2020
2e51648
:recycle: Remove configurable member profile strings
allan-on Nov 26, 2020
4f61744
:recycle: Refactor to use RecyclerView in bottom section
allan-on Nov 26, 2020
7468efb
:recycle: Refactor refresh profile bottom section
allan-on Nov 26, 2020
7489679
:recycle: Refactor, implement bottom section recyclerview
allan-on Nov 26, 2020
8be84a1
:fire: Remove member profile row drawables
allan-on Nov 29, 2020
7f7ef85
:lipstick: Fix member profile text, margins & paddings
allan-on Nov 29, 2020
a730105
:construction: Notifiy dataset changed on create adapter
allan-on Nov 29, 2020
833c89c
:construction: Implement contract get member profile options
allan-on Nov 30, 2020
d8b27a3
:construction: Implement show and handle select menu options
allan-on Nov 30, 2020
aafa9ed
:construction: Handle null member profile options
allan-on Dec 1, 2020
9aa7651
:construction: Handle NULL member options config
allan-on Dec 1, 2020
3ba942b
Update plan-evaluator version to 0.1.6.3-GS-SNAPSHOT
ekigamba Dec 1, 2020
06a90bc
Fix TaskDao#updateTask implementation
ekigamba Dec 1, 2020
9316a54
Update snapshot version to 3.1.0.4-GS-PREVIEW-SNAPSHOT
ekigamba Dec 1, 2020
1811e8d
:construction: Enable apply from maven.gradle
allan-on Dec 4, 2020
b3578aa
:arrow_up: Update plan evaluator dependency version
allan-on Dec 4, 2020
d3456b0
:construction: Fix switch register select & enable set fab text
allan-on Dec 10, 2020
3b5d9eb
:construction: Enable load register activity without history
allan-on Dec 10, 2020
e924038
:recycle: Code cleanup
allan-on Dec 10, 2020
81cb468
:camera_flash: Update client-core snapshot
allan-on Dec 11, 2020
17c3a96
Enable clicking on the map icon
ekigamba Dec 16, 2020
2fd15c2
Update snapshot version to 3.1.0.6-GS-PREVIEW-SNAPSHOT
ekigamba Dec 16, 2020
1c3bf3a
Fix error due to orphaned events
ekigamba Dec 17, 2020
02bbb3f
Update snapshot version to 3.1.0.7-GS-PREVIEW-SNAPSHOT
ekigamba Dec 17, 2020
0903649
:bug: Undo start register activity with no history
allan-on Dec 18, 2020
06f08f5
Merge branch 'add-reconfigurable-registers-and-profiles' of github.co…
allan-on Dec 18, 2020
56415ce
Update snapshot version to 3.1.0.8-GS-PREVIEW-SNAPSHOT
ekigamba Dec 18, 2020
4ac9101
Fix duplicate OpenMRS IDs from server
ekigamba Dec 18, 2020
27a41ec
Update snapshot version to 3.1.0.9-GS-PREVIEW-SNAPSHOT
ekigamba Dec 18, 2020
c9a9425
:construction: Add parent activity to Dialog option listener
allan-on Dec 21, 2020
41866ba
:camera_flash: Update client-core snapshot
allan-on Dec 21, 2020
1500610
:construction: Check & replace new client null values
allan-on Jan 11, 2021
0ae34d3
:camera_flash: Update client-core snapshot
allan-on Jan 11, 2021
6f152a9
:recycle: Apply refactors to fix Codacy reported issues
allan-on Feb 1, 2021
90e5131
:recycle: Fix codacy reported issues
allan-on Feb 1, 2021
7786f3e
Merge branch 'master' into add-reconfigurable-registers-and-profiles
ekigamba Feb 9, 2021
ef1ae8e
:white_check_mark: Add get current module configuration test
allan-on Feb 9, 2021
e5b5c45
Merge branch 'add-reconfigurable-registers-and-profiles' of github.co…
allan-on Feb 9, 2021
58f8b10
Merge branch 'master' of github.com:OpenSRP/opensrp-client-core into …
allan-on Feb 10, 2021
c5ad356
:construction: Fix get shared pref static import
allan-on Feb 10, 2021
2ef7c0f
:rewind: Undo get shared pref static import change
allan-on Feb 10, 2021
4fc64ea
:construction: Add ModuleRegister class
allan-on Feb 10, 2021
0c4e8ed
:camera_flash: Update client-core snapshot version
allan-on Feb 10, 2021
edf7f6d
:white_check_mark: Fix tests
allan-on Feb 10, 2021
d7a27b8
:construction: Fix create & get ModuleRegister
allan-on Feb 10, 2021
645c375
Merge branch 'master' of github.com:OpenSRP/opensrp-client-core into …
allan-on Feb 10, 2021
6a2b914
Add test for EventClientRepository#getSqliteType
ekigamba Feb 16, 2021
00483b4
Add tests for BaseConfigurableRegisterActivity
ekigamba Feb 16, 2021
55f3e26
Add test for BaseConfigurableRegisterActivity#startFormActivity
ekigamba Feb 16, 2021
82b8410
:white_check_mark: Add BaseRegisterProvider tests
allan-on Feb 16, 2021
23aa3da
:white_check_mark: Add BaseRegisterProviderMetadata tests
allan-on Feb 16, 2021
8ae3470
Merge branch 'add-reconfigurable-registers-and-profiles' of github.co…
allan-on Feb 16, 2021
5ec3cb0
:white_check_mark: Fix codacy reported issues
allan-on Feb 16, 2021
45bd57f
Merge branch 'master' of github.com:OpenSRP/opensrp-client-core into …
allan-on Feb 17, 2021
a2931d2
Code cleanup
ekigamba Feb 22, 2021
f80aac4
:white_check_mark: Add BaseRegisterProviderTest tests
allan-on Feb 23, 2021
e690186
Add test for BaseConfigurableRegisterActivity#onStartActivityWithAction
ekigamba Feb 23, 2021
e0dd4e1
Add test for BaseConfigurableRegisterActivity#startFormActivity
ekigamba Feb 23, 2021
7ad2530
Fix bug initialising presenter everytime the method is called
ekigamba Feb 23, 2021
8476281
:green_heart: Fix NPath Complexity
allan-on Feb 26, 2021
ea4cd27
Merge remote-tracking branch 'origin/master' into add-reconfigurable-…
ekigamba Mar 2, 2021
42f6184
:camera_flash: Update snapshot version
allan-on Mar 2, 2021
f520725
Merge branch 'add-reconfigurable-registers-and-profiles' of github.co…
allan-on Mar 2, 2021
58cef83
Add 2 tests for BaseConfigurableRegisterActivity#startForm
ekigamba Mar 2, 2021
21fb67f
Add test for BaseConfigurableRegisterActivity#onActivityResultExtended
ekigamba Mar 2, 2021
dab29ba
:white_check_mark: Add test can create new client with original
allan-on Mar 2, 2021
d2f5752
Merge branch 'add-reconfigurable-registers-and-profiles' of github.co…
allan-on Mar 2, 2021
28fea51
:white_check_mark: Fix Codacy reported issues
allan-on Mar 2, 2021
2659621
:white_check_mark: Add assert statements
allan-on Mar 3, 2021
781984d
Add test for BaseConfigurableRegisterActivity#switchToBaseFragment
ekigamba Mar 4, 2021
caedf4b
:camera_flash: Update client-core snapshot
allan-on Mar 4, 2021
dad5c81
Merge branch 'master' of github.com:OpenSRP/opensrp-client-core into …
allan-on Mar 8, 2021
624ee97
Merge branch 'master' of github.com:OpenSRP/opensrp-client-core into …
allan-on Mar 9, 2021
da5c0df
:white_check_mark: Add create custom ViewHolder Test
allan-on Mar 9, 2021
be14b6f
:fire: Undo fix duplicate OpenMRS IDs from server
allan-on Mar 9, 2021
9d52392
Merge branch 'master' of github.com:OpenSRP/opensrp-client-core into …
allan-on Mar 11, 2021
7f579f6
Add BaseRegisterViewHolder tests
ekigamba Mar 16, 2021
f98f0a5
Add FooterViewHolder test
ekigamba Mar 16, 2021
23bd0b3
Add FormUtils#getMultiStepFormFields test
ekigamba Mar 16, 2021
e0cdd66
:recycle: Attach context to getString()
allan-on Mar 16, 2021
f30dc7c
:white_check_mark: Add BaseConfigurableRegisterFragment Tests
allan-on Mar 16, 2021
d1294a7
Merge branch 'master' of github.com:OpenSRP/opensrp-client-core into …
allan-on Mar 30, 2021
a787819
:construction: Add toolbar color & options hiding functionality
allan-on Mar 21, 2021
e686296
:construction: Refactor navigation & add bottom nav configs
allan-on Mar 21, 2021
45ff04d
:recycle: Refactor toolbar & bottom nav Module configs
allan-on Mar 21, 2021
616267c
:construction: Add set fragment toolbar options
allan-on Mar 21, 2021
a777a68
:construction: Show bottom nav icons + title
allan-on Mar 30, 2021
b27eee5
Merge branch 'master' of github.com:OpenSRP/opensrp-client-core into …
allan-on Mar 30, 2021
e398956
:white_check_mark: Update BaseConfigurableRegisterFragmentTest
allan-on Mar 30, 2021
d2b1e1f
:white_check_mark: Update BaseConfigurableRegisterActivityTest
allan-on Mar 30, 2021
abcf237
:white_check_mark: Update campaign & location intent service tests
allan-on Mar 30, 2021
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 gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION_NAME=3.0.5-SNAPSHOT
VERSION_NAME=3.1.0.4-GS-PREVIEW-SNAPSHOT
VERSION_CODE=1
GROUP=org.smartregister
POM_SETTING_DESCRIPTION=OpenSRP Client Core Application
Expand Down
12 changes: 12 additions & 0 deletions opensrp-app/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,18 @@
android:launchMode="singleTask"
android:screenOrientation="portrait" />

<activity
android:name=".view.activity.BaseConfigurableRegisterActivity"
android:exported="false"
android:screenOrientation="portrait"
android:theme="@style/MaterialAppThemeNoActionBarAndTitle" />

<activity
android:name=".view.activity.BaseConfigurableMemberProfileActivity"
android:exported="false"
android:screenOrientation="portrait"
android:theme="@style/MaterialAppThemeNoActionBarAndTitle" />

<receiver
android:name=".view.receiver.SyncBroadcastReceiver"
android:exported="false" />
Expand Down
32 changes: 10 additions & 22 deletions opensrp-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ buildscript {
google()
jcenter()
maven { url 'https://maven.fabric.io/public' }
maven{ url "https://plugins.gradle.org/m2/" }
}

dependencies {
classpath "com.android.tools.build:gradle:$androidToolsBuildGradle"
classpath 'org.apache.commons:commons-lang3:3.10'
Expand Down Expand Up @@ -89,8 +91,8 @@ android {
//applicationId "org.smartregister"
minSdkVersion androidMinSdkVersion
targetSdkVersion androidTargetSdkVersion
versionCode Integer.parseInt(project.VERSION_CODE)
versionName project.VERSION_NAME
versionCode 12
versionName "12"
testInstrumentationRunner "android.test.InstrumentationTestRunner"
buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"
buildConfigField "int", "DB_ENCRYPTION_VERSION", '1'
Expand Down Expand Up @@ -218,36 +220,22 @@ dependencies {
compileOnly 'org.projectlombok:lombok:1.18.12'
annotationProcessor 'org.projectlombok:lombok:1.18.12'

implementation 'org.smartregister:opensrp-client-utils:0.0.2-SNAPSHOT'

implementation 'org.smartregister:opensrp-plan-evaluator:0.1.3-SNAPSHOT'

implementation 'xerces:xercesImpl:2.12.0'

implementation('ch.acra:acra:4.5.0') {
exclude group: 'org.json', module: 'json'
api ('org.smartregister:opensrp-client-utils:0.0.4-SNAPSHOT'){
transitive = true
}

implementation 'com.github.ybq:Android-SpinKit:1.2.0'
implementation 'com.mcxiaoke.volley:library:1.0.19'
api ('org.smartregister:opensrp-plan-evaluator:0.1.6.4-GS-SNAPSHOT'){
transitive = true
}

implementation fileTree(include: ['*.jar'], dir: 'libs')
annotationProcessor fileTree(include: ['butterknife*.jar'], dir: 'libs')
implementation 'xerces:xercesImpl:2.12.0'

implementation 'com.cloudant:cloudant-http:2.7.0'
implementation 'com.android.support:recyclerview-v7:28.0.0'

implementation('com.android.support:design:28.0.0') {
exclude group: 'com.android.support', module: 'recyclerview-v7'
}

implementation 'com.evernote:android-job:1.2.6'
implementation group: 'commons-validator', name: 'commons-validator', version: '1.6'
implementation 'de.hdodenhof:circleimageview:2.2.0'
implementation 'xerces:xercesImpl:2.12.0'

implementation fileTree(include: ['*.jar'], dir: 'libs')

androidTestImplementation 'junit:junit:4.13'

testImplementation 'org.apache.maven:maven-ant-tasks:2.1.3'
Expand Down
Binary file added opensrp-app/res/drawable-hdpi/ic_action_back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-hdpi/ic_action_filter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-hdpi/ic_action_map.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-hdpi/ic_action_register.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-hdpi/ic_child_care.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-hdpi/ic_navigate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-mdpi/ic_action_back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-mdpi/ic_action_filter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-mdpi/ic_action_map.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-mdpi/ic_action_register.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-mdpi/ic_child_care.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-mdpi/ic_navigate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-xhdpi/ic_action_back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-xhdpi/ic_action_filter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-xhdpi/ic_action_map.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-xhdpi/ic_child_care.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-xhdpi/ic_navigate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-xxhdpi/ic_action_back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-xxhdpi/ic_action_filter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-xxhdpi/ic_action_map.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-xxhdpi/ic_child_care.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-xxhdpi/ic_member.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added opensrp-app/res/drawable-xxhdpi/ic_navigate.png
Binary file added opensrp-app/res/drawable-xxxhdpi/ic_action_back.png
Binary file added opensrp-app/res/drawable-xxxhdpi/ic_action_map.png
Binary file added opensrp-app/res/drawable-xxxhdpi/ic_navigate.png
12 changes: 12 additions & 0 deletions opensrp-app/res/drawable/curved_search_edit_text.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="19dp" />
<solid android:color="#F7F7F7" />
<size
android:width="344dp"
android:height="33dp" />
<stroke
android:width="1dp"
android:color="#C5C5C5" />
</shape>
10 changes: 10 additions & 0 deletions opensrp-app/res/drawable/ic_baseline_arrow_back_24.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
</vector>
181 changes: 181 additions & 0 deletions opensrp-app/res/layout/activity_base_configurable_member_profile.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">

<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

<com.google.android.material.appbar.AppBarLayout
android:id="@+id/collapsing_toolbar_appbarlayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/top_section_background_grey">

<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<androidx.appcompat.widget.Toolbar
android:id="@+id/collapsing_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:contentInsetStart="0dp"
android:contentInsetLeft="0dp"
android:contentInsetEnd="0dp"
android:contentInsetRight="0dp"
app:contentInsetEnd="0dp"
app:contentInsetLeft="0dp"
app:contentInsetRight="0dp"
app:contentInsetStart="0dp"
app:contentInsetStartWithNavigation="0dp"
app:layout_collapseMode="pin">

<org.smartregister.view.customcontrols.CustomFontTextView
android:id="@+id/toolbar_title"
style="@style/CustomFontTextViewStyle.ClientList"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical|left"
android:paddingStart="0dp"
android:paddingLeft="0dp"
android:text=""
android:textSize="17sp" />

</androidx.appcompat.widget.Toolbar>

<LinearLayout
android:id="@+id/profile_name_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="15dp"
app:layout_collapseMode="parallax">

<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/profile_imageview"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_gravity="center_horizontal"
app:civ_border_color="@color/transparent"
app:civ_border_width="0dp" />

<org.smartregister.view.customcontrols.CustomFontTextView
android:id="@+id/textview_name_age"
style="@style/CustomFontTextViewStyle.ClientList"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="5dp"
android:paddingLeft="0dp"
android:text="Glory Ellen, 33"
android:textColor="@android:color/black"
android:textSize="@dimen/configurable_member_profile_name_size" />

<org.smartregister.view.customcontrols.CustomFontTextView
android:id="@+id/textview_primary_caregiver"
style="@style/CustomFontTextViewStyle.ClientList.Light"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="0dp"
android:paddingTop="2dp"
android:text="Caregiver: Jack Smith"
android:textColor="@color/text_black"
android:textStyle="bold"
android:visibility="gone" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:gravity="center"
android:orientation="horizontal">

<org.smartregister.view.customcontrols.CustomFontTextView
android:id="@+id/textview_gender"
style="@style/CustomFontTextViewStyle.ClientList.Light"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="Female"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@android:color/black"
android:textStyle="bold" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/profile_dot_separator_margin"
android:layout_marginRight="@dimen/profile_dot_separator_margin"
android:text="\u00b7"
android:textColor="@android:color/black"
android:textStyle="bold" />

<org.smartregister.view.customcontrols.CustomFontTextView
android:id="@+id/textview_address"
style="@style/CustomFontTextViewStyle.ClientList.Light"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:paddingLeft="0dp"
android:text="Lavington #445"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@android:color/black"
android:textStyle="bold" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/profile_dot_separator_margin"
android:layout_marginRight="@dimen/profile_dot_separator_margin"
android:text="\u00b7"
android:textColor="@android:color/black"
android:textStyle="bold" />


<org.smartregister.view.customcontrols.CustomFontTextView
android:id="@+id/textview_id"
style="@style/CustomFontTextViewStyle.ClientList.Light"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:paddingLeft="0dp"
android:text="ID: 25398735"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@android:color/black"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>

</com.google.android.material.appbar.CollapsingToolbarLayout>

</com.google.android.material.appbar.AppBarLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/profile_bottom_recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<ProgressBar
android:id="@+id/progress_bar"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:visibility="visible" />

</LinearLayout>
Loading