Skip to content

AC-665 Updated UI for Login Page #743

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

Merged
f4ww4z merged 5 commits into from
Jun 6, 2020
Merged

AC-665 Updated UI for Login Page #743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e166a8a
Resolving conflicts
rishabh-997 Jun 2, 2020
a88408d
Updated Login page UI as requested
rishabh-997 May 21, 2020
7cddc1e
resolved conflicts
rishabh-997 Jun 1, 2020
75b0f08
Resolving conflicts
rishabh-997 Jun 2, 2020
9fc4f1c
resolved conflicts on LoginTest
rishabh-997 Jun 2, 2020
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
16 changes: 5 additions & 11 deletions openmrs-client/schemas/org.openmrs.mobile.databases.AppDatabase/1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,12 @@
"formatVersion": 1,
"database": {
"version": 1,
"identityHash": "41a50b7fab10cb07ddedc8846a9b55f5",
"identityHash": "80ed17c12fe7718613ca933e0b480ce5",
"entities": [
{
"tableName": "concepts",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER, `name` TEXT, `uuid` TEXT, `display` TEXT, `_id` INTEGER, `datatype_uuid` TEXT, `datatype_display` TEXT, `datatype__id` INTEGER, PRIMARY KEY(`id`))",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT, `uuid` TEXT, `display` TEXT, `_id` INTEGER PRIMARY KEY AUTOINCREMENT, `datatype_uuid` TEXT, `datatype_display` TEXT, `datatype__id` INTEGER)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "name",
"columnName": "name",
Expand Down Expand Up @@ -59,9 +53,9 @@
],
"primaryKey": {
"columnNames": [
"id"
"_id"
],
"autoGenerate": false
"autoGenerate": true
},
"indices": [],
"foreignKeys": []
Expand Down Expand Up @@ -536,7 +530,7 @@
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"41a50b7fab10cb07ddedc8846a9b55f5\")"
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"80ed17c12fe7718613ca933e0b480ce5\")"
]
}
}
4 changes: 2 additions & 2 deletions openmrs-client/src/main/java/org/openmrs/mobile/activities/login/LoginActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ protected void onCreate(Bundle savedInstanceState) {

// Create fragment
LoginFragment loginFragment =
(LoginFragment) getSupportFragmentManager().findFragmentById(R.id.loginContentFrame);
(LoginFragment) getSupportFragmentManager().findFragmentById(R.id.loginContentFrame);
if (loginFragment == null) {
loginFragment = LoginFragment.newInstance();
}
if (!loginFragment.isActive()) {
addFragmentToActivity(getSupportFragmentManager(),
loginFragment, R.id.loginContentFrame);
loginFragment, R.id.loginContentFrame);
}

mPresenter = new LoginPresenter(loginFragment, mOpenMRS);
Expand Down
4 changes: 1 addition & 3 deletions openmrs-client/src/main/java/org/openmrs/mobile/activities/login/LoginContract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ interface View extends BaseView<Presenter> {

void showInvalidURLSnackbar(String message);

void showInvalidURLSnackbar(int resId);
void showInvalidURLSnackbar(int messageID);

void showInvalidLoginOrPasswordSnackbar();

Expand All @@ -58,8 +58,6 @@ interface View extends BaseView<Presenter> {
void userAuthenticated();

void startFormListService();

void showOpenMRSLogo();
}

interface Presenter extends BasePresenterContract {
Expand Down
Loading