Skip to content

Commit 1797327

Browse files
Merge pull request #3 from UdacityAndroidBasicsScholarship/master
UpdateMerge
2 parents 90efd76 + 9bd2763 commit 1797327

29 files changed

+654
-96
lines changed
535 Bytes
Binary file not shown.

.idea/codeStyles/Project.xml

Lines changed: 29 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

100755100644
File mode changed.

.idea/misc.xml

100755100644
Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

100755100644
File mode changed.

.idea/runConfigurations.xml

100755100644
File mode changed.

.idea/vcs.xml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CONTRIBUTING.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
CONTRIBUTING to daily-goal
2+
3+
First of all, thanks to all for taking the time to contribute in this project
4+
5+
The following is a set of guidelines on how to contribute:
6+
7+
How to Push Your Changes on Respective Branches?
8+
9+
1> Fork The Repo
10+
11+
2> Clone it
12+
13+
3> Make Changes in your local folder (using Android Studio)
14+
15+
4> -- After you're done --
16+
17+
5> Go to Git Bash (Open the location of your local folder/directory)
18+
19+
6> Add your changes git add .
20+
21+
7> Commit your changes git commit -m "Commit #Number"
22+
23+
8> Push your changes into your repo git push --force origin branch_name OR git push -u origin branch_name
24+
25+
9> Create PR
26+
27+
10> Type in i) Your Commit number ii) A Detailed Description of the changes you've made
28+
29+
take some help on generating a pull request at egghead.io course https://egghead.io/courses/practical-git-for-everyday-professional-use

app/build.gradle

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
apply plugin: 'com.android.application'
33

44
android {
5-
compileSdkVersion 26
5+
compileSdkVersion 27
66
defaultConfig {
77
applicationId "com.example.dhananjay.dailygoals"
8-
minSdkVersion 15
9-
targetSdkVersion 26
8+
minSdkVersion 21
9+
targetSdkVersion 27
1010
versionCode 1
1111
versionName "1.0"
1212
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -21,13 +21,17 @@ android {
2121

2222
dependencies {
2323
implementation fileTree(dir: 'libs', include: ['*.jar'])
24-
implementation 'com.android.support:appcompat-v7:26.1.0'
25-
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
24+
implementation 'com.android.support:appcompat-v7:27.1.1'
25+
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
2626
testImplementation 'junit:junit:4.12'
27-
androidTestImplementation 'com.android.support.test:runner:0.5'
28-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.2'
29-
implementation 'com.android.support:cardview-v7:26.1.0'
30-
implementation 'com.android.support:design:26.1.0'
27+
androidTestImplementation 'com.android.support.test:runner:1.0.1'
28+
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
29+
implementation 'com.android.support:cardview-v7:27.1.1'
30+
implementation 'com.android.support:design:27.1.1'
3131
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
32-
implementation 'com.android.support:recyclerview-v7:26.1.0'
32+
33+
implementation 'com.stephentuso:welcome:1.4.1'
34+
35+
implementation 'com.android.support:recyclerview-v7:27.1.1'
36+
3337
}

app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
<category android:name="android.intent.category.LAUNCHER" />
1717
</intent-filter>
1818
</activity>
19+
<activity android:name=".WelcomeScreenActivity"
20+
android:theme="@style/WelcomeScreenTheme"
21+
android:screenOrientation="portrait"/>
1922
</application>
2023

2124
</manifest>

0 commit comments

Comments
 (0)