Merge branch 'master' of http://gitlab.informatika.org/IF3111-2018-07/android (de92318b) · Commits · IF3111-2018-07 / android · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

android
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Container Registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

IF3111-2018-07
android
Commits
de92318b

Commit de92318b authored 7 years ago by

unknown

Downloads
- Plain Diff

Merge branch 'master' of http://gitlab.informatika.org/IF3111-2018-07/android

parents f28f9a2c b20e784c

Branches

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/AndroidManifest.xml 2 additions, 0 deletions

app/src/main/AndroidManifest.xml
app/src/main/java/com/example/leo/fitnessdiy/PushupActivity.java 31 additions, 0 deletions

.../main/java/com/example/leo/fitnessdiy/PushupActivity.java
app/src/main/res/drawable/pushup_video1.png 0 additions, 0 deletions

app/src/main/res/drawable/pushup_video1.png
app/src/main/res/drawable/pushup_video2.png 0 additions, 0 deletions

app/src/main/res/drawable/pushup_video2.png
app/src/main/res/layout/activity_pushup.xml 84 additions, 4 deletions

app/src/main/res/layout/activity_pushup.xml
app/src/main/res/values/strings.xml 4 additions, 0 deletions

app/src/main/res/values/strings.xml

with 121 additions and 4 deletions

0% 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