Merge branch 'master' into 'main' (dd758f04) · Commits · Christian Andrew Manuel / Sample Login · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

Sample Login
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

dd758f04

Commit dd758f04 authored 2 years ago by Christian Andrew Manuel

Downloads
- Plain Diff

Merge branch 'master' into 'main'

Master

See merge request !2

parents 3a3e57f5 71e91243

No related branches found

No related tags found

1 merge request!2Master

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/build.gradle 3 additions, 6 deletions

app/build.gradle
app/src/main/java/com/example/samplelogin/MainActivity.kt 3 additions, 10 deletions

app/src/main/java/com/example/samplelogin/MainActivity.kt
app/src/main/java/com/example/samplelogin/WelcomeActivity.kt 2 additions, 2 deletions

app/src/main/java/com/example/samplelogin/WelcomeActivity.kt
app/src/main/res/layout/activity_main.xml 41 additions, 50 deletions

app/src/main/res/layout/activity_main.xml
app/src/main/res/layout/activity_welcome.xml 29 additions, 32 deletions

app/src/main/res/layout/activity_welcome.xml

with 78 additions and 100 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment