diff --git a/.idea/modules.xml b/.idea/modules.xml index bd7572b..85d26f1 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -5,7 +5,6 @@ - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 35eb1dd..8306744 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a5465e2..6b88d1a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -28,7 +28,8 @@ - + + diff --git a/app/src/main/java/com/example/ludio/zetbio/MainActivity.java b/app/src/main/java/com/example/ludio/zetbio/MainActivity.java index 41b9cb6..786e037 100644 --- a/app/src/main/java/com/example/ludio/zetbio/MainActivity.java +++ b/app/src/main/java/com/example/ludio/zetbio/MainActivity.java @@ -1,13 +1,11 @@ package com.example.ludio.zetbio; import android.content.Intent; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.Button; import android.widget.EditText; -import android.widget.TextView; -import android.widget.Toast; public class MainActivity extends AppCompatActivity { private EditText idInput; @@ -20,7 +18,7 @@ public class MainActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - startActivity(new Intent(this, SplashActivity.class)); + startActivity(new Intent(this, Splashscreen.class)); setContentView(R.layout.login_view); initialize(); loginButton.setOnClickListener(new LoginButtonListener()); diff --git a/app/src/main/java/com/example/ludio/zetbio/MainViewActivity.java b/app/src/main/java/com/example/ludio/zetbio/MainViewActivity.java index 94b398a..defd15d 100644 --- a/app/src/main/java/com/example/ludio/zetbio/MainViewActivity.java +++ b/app/src/main/java/com/example/ludio/zetbio/MainViewActivity.java @@ -4,7 +4,6 @@ import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; -import android.text.Layout; import android.view.View; import android.widget.LinearLayout; @@ -27,7 +26,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { testResultView.setOnClickListener(new testResultListener()); setUpView.setOnClickListener(new setUpListener()); - + informationView.setOnClickListener(new C_informationView()); } @@ -54,4 +53,12 @@ public void onClick(View view) { } } + private class C_informationView implements View.OnClickListener{ + @Override + public void onClick(View view) { + Intent intent = new Intent(MainViewActivity.this, FindInformation.class); + MainViewActivity.this.startActivity(intent); + } + } + } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 201dd4f..a64d68c 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -12,8 +12,9 @@ android:id="@+id/linearLayout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentStart="true" - android:orientation="horizontal"> + android:orientation="horizontal" + android:layout_alignParentTop="true" + android:layout_alignParentStart="true"> + android:orientation="vertical" + > - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 38c4cd3..60e9c58 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -6,7 +6,7 @@ #2389c6 #ffffff #CCCCCC - #666666 + #cacaca #c1272d #000000