Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deploy #1

Open
wants to merge 4 commits into
base: deploy
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,18 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
<activity android:name=".MainActivity"></activity>
<activity
android:name=".SplashActivity"
android:theme="@style/AppTheme.SplashScreen">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".SignUpActivity" />
<activity android:name=".SignInActivity"></activity>
</application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import androidx.appcompat.app.AppCompatActivity;

import android.animation.Animator;
import android.os.Bundle;

public class MainActivity extends AppCompatActivity {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
package com.andela.app.animationchallenge;

import androidx.appcompat.app.AppCompatActivity;

import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;

public class SignInActivity extends AppCompatActivity implements View.OnClickListener {

private EditText mUsername, mPassword;
private Button mSignin;
private TextView mSignup, mWelcomeMessage;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_sign_in);

initComponents();
}

private void initComponents(){
mUsername = findViewById(R.id.et_username);
mPassword = findViewById(R.id.et_password);
mSignin = findViewById(R.id.btn_signin);
mSignin.setOnClickListener(this);
mSignup = findViewById(R.id.tv_signup);
mSignup.setOnClickListener(this);
mWelcomeMessage = findViewById(R.id.tv_welcome_message);
}

@Override
public void onClick(View view) {
switch (view.getId()){
case R.id.btn_signin : mSigninButtonClicked();
break;
case R.id.tv_signup : mSignupButtonClicked();
}
}

private void mSigninButtonClicked(){
Toast.makeText(SignInActivity.this, "Ooh, i did something", Toast.LENGTH_LONG).show();
}

private void mSignupButtonClicked(){

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.andela.app.animationchallenge;

import androidx.appcompat.app.AppCompatActivity;

import android.os.Bundle;

public class SignUpActivity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_sign_up);

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
package com.andela.app.animationchallenge;

import androidx.appcompat.app.AppCompatActivity;

import android.animation.Animator;
import android.content.Intent;
import android.media.Image;
import android.os.Bundle;
import android.os.Handler;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.Toast;

import com.andela.app.animationchallenge.animations.AppAnimator;

public class SplashActivity extends AppCompatActivity implements Animator.AnimatorListener {

private ImageView mLogo;
private int splashTime;
private Handler handler;
private AppAnimator appAnimator;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_splash);
initVariables();
initComponents();

}

@Override
protected void onStart() {
super.onStart();

handler = new Handler();



handler.postDelayed(goToMainActivity(), splashTime);
}

private void initVariables(){

splashTime = 5000;
appAnimator = new AppAnimator(SplashActivity.this);
}
private void initComponents(){
mLogo = findViewById(R.id.iv_logo);
}


private Runnable goToMainActivity(){
appAnimator.fadeAnimation(mLogo, R.animator.alpha_splash_screen_logo_animator);
return new Runnable() {
@Override
public void run() {
startActivity(new Intent(SplashActivity.this, MainActivity.class));
finish();
}
};
}

@Override
public void onAnimationStart(Animator animation) {
Toast.makeText(SplashActivity.this, "Animation Started", Toast.LENGTH_LONG).show();
}

@Override
public void onAnimationEnd(Animator animation) {
Toast.makeText(SplashActivity.this, "Animation Ended", Toast.LENGTH_LONG).show();
}

@Override
public void onAnimationRepeat(Animator animation) {
Toast.makeText(SplashActivity.this, "Animation Repeated", Toast.LENGTH_LONG).show();
}

@Override
public void onAnimationCancel(Animator animator) {
Toast.makeText(SplashActivity.this, "Animation Repeated", Toast.LENGTH_LONG).show();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package com.andela.app.animationchallenge.animations;

import android.animation.Animator;
import android.animation.AnimatorInflater;
import android.animation.AnimatorSet;
import android.content.Context;
import android.view.View;

import com.andela.app.animationchallenge.R;

public class AppAnimator {

private Context context;
public AppAnimator() {
}

public AppAnimator(Context context) {
this.context = context;
}

public void fadeAnimation(View view, int resource){
AnimatorSet animatorSet = (AnimatorSet) AnimatorInflater.loadAnimator(this.context, resource);
animatorSet.setTarget(view);
animatorSet.addListener((Animator.AnimatorListener) this.context);
animatorSet.start();
}
}
11 changes: 11 additions & 0 deletions app/src/main/res/animator/alpha_splash_screen_logo_animator.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<objectAnimator
android:propertyName="alpha"
android:valueFrom="0.0"
android:valueTo="1.0"
android:valueType="floatType"
android:duration="3000"
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
/>
</set>
9 changes: 0 additions & 9 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,4 @@
android:layout_height="match_parent"
tools:context=".MainActivity">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Hello World!"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>
65 changes: 65 additions & 0 deletions app/src/main/res/layout/activity_sign_in.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/main_layout"
tools:context=".SignInActivity">


<LinearLayout
android:id="@+id/ll_input_area"
android:layout_margin="16dp"
android:orientation="vertical"
android:layout_alignParentBottom="true"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/iv_logo"
android:src="@drawable/ic_launcher_foreground"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_marginBottom="50dp"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_welcome_message"
android:textAlignment="center"
android:layout_marginBottom="16dp"
android:textSize="16sp"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

<EditText
android:id="@+id/et_username"
android:hint="Username"
android:inputType="textEmailAddress"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

<EditText
android:id="@+id/et_password"
android:hint="Password"
android:inputType="textPassword"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

<Button
android:id="@+id/btn_signin"
android:layout_marginTop="12dp"
android:layout_gravity="right"
android:text="Sign in"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/tv_signup"
android:textAlignment="center"
android:layout_marginTop="32dp"
android:layout_marginBottom="32dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:text="Dont have an account? Sign up."/>
</LinearLayout>

</RelativeLayout>
9 changes: 9 additions & 0 deletions app/src/main/res/layout/activity_sign_up.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SignUpActivity">

</androidx.constraintlayout.widget.ConstraintLayout>
17 changes: 17 additions & 0 deletions app/src/main/res/layout/activity_splash.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="16dp"
tools:context=".SplashActivity">

<ImageView
android:id="@+id/iv_logo"
android:src="@drawable/ic_launcher_foreground"
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>

</RelativeLayout>
6 changes: 6 additions & 0 deletions app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,10 @@
<item name="colorAccent">@color/colorAccent</item>
</style>

<!--Splash Screen Custom Theme-->
<style name="AppTheme.SplashScreen" parent="Theme.AppCompat.Light.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:windowDisablePreview">true</item>
</style>
</resources>
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {

}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.android.tools.build:gradle:3.5.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down