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

Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus

Browse source 
# Conflicts:
#	OlympusServices/app/src/main/res/layout/activity_log_in.xml
This commit is contained in:
IvanaE 2018-10-18 11:36:47 -04:00
commit 7b90d4b807
6 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,8 +31,8 @@
android:layout_width="match_parent"
android:layout_height="80dp"
android:background="@color/colorWhite"
android:hint="Username"
android:textSize="15sp"
android:hint="@string/username"
android:layout_marginTop="40dp"
app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight"
@ -45,8 +45,8 @@
android:layout_width="match_parent"
android:layout_height="80dp"
android:background="@drawable/customborder"
android:hint="Password"
android:textSize="15sp"
android:hint="@string/password"
android:layout_marginTop="20dp"
app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight"

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

@ -19,6 +19,8 @@
<string name="login">Log In</string>
<string name="newusername">Enter Username</string>
<string name="newpassword">Enter Password</string>
<string name="password">Password</string>
<string name="username">Username</string>
<string-array name="roles">
<item>Admin</item>
<item>User</item>