Merge branch 'master' of http://gitlab.informatika.org/IF3111-2018-07/android (7f19f4a4) · 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
7f19f4a4

Commit 7f19f4a4 authored 7 years ago by

Rizki Halasan

Downloads
- Plain Diff

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

parents fbe2fe0a 6c23a804

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/AndroidManifest.xml 33 additions, 21 deletions

app/src/main/AndroidManifest.xml
app/src/main/java/com/example/leo/fitnessdiy/JoggingActivity.java 82 additions, 27 deletions

...main/java/com/example/leo/fitnessdiy/JoggingActivity.java
app/src/main/java/com/example/leo/fitnessdiy/RunActivity.java 64 additions, 0 deletions

...src/main/java/com/example/leo/fitnessdiy/RunActivity.java
app/src/main/res/drawable/round_button.xml 6 additions, 0 deletions

app/src/main/res/drawable/round_button.xml
app/src/main/res/layout/activity_jogging.xml 29 additions, 14 deletions

app/src/main/res/layout/activity_jogging.xml
app/src/main/res/layout/activity_run.xml 13 additions, 0 deletions

app/src/main/res/layout/activity_run.xml
app/src/main/res/values/strings.xml 3 additions, 0 deletions

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

with 230 additions and 62 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