diff --git a/app/MyHyvesBookPlusStagram/app/build.gradle b/app/MyHyvesBookPlusStagram/app/build.gradle index 1a05b0f..dadf17f 100644 --- a/app/MyHyvesBookPlusStagram/app/build.gradle +++ b/app/MyHyvesBookPlusStagram/app/build.gradle @@ -30,6 +30,7 @@ dependencies { compile 'com.google.firebase:firebase-auth:10.0.1' compile 'com.android.support.constraint:constraint-layout:1.0.2' compile 'com.android.support:support-v4:25.3.1' + compile 'com.google.firebase:firebase-storage:10.0.1' testCompile 'junit:junit:4.12' } @@ -42,4 +43,5 @@ dependencies { + apply plugin: 'com.google.gms.google-services' \ No newline at end of file diff --git a/app/MyHyvesBookPlusStagram/app/google-services.json b/app/MyHyvesBookPlusStagram/app/google-services.json index 613b5e0..1463794 100644 --- a/app/MyHyvesBookPlusStagram/app/google-services.json +++ b/app/MyHyvesBookPlusStagram/app/google-services.json @@ -14,6 +14,14 @@ } }, "oauth_client": [ + { + "client_id": "1078950034345-k3mcuf1bkf9ehg7vi09cp16lcdrrpf3a.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "nl.myhyvesbookplus.tagram", + "certificate_hash": "02b894113a27cc0c4b6025a382c826477fc8543a" + } + }, { "client_id": "1078950034345-dmsbu0066sfqgqthn2mldlauvdef98u9.apps.googleusercontent.com", "client_type": 3 @@ -29,8 +37,13 @@ "status": 1 }, "appinvite_service": { - "status": 1, - "other_platform_oauth_client": [] + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "1078950034345-dmsbu0066sfqgqthn2mldlauvdef98u9.apps.googleusercontent.com", + "client_type": 3 + } + ] }, "ads_service": { "status": 2 diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/LoginActivity.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/LoginActivity.java index 1adf687..c1f417d 100644 --- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/LoginActivity.java +++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/LoginActivity.java @@ -1,6 +1,7 @@ package nl.myhyvesbookplus.tagram; import android.content.Intent; +import android.os.PersistableBundle; import android.support.annotation.NonNull; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; @@ -18,7 +19,7 @@ import com.google.firebase.auth.FirebaseAuth; import com.google.firebase.auth.FirebaseUser; import com.google.firebase.auth.UserProfileChangeRequest; -public class LoginActivity extends AppCompatActivity { +public class LoginActivity extends AppCompatActivity implements View.OnClickListener { public static final String TAG = "Login"; /// Views /// @@ -38,6 +39,7 @@ public class LoginActivity extends AppCompatActivity { mAuth = FirebaseAuth.getInstance(); findViews(); + bindOnClick(); } @Override @@ -63,14 +65,42 @@ public class LoginActivity extends AppCompatActivity { emailField = (EditText) findViewById(R.id.email); } + protected void bindOnClick() { + registerButton.setOnClickListener(this); + backToLoginButton.setOnClickListener(this); + goToRegisterButton.setOnClickListener(this); + logInButton.setOnClickListener(this); + } + /// OnClick /// /** - * Performs the logon action. + * Called when a view has been clicked. * - * @param view + * @param v The view that was clicked. */ - public void logInOnClick(View view) { + @Override + public void onClick(View v) { + switch (v.getId()) { + case R.id.register_button: + registerOnClick(); + break; + case R.id.go_to_register_button: + goToRegisterOnClick(); + break; + case R.id.login_button: + logInOnClick(); + break; + case R.id.back_to_login_button: + backToLoginOnClick(); + break; + } + } + + /** + * Performs the logon action. + */ + public void logInOnClick() { String emailSting = emailField.getText().toString(); String passwordSting = passwordField.getText().toString(); @@ -79,9 +109,8 @@ public class LoginActivity extends AppCompatActivity { /** * Performs the register action. - * @param view */ - public void registerOnClick(View view) { + public void registerOnClick() { Log.d(TAG, "registerOnClick: "); if (passwordField.getText().toString().equals(passwordConfirmField.getText().toString())) { @@ -98,9 +127,8 @@ public class LoginActivity extends AppCompatActivity { /** * Changes the Activity for registering. - * @param view */ - public void goToRegisterOnClick(View view) { + public void goToRegisterOnClick() { passwordConfirmField.setVisibility(View.VISIBLE); passwordConfirmLabel.setVisibility(View.VISIBLE); registerButton.setVisibility(View.VISIBLE); @@ -114,9 +142,8 @@ public class LoginActivity extends AppCompatActivity { /** * Changes the Activity for logging in. - * @param view */ - public void backToLoginOnClick(View view) { + public void backToLoginOnClick() { passwordConfirmField.setVisibility(View.GONE); passwordConfirmLabel.setVisibility(View.GONE); registerButton.setVisibility(View.GONE); diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_account_box_black_24dp.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_account_box_black_24dp.xml new file mode 100644 index 0000000..4f7894b --- /dev/null +++ b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_account_box_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_photo_camera_black_24dp.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_photo_camera_black_24dp.xml new file mode 100644 index 0000000..a1a55a5 --- /dev/null +++ b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/ic_photo_camera_black_24dp.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/logo_new.png b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/logo_new.png new file mode 100644 index 0000000..ee17d38 Binary files /dev/null and b/app/MyHyvesBookPlusStagram/app/src/main/res/drawable/logo_new.png differ diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/activity_login.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/activity_login.xml index eed0725..ccc5b0c 100644 --- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/activity_login.xml +++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/activity_login.xml @@ -16,9 +16,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:adjustViewBounds="true" + android:contentDescription="@string/logo_text" android:cropToPadding="false" - android:padding="16dp" - android:src="@drawable/logo" /> + android:paddingEnd="@dimen/activity_horizontal_margin" + android:paddingStart="@dimen/activity_horizontal_margin" + android:src="@drawable/logo_new" />