batuhan-basoglu/SEG2105-Olympus-Android-Application
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

layout fixes

Browse source
This commit is contained in:
IvanaE 2018-11-13 22:29:17 -05:00
parent 94b333ded9
commit 3155b66a7e
4 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/DeleteServiceDialogFragment.java
View file

@ -40,7 +40,7 @@ public class DeleteServiceDialogFragment extends DialogFragment{
// Pass null as the parent view because its going in the dialog layout // Pass null as the parent view because its going in the dialog layout
builder.setView(inflater.inflate(R.layout.dialog_service_delete, null)) builder.setView(inflater.inflate(R.layout.dialog_service_delete, null))
// Add action buttons // Add action buttons
.setPositiveButton(R.string.delete, new DialogInterface.OnClickListener() { .setPositiveButton(R.string.remove, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
Bundle args = new Bundle(); Bundle args = new Bundle();

10
OlympusServices/app/src/main/res/layout/activity_log_in.xml
View file

@ -12,6 +12,13 @@
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:background="@drawable/background" android:background="@drawable/background"
tools:context=".LogIn"> tools:context=".LogIn">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView <TextView
android:id="@+id/Title" android:id="@+id/Title"
@ -66,7 +73,8 @@
android:onClick="onClickLogIn" android:onClick="onClickLogIn"
android:text="@string/login" android:text="@string/login"
android:theme="@style/AppTheme.Button" /> android:theme="@style/AppTheme.Button" />
</LinearLayout>
</ScrollView>

4
OlympusServices/app/src/main/res/layout/dialog_service_delete.xml
View file

@ -11,12 +11,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:layout_weight="1" android:layout_weight="1"
android:text="Are you sure you want to delete this service?" android:text="Are you sure you want to remove this service from your account?"
android:textAppearance="@style/TextAppearance.AppCompat.Large" android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textSize="15sp" android:textSize="15sp"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginRight="20dp" android:layout_marginRight="40dp"
/> />

1
OlympusServices/app/src/main/res/values/strings.xml
View file

@ -27,6 +27,7 @@
<string name="cancel">Cancel</string> <string name="cancel">Cancel</string>
<string name="update">Update</string> <string name="update">Update</string>
<string name="delete">Delete</string> <string name="delete">Delete</string>
<string name="remove">Remove</string>
<string name="add">Add</string> <string name="add">Add</string>
<string-array name="roles"> <string-array name="roles">
<item>Admin</item> <item>Admin</item>