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 the new bottom nav icons, enlarged the show password checkbox, ma… #120

Merged
merged 1 commit into from Nov 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
@@ -1,4 +1,4 @@
VERSION_NAME=1.4.6-SNAPSHOT
VERSION_NAME=1.4.7-SNAPSHOT
VERSION_CODE=1
GROUP=org.smartregister
POM_SETTING_DESCRIPTION=OpenSRP Client Core Application
Expand Down
Binary file modified opensrp-app/res/drawable-hdpi/ic_icon_nav_clients.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified opensrp-app/res/drawable-hdpi/ic_icon_nav_new.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified opensrp-app/res/drawable-hdpi/ic_icon_open_book.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified opensrp-app/res/drawable-hdpi/ic_icon_search.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified opensrp-app/res/drawable-mdpi/ic_icon_nav_clients.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified opensrp-app/res/drawable-mdpi/ic_icon_nav_new.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified opensrp-app/res/drawable-mdpi/ic_icon_open_book.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified opensrp-app/res/drawable-mdpi/ic_icon_search.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified opensrp-app/res/drawable-xhdpi/ic_icon_nav_clients.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified opensrp-app/res/drawable-xhdpi/ic_icon_nav_new.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified opensrp-app/res/drawable-xhdpi/ic_icon_open_book.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified opensrp-app/res/drawable-xhdpi/ic_icon_search.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified opensrp-app/res/drawable-xxhdpi/ic_icon_nav_clients.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified opensrp-app/res/drawable-xxhdpi/ic_icon_nav_new.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified opensrp-app/res/drawable-xxhdpi/ic_icon_open_book.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified opensrp-app/res/drawable-xxhdpi/ic_icon_search.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified opensrp-app/res/drawable-xxxhdpi/ic_icon_nav_clients.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified opensrp-app/res/drawable-xxxhdpi/ic_icon_nav_new.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified opensrp-app/res/drawable-xxxhdpi/ic_icon_open_book.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified opensrp-app/res/drawable-xxxhdpi/ic_icon_search.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions opensrp-app/res/layout/activity_login.xml
Expand Up @@ -117,8 +117,8 @@

<CheckBox
android:id="@+id/login_show_password_checkbox"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_centerVertical="true"
android:layout_marginLeft="3dp"
android:layout_marginTop="15dp"
Expand Down
2 changes: 1 addition & 1 deletion opensrp-app/res/values/dimens.xml
Expand Up @@ -80,7 +80,7 @@
<dimen name="login_view_component_height">40dp</dimen>
<dimen name="login_build_text_view_textSize">15sp</dimen>
<dimen name="login_edit_text_textSize">16sp</dimen>
<dimen name="login_show_password_dimen">12dp</dimen>
<dimen name="login_show_password_dimen">15dp</dimen>
<dimen name="login_logo_top_padding">0dp</dimen>
<item name="checkbox_scale" format="float" type="dimen">1.7</item>
<dimen name="checkbox_margin_top">10dp</dimen>
Expand Down
Expand Up @@ -38,8 +38,10 @@ public abstract class BaseLoginActivity extends AppCompatActivity implements Bas
protected BaseLoginContract.Presenter mLoginPresenter;
private EditText userNameEditText;
private EditText passwordEditText;
private TextView showPasswordCheckBoxText;
private CheckBox showPasswordCheckBox;
private Button loginButton;
private Boolean showPasswordChecked = false;

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand Down Expand Up @@ -91,6 +93,7 @@ private void initializeLoginChildViews() {
userNameEditText = findViewById(R.id.login_user_name_edit_text);
passwordEditText = findViewById(R.id.login_password_edit_text);
showPasswordCheckBox = findViewById(R.id.login_show_password_checkbox);
showPasswordCheckBoxText = findViewById(R.id.login_show_password_text_view);
passwordEditText.setOnEditorActionListener(this);
loginButton = findViewById(R.id.login_login_btn);
loginButton.setOnClickListener(this);
Expand All @@ -104,12 +107,29 @@ private void initializeProgressDialog() {
}

private void setListenerOnShowPasswordCheckbox() {
showPasswordCheckBoxText.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (showPasswordChecked) {
showPasswordCheckBox.setChecked(true);
passwordEditText.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
showPasswordChecked = false;
} else {
showPasswordCheckBox.setChecked(false);
passwordEditText.setTransformationMethod(PasswordTransformationMethod.getInstance());
showPasswordChecked = true;
}
}
});

showPasswordCheckBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (isChecked) {
showPasswordChecked = false;
passwordEditText.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
} else {
showPasswordChecked = true;
passwordEditText.setTransformationMethod(PasswordTransformationMethod.getInstance());
}
}
Expand Down