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

fixed some file inconsistencies

Browse source
This commit is contained in:
Batuhan Berk Başoğlu 2018-10-05 11:40:22 -04:00
commit bcfa204f44
13 changed files with 108 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OlympusServices/app/build.gradle
View file

@ -26,4 +26,8 @@ dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
implementation 'com.jaredrummler:material-spinner:1.2.5'
implementation 'com.android.support:design:28.0.0-alpha3'
implementation 'com.rengwuxian.materialedittext:library:2.1.4'
}

9
OlympusServices/app/src/main/AndroidManifest.xml
View file

@ -14,6 +14,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".Main"
android:label="@string/app_name">
@ -28,7 +29,13 @@
android:name="preloaded_fonts"
android:resource="@array/preloaded_fonts" />
<activity android:name=".SignUp"></activity>
<activity android:name=".SignUp" android:parentActivityName=".Main">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".Main" />
</activity>
<activity android:name=".LogIn" />
<activity android:name=".Welcome"/>
</application>
</manifest>

4
OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Main.java
View file

@ -2,6 +2,8 @@ package com.uottawa.olympus.olympusservices;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.content.Intent;
import android.view.View;
public class Main extends AppCompatActivity {
@ -9,5 +11,7 @@ public class Main extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
}
}

11
OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java
View file

@ -2,13 +2,22 @@ package com.uottawa.olympus.olympusservices;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import com.jaredrummler.materialspinner.MaterialSpinner;
import android.support.design.widget.Snackbar;
public class SignUp extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_sign_up);
MaterialSpinner spinner = findViewById(R.id.RoleInput);
spinner.setItems("Ice Cream Sandwich", "Jelly Bean", "KitKat", "Lollipop", "Marshmallow");
spinner.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
@Override public void onItemSelected(MaterialSpinner view, int position, long id, String item) {
Snackbar.make(view, "Clicked " + item, Snackbar.LENGTH_LONG).show();
}
});
}
public static void main(String[] args){

BIN
OlympusServices/app/src/main/res/drawable/background.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.1 MiB

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

@ -16,16 +16,17 @@
<TextView
android:id="@+id/Title"
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_height="wrap_content"
android:layout_marginBottom="100dp"
android:gravity="center"
android:text="@string/CompanyName"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="36sp"
android:gravity="center"
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"
@ -33,6 +34,7 @@
android:text="@string/signup" />
<Button
android:theme="@style/AppTheme.Button"
android:id="@+id/LogIn"
android:layout_width="match_parent"
android:layout_height="wrap_content"

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

@ -17,7 +17,7 @@
android:id="@+id/Title"
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_marginBottom="80dp"
android:layout_marginBottom="40dp"
android:gravity="center"
android:text="@string/signup"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
@ -25,52 +25,70 @@
android:textSize="36sp"
app:fontFamily="@font/julius_sans_one" />
<Spinner
android:id="@+id/RolesInput"
<TextView
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="72dp"
android:layout_marginBottom="50dp"
android:background="@drawable/customborder"
android:entries="@array/roles"
android:textColor="@android:color/white"
android:textSize="15sp"
android:theme="@android:style/TextAppearance.DeviceDefault.Widget.DropDownItem"
tools:layout_editor_absoluteX="0dp"
tools:layout_editor_absoluteY="108dp" />
android:layout_height="wrap_content"
android:text="Role"
android:textColor="#6d81a5"
android:textSize="20sp" />
<android.support.design.widget.TextInputLayout
<com.jaredrummler.materialspinner.MaterialSpinner
android:id="@+id/RoleInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="15dp" />
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/UsernameInput"
android:layout_width="match_parent"
android:layout_height="81dp"
android:layout_marginBottom="50dp"
android:background="@drawable/customborder"
android:theme="@android:style/TextAppearance.DeviceDefault.Widget.EditText">
<android.support.design.widget.TextInputEditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/newusername"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="20sp" />
android:background="@color/colorWhite"
android:hint="Username"
android:textSize="20sp"
app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight"
app:met_primaryColor="?colorAccent"
app:met_singleLineEllipsis="true" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/PasswordInput"
android:layout_width="match_parent"
android:layout_height="95dp"
android:background="@drawable/customborder"
android:theme="@android:style/TextAppearance.Holo.Widget.EditText">
android:layout_height="wrap_content"
android:hint="Password"
android:textSize="20sp"
app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight"
app:met_primaryColor="?colorAccent"
app:met_singleLineEllipsis="true"
android:background="@drawable/customborder"/>
<android.support.design.widget.TextInputEditText
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/FirstNameInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint=""
android:text="@string/newpassword"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="20sp" />
</android.support.design.widget.TextInputLayout>
android:hint="First Name"
android:textSize="20sp"
app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight"
app:met_primaryColor="?colorAccent"
app:met_singleLineEllipsis="true"
android:background="@drawable/customborder"/>
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/LastNameInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Last Name"
android:textSize="20sp"
app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight"
app:met_primaryColor="?colorAccent"
app:met_singleLineEllipsis="true"
android:background="@drawable/customborder"/>
</LinearLayout>

11
OlympusServices/app/src/main/res/layout/customspinner.xml
View file

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="20sp"
android:gravity="left"
android:textColor="#FF0000"
android:padding="5dip"
/>

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

@ -3,4 +3,6 @@
<color name="colorPrimary">#3F51B5</color>
<color name="colorPrimaryDark">#303F9F</color>
<color name="colorAccent">#FF4081</color>
<color name="colorWhite">#FFFFFF</color>
<color name="colorBlack">#000000</color>
</resources>

5
OlympusServices/app/src/main/res/values/styles.xml
View file

@ -8,4 +8,9 @@
<item name="colorAccent">@color/colorAccent</item>
</style>
<style name="AppTheme.Button" parent="Widget.AppCompat.Button.Colored">
<item name="colorButtonNormal">@color/colorWhite</item>
<item name="android:textColor">@color/colorBlack</item>
</style>
</resources>

9
OlympusServices/build.gradle
View file

@ -7,7 +7,16 @@ buildscript {
jcenter()
}
dependencies {
<<<<<<< HEAD
classpath 'com.android.tools.build:gradle:3.2.0'
=======
<<<<<<< HEAD
classpath 'com.android.tools.build:gradle:3.2.0'
=======
classpath 'com.android.tools.build:gradle:3.1.4'
>>>>>>> 0e3ca9a99ca712d5307384360c5dd5be9aeac57a
>>>>>>> refs/remotes/origin/master
// NOTE: Do not place your application dependencies here; they belong

4
OlympusServices/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,4 +1,8 @@
<<<<<<< HEAD
#Fri Oct 05 11:36:36 EDT 2018
=======
#Fri Oct 05 10:21:14 EDT 2018
>>>>>>> refs/remotes/origin/master
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

BIN
~$L Class Diagram.docx Normal file
View file

Binary file not shown.