Skip to content

Commit

Permalink
Merge pull request #1 from RENEEGAILP/A3
Browse files Browse the repository at this point in the history 
A3
  • Loading branch information
@RENEEGAILP
RENEEGAILP authored May 28, 2021
2 parents 7f718bc + 56be425 commit 60b6185
Show file tree
Hide file tree
Showing 6 changed files with 165 additions and 12 deletions.
2 changes: 2 additions & 0 deletions NUMAD21Su-GailReneePinto/app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
android:roundIcon="@mipmap/ic_launcher_grp_round"
android:supportsRtl="true"
android:theme="@style/Theme.NUMAD21SuGailReneePinto">
<activity android:name=".ClickyClickyActivity"
android:configChanges="keyboardHidden|orientation|screenSize"></activity>
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
34 changes: 34 additions & 0 deletions ...to/app/src/main/java/edu/neu/madcourse/numad21su_gailreneepinto/ClickyClickyActivity.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package edu.neu.madcourse.numad21su_gailreneepinto;

import androidx.appcompat.app.AppCompatActivity;

import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;

public class ClickyClickyActivity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_clicky_clicky);
findViewById(R.id.button_A).setOnClickListener(this::onClick);
findViewById(R.id.button_B).setOnClickListener(this::onClick);
findViewById(R.id.button_C).setOnClickListener(this::onClick);
findViewById(R.id.button_D).setOnClickListener(this::onClick);
findViewById(R.id.button_E).setOnClickListener(this::onClick);
findViewById(R.id.button_F).setOnClickListener(this::onClick);

}

public void onClick(View view)
{
TextView textView = findViewById(R.id.pressed_textView);
Button button_pressed = findViewById(view.getId());
textView.setText("Button Pressed : " + button_pressed.getText().toString());
textView.setVisibility(View.VISIBLE);
}


}
22 changes: 16 additions & 6 deletions ...ReneePinto/app/src/main/java/edu/neu/madcourse/numad21su_gailreneepinto/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

import androidx.appcompat.app.AppCompatActivity;

import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.TextView;
import android.widget.Toast;

public class MainActivity extends AppCompatActivity {

Expand All @@ -15,11 +16,20 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.activity_main);
}

public void onAboutClick(View view) {
TextView about = (TextView)findViewById(R.id.about_textView);
if(about.getVisibility() == View.INVISIBLE) {
about.setVisibility(View.VISIBLE);
about.postDelayed(() -> about.setVisibility(View.INVISIBLE), 15000);
public void onClick(View view) {

switch (view.getId())
{
case R.id.about_button:
TextView about = findViewById(R.id.about_textView);
if(about.getVisibility() == View.INVISIBLE) {
about.setVisibility(View.VISIBLE);
about.postDelayed(() -> about.setVisibility(View.INVISIBLE), 15000);
}
break;
case R.id.clickhere_button:
Intent intent = new Intent(this, ClickyClickyActivity.class);
startActivity(intent);
}
}
}
90 changes: 90 additions & 0 deletions NUMAD21Su-GailReneePinto/app/src/main/res/layout/activity_clicky_clicky.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
<?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=".ClickyClickyActivity">

<Button
android:id="@+id/button_B"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:text="@string/b"
app:layout_constraintBottom_toTopOf="@+id/button_E"
app:layout_constraintEnd_toStartOf="@+id/button_C"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/button_A" />

<Button
android:id="@+id/button_F"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/f"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/button_E"
app:layout_constraintTop_toTopOf="parent" />

<Button
android:id="@+id/button_E"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/e"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/button_F"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/button_D"
app:layout_constraintTop_toTopOf="parent" />

<Button
android:id="@+id/button_D"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/d"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/button_E"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<Button
android:id="@+id/button_C"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:text="@string/c"
app:layout_constraintBottom_toTopOf="@+id/button_F"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/button_B" />

<Button
android:id="@+id/button_A"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:text="@string/a"
app:layout_constraintBottom_toTopOf="@+id/button_D"
app:layout_constraintEnd_toStartOf="@+id/button_B"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" />

<TextView
android:id="@+id/pressed_textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@color/teal_200"
android:visibility="invisible"
android:freezesText="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.496"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_E"
tools:visibility="invisible" />

</androidx.constraintlayout.widget.ConstraintLayout>
22 changes: 16 additions & 6 deletions NUMAD21Su-GailReneePinto/app/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,13 @@
android:id="@+id/about_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="onAboutClick"
android:onClick="onClick"
android:text="@string/about_string"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@+id/clickhere_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.55" />
app:layout_constraintTop_toBottomOf="@+id/helloworld_textview" />

<TextView
android:id="@+id/about_textView"
Expand All @@ -50,7 +49,18 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.734" />
app:layout_constraintTop_toBottomOf="@+id/clickhere_button" />

<Button
android:id="@+id/clickhere_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="onClick"
android:text="@string/click_here"
app:layout_constraintBottom_toTopOf="@+id/about_textView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/about_button" />

</androidx.constraintlayout.widget.ConstraintLayout>
7 changes: 7 additions & 0 deletions NUMAD21Su-GailReneePinto/app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,11 @@
<string name="app_name">NUMAD21Su-GailReneePinto</string>
<string name="about_string">About</string>
<string name="about_detail">Name: Gail Renee Pinto\nEmail: [email protected]</string>
<string name="click_here">Click here!</string>
<string name="a">A</string>
<string name="b">B</string>
<string name="c">C</string>
<string name="d">D</string>
<string name="f">F</string>
<string name="e">E</string>
</resources>

0 comments on commit 60b6185

Please sign in to comment.