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

added button text field to change the optibp button text #615

Merged
merged 4 commits into from
Jan 10, 2022
Merged

added button text field to change the optibp button text #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e2d6ae
added button text field to change the optibp button text
junaidwarsivd Jan 7, 2022
8bec79e
increased version to 2.1.15
junaidwarsivd Jan 10, 2022
60c36f8
updated the optibp-button text conditional block.
junaidwarsivd Jan 10, 2022
0ab2df1
Merge branch 'master' into optibp_button_text_addition
junaidwarsivd Jan 10, 2022
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
1 change: 1 addition & 0 deletions android-json-form-wizard/src/main/java/com/vijay/jsonwizard/constants/JsonFormConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ public static class OptibpConstants {
public static final String OPTIBP_KEY_CLIENT_OPENSRP_ID = "clientOpenSRPId";
public static final String OPTIBP_KEY_BUTTON_BG_COLOR = "optibp_button_bg_color";
public static final String OPTIBP_KEY_BUTTON_TEXT_COLOR = "optibp_button_text_color";
public static final String OPTIBP_KEY_BUTTON_TEXT = "optibp_button_text";
}

public static class EDIT_TEXT_TYPE {
Expand Down
5 changes: 5 additions & 0 deletions android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/OptiBPWidgetFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,11 @@ private void formatButtonWidget(Button button, JSONObject jsonObject) throws JSO
String colorString = jsonObject.getString(JsonFormConstants.OptibpConstants.OPTIBP_KEY_BUTTON_TEXT_COLOR);
button.setTextColor(Color.parseColor(colorString));
}
if(jsonObject.has(JsonFormConstants.OptibpConstants.OPTIBP_KEY_BUTTON_TEXT)) {
String buttonText = jsonObject.getString(JsonFormConstants.OptibpConstants.OPTIBP_KEY_BUTTON_TEXT);
button.setText(buttonText);
}

}

public void setUpOptiBpActivityResultListener(final WidgetArgs widgetArgs, int requestCode, final LinearLayout rootLayout, final EditText systolicEditText, final EditText diastolicEditText) {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION_NAME=2.1.14-SNAPSHOT
VERSION_NAME=2.1.15-SNAPSHOT
VERSION_CODE=1
GROUP=org.smartregister
POM_SETTING_DESCRIPTION=OpenSRP Client Native Form Json Wizard
Expand Down