Skip to content

Krishna Vemulavada / vera_2.1_app

Go to a project
Commit a7dfa538 by Krishna Vemulavada
Options

login chages done

parents f646c386 c5ace9e2
Inline Side-by-side
Showing with 240 additions and 444 deletions
app/build.gradle
...@@ -31,7 +31,7 @@ android { ...@@ -31,7 +31,7 @@ android {
defaultConfig { defaultConfig {
applicationId "com.vsoft.uoflservicenow" applicationId "com.vsoft.uoflservicenow"
minSdkVersion 15 minSdkVersion 9
targetSdkVersion 24 targetSdkVersion 24
versionCode 1 versionCode 1
versionName "0.0.7" versionName "0.0.7"
...@@ -63,7 +63,7 @@ dependencies { ...@@ -63,7 +63,7 @@ dependencies {
apt 'com.jakewharton:butterknife-compiler:8.2.1' apt 'com.jakewharton:butterknife-compiler:8.2.1'
compile 'com.android.support:cardview-v7:24.1.1' compile 'com.android.support:cardview-v7:24.1.1'
compile 'net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent:1.0.1' compile 'net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent:1.0.1'
compile 'com.google.android.gms:play-services-analytics:9.2.0' compile 'com.google.android.gms:play-services-analytics:9.4.0'
compile('com.crashlytics.sdk.android:crashlytics:2.6.2@aar') { compile('com.crashlytics.sdk.android:crashlytics:2.6.2@aar') {
transitive = true; transitive = true;
} }
......
app/fabric.properties 0 → 100644
#Contains API Secret used to validate your application. Commit to internal source control; avoid making secret public.
#Fri Sep 02 13:13:58 IST 2016
apiSecret=86619d978f2c755766adfcd904e0da433b5fe19937891d49074426fb8d263c24
app/src/main/java/com/vsoft/uoflservicenow/dialog/SelectReferenceDialog.java
...@@ -53,7 +53,7 @@ public class SelectReferenceDialog extends DialogFragment { ...@@ -53,7 +53,7 @@ public class SelectReferenceDialog extends DialogFragment {
private ReferenceListener mListener; private ReferenceListener mListener;
private Unbinder mUnbinder; private Unbinder mUnbinder;
private List<Reference> mReferenceList; private List<Reference> mReferenceList;
private String mReferenceTableName; private String mReferenceTableName, mReferenceTitle;
private CatalogueApplication mApplication; private CatalogueApplication mApplication;
public SelectReferenceDialog() { public SelectReferenceDialog() {
...@@ -64,11 +64,12 @@ public class SelectReferenceDialog extends DialogFragment { ...@@ -64,11 +64,12 @@ public class SelectReferenceDialog extends DialogFragment {
mListener = listener; mListener = listener;
} }
public static SelectReferenceDialog newInstance(String tableName) { public static SelectReferenceDialog newInstance(String tableName, String title) {
SelectReferenceDialog selectReferenceDialog = new SelectReferenceDialog(); SelectReferenceDialog selectReferenceDialog = new SelectReferenceDialog();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString(Constants.DATA_KEY_REFERENCE_TABLE_NAME, tableName); bundle.putString(Constants.DATA_KEY_REFERENCE_TABLE_NAME, tableName);
bundle.putString(Constants.DATA_KEY_REFERENCE_TITLE, title);
selectReferenceDialog.setArguments(bundle); selectReferenceDialog.setArguments(bundle);
return selectReferenceDialog; return selectReferenceDialog;
...@@ -81,6 +82,7 @@ public class SelectReferenceDialog extends DialogFragment { ...@@ -81,6 +82,7 @@ public class SelectReferenceDialog extends DialogFragment {
mApplication = (CatalogueApplication) getActivity().getApplication(); mApplication = (CatalogueApplication) getActivity().getApplication();
mReferenceTableName = getArguments().getString(Constants.DATA_KEY_REFERENCE_TABLE_NAME); mReferenceTableName = getArguments().getString(Constants.DATA_KEY_REFERENCE_TABLE_NAME);
mReferenceTitle = getArguments().getString(Constants.DATA_KEY_REFERENCE_TITLE);
} }
@Override @Override
...@@ -99,6 +101,9 @@ public class SelectReferenceDialog extends DialogFragment { ...@@ -99,6 +101,9 @@ public class SelectReferenceDialog extends DialogFragment {
View rootView = inflater.inflate(R.layout.custom_dialog, container, false); View rootView = inflater.inflate(R.layout.custom_dialog, container, false);
mUnbinder = ButterKnife.bind(this, rootView); mUnbinder = ButterKnife.bind(this, rootView);
mTitleTextView.setText(String.format(getString(R.string.variable_form_reference_dialog_title_string), mReferenceTitle));
mEditText.setHint(mReferenceTitle);
return rootView; return rootView;
} }
......
app/src/main/java/com/vsoft/uoflservicenow/ui/CatalogueItemScreen.java
...@@ -137,6 +137,7 @@ public class CatalogueItemScreen extends AppCompatActivity { ...@@ -137,6 +137,7 @@ public class CatalogueItemScreen extends AppCompatActivity {
Intent intent = new Intent(CatalogueItemScreen.this, CatalogueVariableScreen.class); Intent intent = new Intent(CatalogueItemScreen.this, CatalogueVariableScreen.class);
intent.putExtra(Constants.DATA_KEY_SYS_ID, mCatalogueItemList.get(position).getSysId()); intent.putExtra(Constants.DATA_KEY_SYS_ID, mCatalogueItemList.get(position).getSysId());
intent.putExtra(Constants.DATA_KEY_CATALOGUE_ITEM_DESCRIPTION, mCatalogueItemList.get(position).getDescription()); intent.putExtra(Constants.DATA_KEY_CATALOGUE_ITEM_DESCRIPTION, mCatalogueItemList.get(position).getDescription());
intent.putExtra(Constants.DATA_KEY_CATALOGUE_ITEM_SHORT_DESCRIPTION, mCatalogueItemList.get(position).getShortDescription());
intent.putExtra(Constants.DATA_KEY_CATALOGUE_TITLE, mCatalogueItemList.get(position).getName()); intent.putExtra(Constants.DATA_KEY_CATALOGUE_TITLE, mCatalogueItemList.get(position).getName());
startActivity(intent); startActivity(intent);
} }
......
app/src/main/java/com/vsoft/uoflservicenow/ui/CatalogueVariableScreen.java
...@@ -4,6 +4,7 @@ import android.app.DatePickerDialog; ...@@ -4,6 +4,7 @@ import android.app.DatePickerDialog;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.app.TimePickerDialog; import android.app.TimePickerDialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.graphics.Typeface;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
...@@ -14,6 +15,7 @@ import android.support.v7.app.AppCompatActivity; ...@@ -14,6 +15,7 @@ import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.text.Html; import android.text.Html;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.method.LinkMovementMethod;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
...@@ -65,15 +67,13 @@ public class CatalogueVariableScreen extends AppCompatActivity { ...@@ -65,15 +67,13 @@ public class CatalogueVariableScreen extends AppCompatActivity {
@BindView(R.id.tool_bar_view) Toolbar mToolbar; @BindView(R.id.tool_bar_view) Toolbar mToolbar;
@BindView(R.id.variable_screen_back_text_view) TextView mBackTextView; @BindView(R.id.variable_screen_back_text_view) TextView mBackTextView;
@BindView(R.id.variable_screen_submit_text_view) TextView mSubmitTextView; @BindView(R.id.variable_screen_submit_text_view) TextView mSubmitTextView;
@BindView(R.id.variable_screen_empty_text_view) TextView mEmptyTextView;
@BindView(R.id.variable_screen_container_layout) LinearLayout mContainerLayout; @BindView(R.id.variable_screen_container_layout) LinearLayout mContainerLayout;
@BindView(R.id.variable_screen_main_layout) LinearLayout mMainLayout;
@BindView(R.id.variable_screen_bottom_layout) RelativeLayout mBottomLayout; @BindView(R.id.variable_screen_bottom_layout) RelativeLayout mBottomLayout;
private List<CatalogueVariable> mCatalogueVariableList; private List<CatalogueVariable> mCatalogueVariableList;
private JSONArray mJsonArray; private JSONArray mJsonArray;
private CatalogueApplication mApplication; private CatalogueApplication mApplication;
private String mCatalogueItemSysId, mCatalogueItemDescription, mCatalogueItemTitle; private String mCatalogueItemSysId, mCatalogueItemDescription, mCatalogueItemShortDescription, mCatalogueItemTitle;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
...@@ -91,6 +91,7 @@ public class CatalogueVariableScreen extends AppCompatActivity { ...@@ -91,6 +91,7 @@ public class CatalogueVariableScreen extends AppCompatActivity {
if (extras != null) { if (extras != null) {
mCatalogueItemSysId = extras.getString(Constants.DATA_KEY_SYS_ID); mCatalogueItemSysId = extras.getString(Constants.DATA_KEY_SYS_ID);
mCatalogueItemDescription = extras.getString(Constants.DATA_KEY_CATALOGUE_ITEM_DESCRIPTION); mCatalogueItemDescription = extras.getString(Constants.DATA_KEY_CATALOGUE_ITEM_DESCRIPTION);
mCatalogueItemShortDescription = extras.getString(Constants.DATA_KEY_CATALOGUE_ITEM_SHORT_DESCRIPTION);
mCatalogueItemTitle = extras.getString(Constants.DATA_KEY_CATALOGUE_TITLE); mCatalogueItemTitle = extras.getString(Constants.DATA_KEY_CATALOGUE_TITLE);
//The key argument here must match that used in the other activity //The key argument here must match that used in the other activity
} }
...@@ -200,8 +201,23 @@ public class CatalogueVariableScreen extends AppCompatActivity { ...@@ -200,8 +201,23 @@ public class CatalogueVariableScreen extends AppCompatActivity {
LinearLayout.LayoutParams.WRAP_CONTENT); LinearLayout.LayoutParams.WRAP_CONTENT);
/*Added item Description in form*/ /*Added item Description in form*/
if(!mCatalogueItemShortDescription.isEmpty()) {
TextView shortDescriptionView = new TextView(CatalogueVariableScreen.this);
shortDescriptionView.setPadding(0, 0, 0, (int)getResources().getDimension(R.dimen.normal_margin));
shortDescriptionView.setTypeface(null, Typeface.BOLD);
shortDescriptionView.setMovementMethod(LinkMovementMethod.getInstance());
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
shortDescriptionView.setText(Html.fromHtml(mCatalogueItemShortDescription, Html.FROM_HTML_MODE_LEGACY));
} else {
shortDescriptionView.setText(Html.fromHtml(mCatalogueItemShortDescription));
}
mContainerLayout.addView(shortDescriptionView, childControlViewLayoutParams);
}
if(!mCatalogueItemDescription.isEmpty()) { if(!mCatalogueItemDescription.isEmpty()) {
TextView descriptionView = new TextView(CatalogueVariableScreen.this); TextView descriptionView = new TextView(CatalogueVariableScreen.this);
descriptionView.setMovementMethod(LinkMovementMethod.getInstance());
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) { if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
descriptionView.setText(Html.fromHtml(mCatalogueItemDescription, Html.FROM_HTML_MODE_LEGACY)); descriptionView.setText(Html.fromHtml(mCatalogueItemDescription, Html.FROM_HTML_MODE_LEGACY));
} else { } else {
...@@ -211,87 +227,79 @@ public class CatalogueVariableScreen extends AppCompatActivity { ...@@ -211,87 +227,79 @@ public class CatalogueVariableScreen extends AppCompatActivity {
mContainerLayout.addView(descriptionView, childControlViewLayoutParams); mContainerLayout.addView(descriptionView, childControlViewLayoutParams);
} }
if(mCatalogueVariableList.isEmpty()) { for (int i = 0; i < mCatalogueVariableList.size(); i++) {
mEmptyTextView.setVisibility(View.VISIBLE); CatalogueVariable catalogueVariable = mCatalogueVariableList.get(i);
mMainLayout.setVisibility(View.GONE); ViewType viewType = catalogueVariable.getType();
} else { CatalogueLog.e("viewType: " + viewType + ", Question: "+catalogueVariable.getQuestionText() + ", Order: "+catalogueVariable.getOrder());
mEmptyTextView.setVisibility(View.GONE); if (catalogueVariable.getName() == null) {
mMainLayout.setVisibility(View.VISIBLE); TextView nameNullView = new TextView(CatalogueVariableScreen.this);
nameNullView.setText(R.string.name_null_view_string);
for (int i = 0; i < mCatalogueVariableList.size(); i++) { nameNullView.setBackgroundColor(ContextCompat.getColor(CatalogueVariableScreen.this, R.color.name_null_view_color));
CatalogueVariable catalogueVariable = mCatalogueVariableList.get(i); childLabelViewLayoutParams.topMargin = (int) getResources().getDimension(R.dimen.small_margin);
ViewType viewType = catalogueVariable.getType(); nameNullView.setPadding((int) getResources().getDimension(R.dimen.small_margin),
CatalogueLog.e("viewType: " + viewType + ", Order: "+catalogueVariable.getOrder()); (int) getResources().getDimension(R.dimen.small_margin),
if (catalogueVariable.getName() == null) { (int) getResources().getDimension(R.dimen.small_margin),
TextView nameNullView = new TextView(CatalogueVariableScreen.this); (int) getResources().getDimension(R.dimen.small_margin));
nameNullView.setText(R.string.name_null_view_string); mContainerLayout.addView(nameNullView, childLabelViewLayoutParams);
nameNullView.setBackgroundColor(ContextCompat.getColor(CatalogueVariableScreen.this, R.color.name_null_view_color)); } else if(viewType != ViewType.MACRO && viewType != ViewType.CONTAINER_START && viewType != ViewType.CONTAINER_END && viewType != ViewType.CONTAINER_SPLIT) {
childLabelViewLayoutParams.topMargin = (int) getResources().getDimension(R.dimen.small_margin); /*For MACRO, CONTAINER_START, CONTAINER_END and CONTAINER_SPLIT, there is no need to render any view*/
nameNullView.setPadding((int) getResources().getDimension(R.dimen.small_margin), if (viewType != ViewType.LABEL && viewType != ViewType.CHECK_BOX && viewType != ViewType.BREAK) {
(int) getResources().getDimension(R.dimen.small_margin), /*Create label for every type*/
(int) getResources().getDimension(R.dimen.small_margin), if (!catalogueVariable.isMandatory()) {
(int) getResources().getDimension(R.dimen.small_margin)); TextView label = new TextView(CatalogueVariableScreen.this);
mContainerLayout.addView(nameNullView, childLabelViewLayoutParams); label.setText(catalogueVariable.getQuestionText());
} else if(viewType != ViewType.CONTAINER_START && viewType != ViewType.CONTAINER_END && viewType != ViewType.CONTAINER_SPLIT) { childLabelViewLayoutParams.topMargin = (int) getResources().getDimension(R.dimen.small_margin);
/*For CONTAINER_START, CONTAINER_END and CONTAINER_SPLIT, there is no need to render any view*/ mContainerLayout.addView(label, childLabelViewLayoutParams);
if (viewType != ViewType.LABEL && viewType != ViewType.CHECK_BOX && viewType != ViewType.BREAK) { } else {
/*Create label for every type*/ /*Create label with mandatory value*/
if (!catalogueVariable.isMandatory()) { LinearLayout labelLayout = new LinearLayout(CatalogueVariableScreen.this);
TextView label = new TextView(CatalogueVariableScreen.this); labelLayout.setOrientation(LinearLayout.HORIZONTAL);
label.setText(catalogueVariable.getQuestionText());
childLabelViewLayoutParams.topMargin = (int) getResources().getDimension(R.dimen.small_margin);
mContainerLayout.addView(label, childLabelViewLayoutParams);
} else {
/*Create label with mandatory value*/
LinearLayout labelLayout = new LinearLayout(CatalogueVariableScreen.this);
labelLayout.setOrientation(LinearLayout.HORIZONTAL);
TextView label = new TextView(CatalogueVariableScreen.this); TextView label = new TextView(CatalogueVariableScreen.this);
label.setText(catalogueVariable.getQuestionText()); label.setText(catalogueVariable.getQuestionText());
childLabelViewLayoutParams.topMargin = (int) getResources().getDimension(R.dimen.small_margin); childLabelViewLayoutParams.topMargin = (int) getResources().getDimension(R.dimen.small_margin);
labelLayout.addView(label, childLabelViewLayoutParams); labelLayout.addView(label, childLabelViewLayoutParams);
TextView mandatory = new TextView(CatalogueVariableScreen.this); TextView mandatory = new TextView(CatalogueVariableScreen.this);
mandatory.setText("*"); mandatory.setText("*");
mandatory.setTextColor(ContextCompat.getColor(CatalogueVariableScreen.this, R.color.error_color)); mandatory.setTextColor(ContextCompat.getColor(CatalogueVariableScreen.this, R.color.error_color));
labelLayout.addView(mandatory); labelLayout.addView(mandatory);
mContainerLayout.addView(labelLayout); mContainerLayout.addView(labelLayout);
}
} }
}
View controlView = Util.getView(CatalogueVariableScreen.this, viewType, catalogueVariable); View controlView = Util.getView(CatalogueVariableScreen.this, viewType, catalogueVariable);
if (controlView != null) { if (controlView != null) {
controlView.setTag(new TagObject(i, null)); controlView.setTag(new TagObject(i, null));
if (viewType == ViewType.DATE) { if (viewType == ViewType.DATE) {
controlView.setOnClickListener(dateListener); controlView.setOnClickListener(dateListener);
} else if (viewType == ViewType.DATE_AND_TIME) { } else if (viewType == ViewType.DATE_AND_TIME) {
controlView.setOnClickListener(dateTimeListener); controlView.setOnClickListener(dateTimeListener);
} else if (viewType == ViewType.REFERENCE) { } else if (viewType == ViewType.REFERENCE) {
controlView.setOnTouchListener(referenceListener); controlView.setOnTouchListener(referenceListener);
} }
/*Set bottom margin for custom view*/ /*Set bottom margin for custom view*/
if (viewType != ViewType.BREAK) { if (viewType != ViewType.BREAK) {
mContainerLayout.addView(controlView, childControlViewLayoutParams); mContainerLayout.addView(controlView, childControlViewLayoutParams);
} else } else
mContainerLayout.addView(controlView); mContainerLayout.addView(controlView);
/*Mandatory variable contain error view*/ /*Mandatory variable contain error view*/
if (catalogueVariable.isMandatory()) { if (catalogueVariable.isMandatory()) {
/*Add error view for validation*/ /*Add error view for validation*/
View errorView = getErrorView(); View errorView = getErrorView();
errorView.setTag("error_" + i); errorView.setTag("error_" + i);
mContainerLayout.addView(errorView); mContainerLayout.addView(errorView);
}
} else {
TextView viewNotImplemented = new TextView(CatalogueVariableScreen.this);
viewNotImplemented.setText(String.format(getString(R.string.view_not_implemented_string), viewType.getDisplayString()));
viewNotImplemented.setBackgroundColor(ContextCompat.getColor(CatalogueVariableScreen.this, R.color.view_not_implemented_color));
childLabelViewLayoutParams.topMargin = (int) getResources().getDimension(R.dimen.small_margin);
mContainerLayout.addView(viewNotImplemented, childLabelViewLayoutParams);
} }
} else {
TextView viewNotImplemented = new TextView(CatalogueVariableScreen.this);
viewNotImplemented.setText(String.format(getString(R.string.view_not_implemented_string), viewType.getDisplayString()));
viewNotImplemented.setBackgroundColor(ContextCompat.getColor(CatalogueVariableScreen.this, R.color.view_not_implemented_color));
childLabelViewLayoutParams.topMargin = (int) getResources().getDimension(R.dimen.small_margin);
mContainerLayout.addView(viewNotImplemented, childLabelViewLayoutParams);
} }
} }
} }
...@@ -454,8 +462,10 @@ public class CatalogueVariableScreen extends AppCompatActivity { ...@@ -454,8 +462,10 @@ public class CatalogueVariableScreen extends AppCompatActivity {
}; };
FragmentManager fm = getSupportFragmentManager(); FragmentManager fm = getSupportFragmentManager();
TagObject tagObject = (TagObject)v.getTag(); TagObject tagObject = (TagObject)v.getTag();
String tableName = mCatalogueVariableList.get(tagObject.getIndex()).getReferenceTable(); CatalogueVariable catalogueVariable = mCatalogueVariableList.get(tagObject.getIndex());
SelectReferenceDialog spinnerDialog = SelectReferenceDialog.newInstance(tableName); String tableName = catalogueVariable.getReferenceTable();
String title = catalogueVariable.getQuestionText();
SelectReferenceDialog spinnerDialog = SelectReferenceDialog.newInstance(tableName, title);
spinnerDialog.setListener(listener); spinnerDialog.setListener(listener);
spinnerDialog.show(fm, ""); spinnerDialog.show(fm, "");
return true; return true;
......
app/src/main/java/com/vsoft/uoflservicenow/ui/HomeScreen.java
package com.vsoft.uoflservicenow.ui; package com.vsoft.uoflservicenow.ui;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.widget.GridView; import android.widget.GridView;
...@@ -26,10 +24,8 @@ import butterknife.OnItemClick; ...@@ -26,10 +24,8 @@ import butterknife.OnItemClick;
* Created by Kunj on 11/8/16. * Created by Kunj on 11/8/16.
*/ */
public class HomeScreen extends AppCompatActivity { public class HomeScreen extends AppCompatActivity {
@BindView(R.id.tool_bar_view) @BindView(R.id.tool_bar_view) Toolbar mToolbar;
Toolbar mToolbar; @BindView(R.id.home_screen_grid_view) GridView mGridView;
@BindView(R.id.home_screen_grid_view)
GridView mGridView;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
...@@ -67,42 +63,25 @@ public class HomeScreen extends AppCompatActivity { ...@@ -67,42 +63,25 @@ public class HomeScreen extends AppCompatActivity {
startActivity(new Intent(HomeScreen.this, ReportIncidentScreen.class)); startActivity(new Intent(HomeScreen.this, ReportIncidentScreen.class));
} else { } else {
DialogUtils.showNoConnectionDialog(HomeScreen.this); DialogUtils.showNoConnectionDialog(HomeScreen.this);
// showErrorDialog(R.string.internet_validation_string);
} }
} else if (position == 1) { } else if (position == 1) {
if (networkStatus) { if (networkStatus) {
startActivity(new Intent(HomeScreen.this, CatalogueScreen.class)); startActivity(new Intent(HomeScreen.this, CatalogueScreen.class));
} else { } else {
// showErrorDialog(R.string.internet_validation_string);
DialogUtils.showNoConnectionDialog(HomeScreen.this); DialogUtils.showNoConnectionDialog(HomeScreen.this);
} }
} else if (position == 2) { } else if (position == 2) {
if (networkStatus) { if (networkStatus) {
startActivity(new Intent(HomeScreen.this, MyIncidentScreen.class)); startActivity(new Intent(HomeScreen.this, MyIncidentScreen.class));
} else { } else {
// showErrorDialog(R.string.internet_validation_string);
DialogUtils.showNoConnectionDialog(HomeScreen.this); DialogUtils.showNoConnectionDialog(HomeScreen.this);
} }
} else if (position == 3) { } else if (position == 3) {
if (networkStatus) { if (networkStatus) {
startActivity(new Intent(HomeScreen.this, MyRequestActivity.class)); startActivity(new Intent(HomeScreen.this, MyRequestActivity.class));
} else { } else {
// showErrorDialog(R.string.internet_validation_string);
DialogUtils.showNoConnectionDialog(HomeScreen.this); DialogUtils.showNoConnectionDialog(HomeScreen.this);
} }
} }
} }
// private void showErrorDialog(int message) {
// AlertDialog.Builder builder = new AlertDialog.Builder(this);
// builder.setMessage(message)
// .setCancelable(false)
// .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
// public void onClick(DialogInterface dialog, int id) {
// dialog.dismiss();
// }
// });
// AlertDialog alert = builder.create();
// alert.show();
// }
} }
app/src/main/java/com/vsoft/uoflservicenow/ui/LoginScreen.java
...@@ -141,6 +141,7 @@ public class LoginScreen extends Activity { ...@@ -141,6 +141,7 @@ public class LoginScreen extends Activity {
@OnClick(R.id.login_screen_login_text_view) @OnClick(R.id.login_screen_login_text_view)
void onLoginClicked() { void onLoginClicked() {
//startActivity(new Intent(LoginScreen.this, HomeScreen.class));
callLoginAPI(); callLoginAPI();
} }
...@@ -225,16 +226,4 @@ public class LoginScreen extends Activity { ...@@ -225,16 +226,4 @@ public class LoginScreen extends Activity {
} }
} }
} }
/*private void showErrorDialog(int message) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage(message)
.setCancelable(false)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();
}
});
AlertDialog alert = builder.create();
alert.show();
}*/
} }
app/src/main/java/com/vsoft/uoflservicenow/utils/Constants.java
...@@ -25,7 +25,9 @@ public class Constants { ...@@ -25,7 +25,9 @@ public class Constants {
public static final String DATA_KEY_SYS_ID = "sys_id"; public static final String DATA_KEY_SYS_ID = "sys_id";
public static final String DATA_KEY_CATALOGUE_TITLE = "catalogue_title"; public static final String DATA_KEY_CATALOGUE_TITLE = "catalogue_title";
public static final String DATA_KEY_CATALOGUE_ITEM_DESCRIPTION = "catalogue_item_des"; public static final String DATA_KEY_CATALOGUE_ITEM_DESCRIPTION = "catalogue_item_des";
public static final String DATA_KEY_CATALOGUE_ITEM_SHORT_DESCRIPTION = "catalogue_item_short_des";
public static final String DATA_KEY_REFERENCE_TABLE_NAME = "table_name"; public static final String DATA_KEY_REFERENCE_TABLE_NAME = "table_name";
public static final String DATA_KEY_REFERENCE_TITLE = "title";
/** /**
* Catalogue services post parameters * Catalogue services post parameters
......
app/src/main/java/com/vsoft/uoflservicenow/utils/Util.java
package com.vsoft.uoflservicenow.utils; package com.vsoft.uoflservicenow.utils;
import android.content.Context; import android.content.Context;
import android.net.ConnectivityManager; import android.graphics.Typeface;
import android.net.NetworkInfo;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.text.InputType; import android.text.InputType;
import android.text.method.PasswordTransformationMethod; import android.text.method.PasswordTransformationMethod;
...@@ -111,9 +110,21 @@ public class Util { ...@@ -111,9 +110,21 @@ public class Util {
referenceEditText.setCompoundDrawablesWithIntrinsicBounds(0, 0, android.R.drawable.ic_menu_search, 0); referenceEditText.setCompoundDrawablesWithIntrinsicBounds(0, 0, android.R.drawable.ic_menu_search, 0);
return referenceEditText; return referenceEditText;
case LABEL: case LABEL:
LinearLayout labelLayout = new LinearLayout(context);
labelLayout.setOrientation(LinearLayout.VERTICAL);
TextView labelTextView = new TextView(context); TextView labelTextView = new TextView(context);
labelTextView.setText(catalogueVariable.getQuestionText()); labelTextView.setText(catalogueVariable.getQuestionText());
return labelTextView; labelTextView.setTypeface(null, Typeface.BOLD);
labelLayout.addView(labelTextView);
View view = new View(context);
view.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, 1));
view.setBackgroundColor(ContextCompat.getColor(context, android.R.color.black));
labelLayout.addView(view);
labelLayout.setPadding(0, 0, 0, (int)context.getResources().getDimension(R.dimen.small_margin));
return labelLayout;
case MASKED: case MASKED:
EditText maskedEditText = new EditText(context); EditText maskedEditText = new EditText(context);
maskedEditText.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD); maskedEditText.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD);
...@@ -154,10 +165,10 @@ public class Util { ...@@ -154,10 +165,10 @@ public class Util {
selectBoxSpinner.setAdapter(selectBoxSpinnerArrayAdapter); selectBoxSpinner.setAdapter(selectBoxSpinnerArrayAdapter);
return selectBoxSpinner; return selectBoxSpinner;
case BREAK: case BREAK:
View view = new View(context); View breakView = new View(context);
view.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, 1)); breakView.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, 1));
view.setBackgroundColor(ContextCompat.getColor(context, android.R.color.black)); breakView.setBackgroundColor(ContextCompat.getColor(context, android.R.color.black));
return view; return breakView;
} }
return null; return null;
} }
......
app/src/main/res/drawable/ic_arrow_back_black_24dp.xml deleted 100644 → 0
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="34dp"
android:height="34dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#E41B23"
android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
</vector>
app/src/main/res/drawable/ic_chevron_left_black_24dp.xml deleted 100644 → 0
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="35dp"
android:height="45dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF0000"
android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>
</vector>
app/src/main/res/drawable/login_layout_bg.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_login_layout_bg"/>
<item>
<shape
android:shape="line">
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable/username_under_bg_box.xml
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
> >
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<stroke android:width="1dp" android:color="#e51b23"/> <stroke android:width="1dp" android:color="#e51b23"/>
<solid android:color="@android:color/transparent"/>
</shape> </shape>
</item> </item>
</layer-list> </layer-list>
\ No newline at end of file
app/src/main/res/layout/activity_login.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/login_scroll"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_gravity="center" android:scrollbarStyle="insideOverlay">
android:background="#FFF"
android:gravity="center" <LinearLayout
android:orientation="vertical">
<ScrollView
android:id="@+id/login_scroll"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:scrollbarStyle="insideOverlay" android:gravity="center"
android:animateLayoutChanges="true"> android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ic_login_banner" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:gravity="center" android:background="@drawable/ic_login_layout_bg"
android:orientation="vertical"> android:orientation="vertical">
<ImageView
<EditText
android:id="@+id/login_screen_username_edit_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/ic_login_banner" /> android:layout_marginLeft="20dp"
<LinearLayout android:layout_marginRight="20dp"
android:background="@drawable/username_under_bg_box"
android:drawableLeft="@mipmap/ic_user_icon"
android:hint="Username"
android:padding="@dimen/normal_margin"
android:singleLine="true"
android:lines="1"/>
<EditText
android:id="@+id/login_screen_password_edit_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/ic_login_layout_bg" android:layout_marginLeft="@dimen/extra_large_margin"
android:orientation="vertical"> android:layout_marginRight="@dimen/extra_large_margin"
<EditText android:background="@drawable/username_under_bg_box"
android:id="@+id/login_screen_username_edit_text" android:drawableLeft="@mipmap/ic_password_icon"
android:layout_width="match_parent" android:hint="Password"
android:layout_height="wrap_content" android:inputType="textPassword"
android:background="@drawable/username_under_bg_box" android:padding="@dimen/normal_margin"
android:hint="Username" android:singleLine="true"
android:layout_marginLeft="20dp" android:lines="1"/>
android:layout_marginRight="20dp"
android:padding="10dp"
android:drawableLeft="@mipmap/ic_user_icon"
android:singleLine="true" />
<EditText
android:id="@+id/login_screen_password_edit_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/username_under_bg_box"
android:hint="Password"
android:drawableLeft="@mipmap/ic_password_icon"
android:inputType="textPassword"
android:padding="10dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:singleLine="true" />
<TextView <TextView
android:id="@+id/login_screen_login_text_view" android:id="@+id/login_screen_login_text_view"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -81,5 +81,4 @@ ...@@ -81,5 +81,4 @@
/> />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</LinearLayout> \ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/catalogue_variable_screen.xml
...@@ -19,82 +19,68 @@ ...@@ -19,82 +19,68 @@
app:contentInsetRight="0dp" app:contentInsetRight="0dp"
app:contentInsetStart="0dp" /> app:contentInsetStart="0dp" />
<FrameLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:background="@color/screen_bg_color"
android:orientation="vertical"
android:padding="@dimen/normal_margin">
<TextView <ScrollView
android:id="@+id/variable_screen_empty_text_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:background="@android:color/white"
android:text="@string/no_variables_string" android:requiresFadingEdge="vertical">
android:textSize="@dimen/extra_normal_text_size" />
<LinearLayout <LinearLayout
android:id="@+id/variable_screen_main_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/screen_bg_color"
android:orientation="vertical"
android:padding="@dimen/normal_margin"
android:visibility="gone">
<ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:background="@android:color/white" android:background="@android:color/white"
android:requiresFadingEdge="vertical"> android:orientation="vertical"
android:padding="@dimen/normal_margin">
<LinearLayout <LinearLayout
android:id="@+id/variable_screen_container_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/white" android:orientation="vertical" />
android:orientation="vertical"
android:padding="@dimen/normal_margin">
<LinearLayout <RelativeLayout
android:id="@+id/variable_screen_container_layout" android:id="@+id/variable_screen_bottom_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" /> android:gravity="center_vertical"
android:visibility="gone">
<RelativeLayout <TextView
android:id="@+id/variable_screen_bottom_layout" android:id="@+id/variable_screen_submit_text_view"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical"> android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/normal_margin"
android:background="@drawable/submit_button_bg_with_border"
android:paddingBottom="@dimen/normal_margin"
android:paddingLeft="@dimen/large_margin"
android:paddingRight="@dimen/large_margin"
android:paddingTop="@dimen/normal_margin"
android:text="@string/submit_string"
android:textColor="@android:color/white" />
<TextView <TextView
android:id="@+id/variable_screen_submit_text_view" android:id="@+id/variable_screen_back_text_view"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_marginRight="@dimen/normal_margin"
android:layout_marginRight="@dimen/normal_margin" android:layout_toLeftOf="@id/variable_screen_submit_text_view"
android:background="@drawable/submit_button_bg_with_border" android:background="@drawable/back_button_bg_with_border"
android:paddingBottom="@dimen/normal_margin" android:paddingBottom="@dimen/normal_margin"
android:paddingLeft="@dimen/large_margin" android:paddingLeft="@dimen/large_margin"
android:paddingRight="@dimen/large_margin" android:paddingRight="@dimen/large_margin"
android:paddingTop="@dimen/normal_margin" android:paddingTop="@dimen/normal_margin"
android:text="@string/submit_string" android:text="@string/back_string"
android:textColor="@android:color/white" /> android:textColor="@android:color/white" />
</RelativeLayout>
<TextView </LinearLayout>
android:id="@+id/variable_screen_back_text_view" </ScrollView>
android:layout_width="wrap_content" </LinearLayout>
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/normal_margin"
android:layout_toLeftOf="@id/variable_screen_submit_text_view"
android:background="@drawable/back_button_bg_with_border"
android:paddingBottom="@dimen/normal_margin"
android:paddingLeft="@dimen/large_margin"
android:paddingRight="@dimen/large_margin"
android:paddingTop="@dimen/normal_margin"
android:text="@string/back_string"
android:textColor="@android:color/white" />
</RelativeLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>
</FrameLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
app/src/main/res/layout/custom_dialog.xml
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
android:layout_gravity="center" android:layout_gravity="center"
android:paddingBottom="@dimen/normal_margin" android:paddingBottom="@dimen/normal_margin"
android:paddingTop="@dimen/normal_margin" android:paddingTop="@dimen/normal_margin"
android:text="@string/search_for_reference_string"
android:textSize="@dimen/large_text_size"/> android:textSize="@dimen/large_text_size"/>
<View <View
......
app/src/main/res/layout/dummy_layout.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<ScrollView
android:id="@+id/login_scroll"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbarStyle="insideOverlay"
android:animateLayoutChanges="true"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="bottom"
android:layout_margin="@dimen/normal_margin"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_extra_large_margin">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#fff"
android:orientation="vertical"
>
<EditText
android:id="@+id/login_screen_username_edit_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/normal_margin"
android:layout_marginRight="@dimen/normal_margin"
android:layout_marginTop="@dimen/activity_normal_top_margin"
android:background="@drawable/username_under_bg_box"
android:padding="@dimen/normal_margin"
android:singleLine="true" />
<EditText
android:id="@+id/login_screen_password_edit_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/normal_margin"
android:background="@drawable/username_under_bg_box"
android:inputType="textPassword"
android:padding="@dimen/normal_margin"
android:singleLine="true" />
<Button
android:id="@+id/login_screen_login_text_view"
android:layout_width="@dimen/activity_save_button_width"
android:layout_height="@dimen/activity_save_button_height"
android:layout_gravity="left"
android:layout_marginBottom="@dimen/activity_normal_top_margin"
android:layout_marginLeft="@dimen/normal_margin"
android:layout_marginTop="@dimen/normal_margin"
android:background="@drawable/login_bg"
android:padding="@dimen/normal_margin"
android:textAllCaps="false"
android:text="@string/login_screen_login_string"
android:textColor="@android:color/white"
/>
</LinearLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/home_screen.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:orientation="vertical" android:layout_height="match_parent"
android:layout_height="match_parent"> android:orientation="vertical">
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:id="@+id/tool_bar_view" android:id="@+id/tool_bar_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white" android:background="@android:color/white"
android:minHeight="?attr/actionBarSize" android:minHeight="?attr/actionBarSize"
app:titleTextColor="@color/tool_bar_title_color"> app:titleTextColor="@color/tool_bar_title_color">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"> android:layout_alignParentLeft="true">
<ImageView <ImageView
android:id="@+id/nav_back" android:id="@+id/nav_back"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:src="@mipmap/ic_home_icon"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
/> android:layout_centerVertical="true"
android:src="@mipmap/ic_home_icon" />
<TextView <TextView
style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title" style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -35,15 +37,16 @@ ...@@ -35,15 +37,16 @@
</RelativeLayout> </RelativeLayout>
</android.support.v7.widget.Toolbar> </android.support.v7.widget.Toolbar>
<GridView <GridView
android:id="@+id/home_screen_grid_view" android:id="@+id/home_screen_grid_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:verticalSpacing="@dimen/large_margin" android:background="@color/home_screen_bg_color"
android:horizontalSpacing="@dimen/large_margin" android:horizontalSpacing="@dimen/large_margin"
android:stretchMode="columnWidth" android:numColumns="2"
android:padding="@dimen/large_margin" android:padding="@dimen/large_margin"
android:background="@color/home_screen_bg_color" android:stretchMode="columnWidth"
android:numColumns="2"/> android:verticalSpacing="@dimen/large_margin" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
app/src/main/res/layout/request_list_screen.xml
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="0dp" android:layout_margin="0dp"
android:background="@color/white" android:background="@android:color/white"
android:minHeight="?attr/actionBarSize" android:minHeight="?attr/actionBarSize"
android:padding="0dp" android:padding="0dp"
app:contentInsetEnd="0dp" app:contentInsetEnd="0dp"
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="10dp" android:layout_margin="10dp"
android:background="@color/white" android:background="@android:color/white"
android:divider="#8e8e8e" android:divider="#8e8e8e"
android:dividerHeight="0.5dp" android:dividerHeight="0.5dp"
android:padding="10dp" android:padding="10dp"
......
app/src/main/res/layout/toolbar.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.Toolbar
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/tool_bar_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:minHeight="?attr/actionBarSize"
app:titleTextColor="@color/tool_bar_title_color">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true">
<ImageView
android:id="@+id/nav_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:src="@drawable/ic_arrow_back_black_24dp"
android:layout_alignParentLeft="true"
/>
<TextView
style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_centerVertical="true"
android:text="@string/my_reques_string"
android:textColor="@color/tool_bar_title_color" />
</RelativeLayout>
</android.support.v7.widget.Toolbar>
\ No newline at end of file
app/src/main/res/values/dimen.xml
...@@ -19,76 +19,20 @@ ...@@ -19,76 +19,20 @@
<dimen name="list_item_height">100dp</dimen> <dimen name="list_item_height">100dp</dimen>
<!--Login Screen-->
<dimen name="login_screen_margin_left">30dp</dimen>
<dimen name="login_screen_margin_right">30dp</dimen>
<dimen name="login_screen_login_bottom">15dp</dimen>
<dimen name="login_screen_layout_margin_left">20dp</dimen>
<dimen name="login_screen_layout_margin_right">20dp</dimen>
<dimen name="login_screen_layout_margin_bottom">35dp</dimen>
<dimen name="login_screen_layout_margin_top">10dp</dimen>
<!--Spinner Item height-->
<dimen name="spinner_item_height">40dp</dimen>
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="fab_margin">16dp</dimen>
<dimen name="border_line_width">1dp</dimen>
<dimen name="text_view_height">48dp</dimen>
<dimen name="edit_text_view_height">36dp</dimen>
<dimen name="edit_text_view_large_height">64dp</dimen>
<!--Margins--> <!--Margins-->
<dimen name="small_margin">5dp</dimen> <dimen name="small_margin">5dp</dimen>
<dimen name="normal_margin">10dp</dimen> <dimen name="normal_margin">10dp</dimen>
<dimen name="large_margin">15dp</dimen> <dimen name="large_margin">15dp</dimen>
<dimen name="extra_large_margin">20dp</dimen> <dimen name="extra_large_margin">20dp</dimen>
<dimen name="elevation_margin">4dp</dimen>
<!--Text size--> <!--Text size-->
<dimen name="below_normal_text_size">14sp</dimen>
<dimen name="ruquest_status_text_size">15sp</dimen> <dimen name="ruquest_status_text_size">15sp</dimen>
<dimen name="ruquest_descps_text_size">18sp</dimen> <dimen name="ruquest_descps_text_size">18sp</dimen>
<!--Add New Expense-->
<dimen name="attach_screen_image_size">100dp</dimen>
<dimen name="pragress_bar_padding_size">13dp</dimen>
<!-- Login Activity-->
<dimen name="activity_scroll_large_margin">20dp</dimen>
<dimen name="activity_scroll_normal_margin">12dp</dimen>
<dimen name="activity_padding_normal_margin">12dp</dimen>
<dimen name="activity_normal_top_margin">30dp</dimen>
<dimen name="activity_extra_large_margin">30dp</dimen>
<dimen name="activity_save_button_width">105dp</dimen>
<dimen name="activity_save_button_height">40dp</dimen>
<!-- MyRequest Activity--> <!-- MyRequest Activity-->
<dimen name="my_request_top">15dp</dimen> <dimen name="my_request_top">15dp</dimen>
<dimen name="my_request_left">15dp</dimen> <dimen name="my_request_left">15dp</dimen>
<dimen name="my_request_right">10dp</dimen> <dimen name="my_request_right">10dp</dimen>
<dimen name="my_request_bottom">15dp</dimen>
<dimen name="my_request_new_top">18dp</dimen> <dimen name="my_request_new_top">18dp</dimen>
<dimen name="my_request_text_bottom">2dp</dimen> <dimen name="my_request_text_bottom">2dp</dimen>
<!--Alert Popup-->
<dimen name="custom_layout_height">170dp</dimen>
<dimen name="custom_alert_title_height">45dp</dimen>
<dimen name="expense_details_edit_button_width">40dp</dimen>
<dimen name="expense_details_edit_button_height">40dp</dimen>
<dimen name="small_padding_size">7sp</dimen>
<dimen name="expense_details_refresh_button_width">40dp</dimen>
<dimen name="expense_details_refresh_button_height">40dp</dimen>
=======
<!--My Request screen-->
<dimen name="my_request_approval_image_height">15dp</dimen>
<dimen name="my_request_approval_image_width">15dp</dimen>
>>>>>>> 32b7d4f976a19b786b41f856760d0e25b09812f8
</resources> </resources>
\ No newline at end of file
app/src/main/res/values/strings.xml
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
<string name="name_null_view_string">Not rendering (name not available)</string> <string name="name_null_view_string">Not rendering (name not available)</string>
<string name="view_not_implemented_string">Not Implemented: %s</string> <string name="view_not_implemented_string">Not Implemented: %s</string>
<string name="no_variables_string">No Variables&#8230;</string>
<string name="approved">Approved</string> <string name="approved">Approved</string>
<string name="notrequest">Not Yet Requested</string> <string name="notrequest">Not Yet Requested</string>
...@@ -40,11 +39,11 @@ ...@@ -40,11 +39,11 @@
<string name="failed_to_fetch_incident_string">Failed to fetch Incident.</string> <string name="failed_to_fetch_incident_string">Failed to fetch Incident.</string>
<!--Login Screen--> <!--Login Screen-->
<string name="login_screen_user_name_string">Username</string>
<string name="login_screen_password_string">Password</string>
<string name="login_screen_login_string">Login</string> <string name="login_screen_login_string">Login</string>
<string name="variable_form_misc_info_string">%1$s [add %2$s]</string> <!--Variable Screen-->
<string name="variable_form_misc_info_string">%1$s [add %2$s]</string>
<string name="variable_form_reference_dialog_title_string">Search \'%s\'</string>
<!--Catalogue Item Screen--> <!--Catalogue Item Screen-->
<string name="no_catalogue_item_string">No Catalogue Items&#8230;</string> <string name="no_catalogue_item_string">No Catalogue Items&#8230;</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment