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

Merge branch 'lBranch'

Browse source 
# Conflicts:
#	OlympusServices/.idea/caches/build_file_checksums.ser
#	OlympusServices/.idea/vcs.xml
#	OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java
#	OlympusServices/app/src/main/res/layout/activity_main.xml
#	OlympusServices/app/src/main/res/layout/activity_sign_up.xml
#	OlympusServices/build.gradle
This commit is contained in:
IvanaE 2018-10-19 19:02:28 -04:00
commit d740cf72d3
15 changed files with 142 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -57,15 +57,14 @@
android:textCursorDrawable="@color/colorWhite"/>
<Button
android:theme="@style/AppTheme.Button"
android:id="@+id/LogIn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/login"
android:layout_marginTop="40dp"
/>
android:onClick="onClickLogIn"
android:text="@string/login"
android:theme="@style/AppTheme.Button" />

8
OlympusServices/app/src/main/res/layout/activity_main.xml
View file

@ -26,20 +26,20 @@
app:fontFamily="@font/julius_sans_one" />
<Button
android:theme="@style/AppTheme.Button"
android:id="@+id/SignUp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="50dp"
android:onClick="onClickSignUp"
android:text="@string/signup"
android:onClick="SignUp"/>
android:theme="@style/AppTheme.Button" />
<Button
android:theme="@style/AppTheme.Button"
android:id="@+id/LogIn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="onClickLogIn"
android:text="@string/login"
android:onClick="LogIn"/>
android:theme="@style/AppTheme.Button" />
</LinearLayout>

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

@ -98,15 +98,11 @@
android:textCursorDrawable="@color/colorWhite"/>
<Button
android:theme="@style/AppTheme.Button"
android:id="@+id/SignUp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/signup"/>
android:onClick="onClickSignUp"
android:text="@string/signup"
android:theme="@style/AppTheme.Button" />
</LinearLayout>