Differences
This shows you the differences between two versions of the page.
|
smd:laboratoare:00 [2021/03/10 20:00] adriana.draghici |
smd:laboratoare:00 [2021/03/10 21:55] (current) adriana.draghici [Github Classroom repository] |
||
|---|---|---|---|
| Line 1: | Line 1: | ||
| ====== Lab 0. Setup ====== | ====== Lab 0. Setup ====== | ||
| - | Objectives: | + | **Objectives:** |
| - | * Create your github classroom repository | + | * Create your Github Classroom repository ([[smd:laboratoare:00#github_classroom_repository|jump to section]]) |
| - | * Configure Android studio, sdk and emulator | + | * Configure Android Studio, Android SDK and emulator ([[smd:laboratoare:00#android_environment|jump to section]]) |
| - | * Create a Hello World app and run it in the emulator | + | * Create a Hello World app and run it in the emulator ([[smd:laboratoare:00#hello_world|jump to section]]) |
| - | * Familiarize with basic git and create a pull request | + | * Familiarize with basic git and create a pull request ([[smd:laboratoare:00#versioning|jump to section]]) |
| ===== Github Classroom repository ===== | ===== Github Classroom repository ===== | ||
| Line 27: | Line 27: | ||
| **Step 5.** Click on your repository link (if you get an error, make sure you are logged in) | **Step 5.** Click on your repository link (if you get an error, make sure you are logged in) | ||
| - | {{:smd:laboratoare:lab0:screenshot_2021-03-10_at_18.49.10.png?400|}} | + | {{:smd:laboratoare:lab0:screenshot_2021-03-10_at_18.49.10.png?600|}} |
| **Step 6.** Edit the **readme** file and add your name, master programme and any other information you consider necessary | **Step 6.** Edit the **readme** file and add your name, master programme and any other information you consider necessary | ||
| Line 37: | Line 37: | ||
| You should clone your repository to a local folder | You should clone your repository to a local folder | ||
| - | {{:smd:laboratoare:lab0:screenshot_2021-03-10_at_20.26.11.png?300|}} | + | {{:smd:laboratoare:lab0:screenshot_2021-03-10_at_20.26.11.png?400|}} |
| - | The following steps can be performed in the command line, in Android Studio or in any other git source control app (e.g. [[https://www.sourcetreeapp.com/|SourceTree]]). | + | The following steps can be performed in the command line, in Android Studio or in any other git source control app (e.g. [[https://www.sourcetreeapp.com/|SourceTree], [[https://desktop.github.com/|Github desktop]]]). |
| **Useful resources:** | **Useful resources:** | ||
| - | * Sourcetree video tutorial | + | * [[https://www.youtube.com/watch?v=7ckoMfoMgxA&t=8s|Sourcetree video tutorial]] |
| - | * Git info pages from another course | + | * [[https://aboyi.medium.com/git-and-github-with-android-studio-gui-tool-3af48b663da2|Git in Android Studio tutorial]] |
| + | * [[https://www.softwaretestinghelp.com/github-desktop-tutorial/|Github desktop tutorial]] | ||
| **Step 1. Clone your repo | **Step 1. Clone your repo | ||
| Line 55: | Line 56: | ||
| Receiving objects: 100% (5/5), done. | Receiving objects: 100% (5/5), done. | ||
| $ cd demo | $ cd demo | ||
| - | (base) BUH-M-TQDJ1H:demo adraghici$ git status | + | $ git status |
| On branch main | On branch main | ||
| Your branch is up to date with 'origin/main'. | Your branch is up to date with 'origin/main'. | ||
| Line 109: | Line 110: | ||
| </code> | </code> | ||
| + | |||
| + | |||
| + | |||
| + | ==== Code review ==== | ||
| + | |||
| + | For code reviews we use pull requests. Depending on the repository hosting platform, we can have different names for them, but the concept is the same: a mechanism for requesting reviews for your code. It usually shows a diff of your new changes vs the branch you want to merge your code into and it allows reviewers to submit comments, tasks and to approve/reject. | ||
| + | |||
| + | Example: | ||
| + | |||
| + | Push the changes made of the branch lab0 and then go on Github to create a Pull Request. Don't forget to add reviewers to your PR. | ||
| + | <code> | ||
| + | $ git push --set-upstream origin lab0 | ||
| + | Enumerating objects: 4, done. | ||
| + | Counting objects: 100% (4/4), done. | ||
| + | Delta compression using up to 8 threads | ||
| + | Compressing objects: 100% (2/2), done. | ||
| + | Writing objects: 100% (3/3), 295 bytes | 295.00 KiB/s, done. | ||
| + | Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 | ||
| + | remote: | ||
| + | remote: Create a pull request for 'lab0' on GitHub by visiting: | ||
| + | remote: https://github.com/SMD-UPB/lab_20-22_adriana-adrianacd/pull/new/lab0 | ||
| + | remote: | ||
| + | To github.com:SMD-UPB/lab_20-22_adriana-adrianacd.git | ||
| + | * [new branch] lab0 -> lab0 | ||
| + | Branch 'lab0' set up to track remote branch 'lab0' from 'origin'. | ||
| + | </code> | ||
| + | |||
| + | A pull request can be created in many ways. For example: | ||
| + | |||
| + | * By opening the link provided in the push message (shown above) | ||
| + | * By going to the repo's page on github and clicking on Create Pull Request | ||
| + | |||
| + | {{:smd:laboratoare:lab0:screenshot_2021-03-10_at_22.11.47.png?400|}} | ||
| + | * By going to the repo's page, choosing the branch you are on and clicking on Pull Request | ||
| + | |||
| + | {{:smd:laboratoare:lab0:screenshot_2021-03-10_at_22.12.06.png?400|}} | ||
| + | |||
| + | * By going to the repo's page on github and clicking to view its branches | ||
| + | |||
| + | {{:smd:laboratoare:lab0:screenshot_2021-03-10_at_22.15.56.png?400|}} | ||
| + | |||
| + | <note tip>The pull requests you create for your labs must have a suggestive title. In general you should also add a description with useful info for reviewers.</note> | ||
| + | |||
| + | <note>TODO | ||
| + | Github automatically created a branch called 'feedback' and a pull request Feedback when it generated your repository. Please add your Teaching Assistant as reviewer to it to approve it. After the approval please close the Pull Request and delete the feedback branch. You can view your Pull requests on Github in the Pull Requests section of your repo. | ||
| + | |||
| + | |||
| + | </note> | ||
| ===== Android environment ===== | ===== Android environment ===== | ||
| Line 170: | Line 219: | ||
| {{:smd:laboratoare:lab0:screenshot_2021-03-10_at_19.26.15.png?400|}} | {{:smd:laboratoare:lab0:screenshot_2021-03-10_at_19.26.15.png?400|}} | ||
| - | or in the Logcat view: | + | or using the adb devices command from the CLI (make sure you add android sdk tools to your Path variable) |
| - | + | ||
| - | TODO | + | |
| - | + | ||
| - | or using the adb devices command from the CLI (make sure you add android sdk tools to your Path) | + | |
| <code bash> | <code bash> | ||
