Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change the Icon. #41

Open
wants to merge 79 commits into
base: UI
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
7856c30
Update strings.xml
pavankuppa1 Apr 14, 2018
5942c8e
Added a Welcome screen.
lifeLessCoder Apr 14, 2018
2b98cea
Merge pull request #16 from UdacityAndroidBasicsScholarship/UI
MadhavBangaru Apr 15, 2018
8f76fd7
Merge pull request #1 from UdacityAndroidBasicsScholarship/master
AndBasicsIndiascholarship Apr 16, 2018
435475e
Add files via upload
varunjha089 Apr 16, 2018
41f19bf
Merge pull request #19 from varunjha089/master
ShivamTaneja Apr 20, 2018
8a402d0
Update .gitignore
varunjha089 Apr 22, 2018
53862b4
Merge pull request #13 from lifeLessCoder/master
ShivamTaneja Apr 23, 2018
4e97c2b
todayActivity done
AndBasicsIndiascholarship Apr 23, 2018
80d2388
Merge branch 'master' into welcome-screen
ShivamTaneja Apr 23, 2018
b26edbf
Merge pull request #27 from UdacityAndroidBasicsScholarship/welcome-s…
ShivamTaneja Apr 23, 2018
65851e3
Removed Blacnk Spaces
AndBasicsIndiascholarship Apr 23, 2018
1cbdd18
Todat activity Done
AndBasicsIndiascholarship Apr 23, 2018
9bd2763
Merge pull request #28 from AndBasicsIndiascholarship/master
pavankuppa1 Apr 23, 2018
1797327
Merge pull request #3 from UdacityAndroidBasicsScholarship/master
MadhavBangaru Apr 24, 2018
478deee
Commit
ShivamTaneja Apr 24, 2018
01228a2
Delete misc.xml
ShivamTaneja Apr 24, 2018
2a6d359
Delete vcs.xml
ShivamTaneja Apr 24, 2018
6126ddb
Delete build_file_checksums.ser
AndBasicsIndiascholarship Apr 24, 2018
85ab6a9
Delete misc.xml
AndBasicsIndiascholarship Apr 24, 2018
c210d30
Delete vcs.xml
AndBasicsIndiascholarship Apr 24, 2018
6352fd9
Delete AndroidManifest.xml
AndBasicsIndiascholarship Apr 24, 2018
e73d3ef
Delete ItemClickSupport.java
AndBasicsIndiascholarship Apr 24, 2018
6c53f34
Delete local.properties
AndBasicsIndiascholarship Apr 24, 2018
35a893d
Delete gradle.properties
AndBasicsIndiascholarship Apr 24, 2018
5b95f9b
Delete build.gradle
AndBasicsIndiascholarship Apr 24, 2018
0c132de
Delete attrs.xml
AndBasicsIndiascholarship Apr 24, 2018
9190655
Delete marble.png
AndBasicsIndiascholarship Apr 24, 2018
867b0bb
Delete activity_today.xml
AndBasicsIndiascholarship Apr 24, 2018
cc509d9
Delete TodayActivity.java
AndBasicsIndiascholarship Apr 24, 2018
89acbf3
Delete MainActivity.java
AndBasicsIndiascholarship Apr 24, 2018
fb40c96
Merge pull request #30 from AndBasicsIndiascholarship/master
AndBasicsIndiascholarship Apr 24, 2018
446e2cd
Revert "Commit"
ShivamTaneja Apr 24, 2018
fc1ad09
Merge pull request #31 from UdacityAndroidBasicsScholarship/revert-30…
ShivamTaneja Apr 24, 2018
6ed10dc
Update AndroidManifest.xml
AndBasicsIndiascholarship Apr 24, 2018
cb6567c
Update MainActivity.java
AndBasicsIndiascholarship Apr 24, 2018
7ae982f
Create TodayActivity
AndBasicsIndiascholarship Apr 24, 2018
ecb6238
Rename TodayActivity to TodayActivity.java
AndBasicsIndiascholarship Apr 24, 2018
4a29dc0
Create ItemClickSupport.java
AndBasicsIndiascholarship Apr 24, 2018
1752eaf
Create activity_today.xml
AndBasicsIndiascholarship Apr 24, 2018
4e17253
Create attrs.xml
AndBasicsIndiascholarship Apr 24, 2018
0c92125
Update build.gradle
AndBasicsIndiascholarship Apr 24, 2018
ff5c163
Update activity_today.xml
pavankuppa1 Apr 24, 2018
df1375f
Update build.gradle
pavankuppa1 Apr 24, 2018
c3f36a2
Added missing drawables
MadhavBangaru Apr 24, 2018
1839186
Merge remote-tracking branch 'origin/master'
MadhavBangaru Apr 24, 2018
1f30314
Merge pull request #32 from MadhavBangaru/master
MadhavBangaru Apr 24, 2018
2b30206
Retrieved working Java code for welcome screen
MadhavBangaru Apr 24, 2018
e3335e7
Merge pull request #33 from MadhavBangaru/master
MadhavBangaru Apr 24, 2018
9d5ee83
Update MainActivity.java
pavankuppa1 Apr 25, 2018
6c8c202
Add files via upload
pavankuppa1 Apr 25, 2018
9c49855
Update activity_today.xml
pavankuppa1 Apr 25, 2018
d05bb11
Update AndroidManifest.xml
pavankuppa1 Apr 25, 2018
e494e30
Update styles.xml
pavankuppa1 Apr 25, 2018
b06f438
Update build.gradle
pavankuppa1 Apr 25, 2018
943f192
Update build.gradle
pavankuppa1 Apr 25, 2018
6e8a30d
Add files via upload
pavankuppa1 Apr 25, 2018
f9fe937
Add files via upload
pavankuppa1 Apr 25, 2018
ecd40ce
Update TodayActivity.java
pavankuppa1 Apr 25, 2018
4414fef
Add files via upload
pavankuppa1 Apr 25, 2018
c5e564b
Update MainActivity.java
pavankuppa1 Apr 25, 2018
62983f1
Merge pull request #4 from UdacityAndroidBasicsScholarship/master
MadhavBangaru Apr 25, 2018
0b6389d
Enhanced UI for day activity
MadhavBangaru Apr 26, 2018
9970e71
Merge pull request #34 from MadhavBangaru/master
MadhavBangaru Apr 26, 2018
0b02d77
Merge pull request #26 from varunjha089/master
Dhananjayyy Apr 29, 2018
7b16883
commit_added
ShivamTaneja Apr 29, 2018
5bec616
Added recycler view onclicklistener to completed, missed, achievement…
ShivamTaneja Apr 29, 2018
23aef09
Change gradle version from 4.1 to 4.4
PRISHIta123 Apr 30, 2018
9d5c828
Merge pull request #35 from ShivamTaneja/master
ShivamTaneja Apr 30, 2018
ed0f42b
Merge pull request #37 from PRISHIta123/master
ShivamTaneja Apr 30, 2018
bfb09b1
local change
Soulpancake000 May 2, 2018
44fa86d
local conflict
Soulpancake000 May 2, 2018
929c1b1
make background transparent
Soulpancake000 May 2, 2018
c19cf91
Update local.properties
DSdatsme May 4, 2018
9a4e7c5
Change the Icon
Soulpancake000 May 4, 2018
51c5da4
Merge remote-tracking branch 'origin/master'
Soulpancake000 May 4, 2018
4494efd
It is quite short guided setup for New developers.
Soulpancake000 May 7, 2018
7ce3bde
Merge pull request #44 from Soulpancake000/patch-1
DSdatsme May 10, 2018
95526cb
commit
Soulpancake000 May 14, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
190 changes: 183 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,185 @@
# Created by https://www.gitignore.io/api/macos,linux,android,windows,intellij

### Android ###
# Built application files
*.apk
*.ap_

# Files for the ART/Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/
out/

# Gradle files
.gradle/
build/

# Local configuration file (sdk path, etc)
local.properties

# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log

# Android Studio Navigation editor temp files
.navigation/

# Android Studio captures folder
captures/

# Intellij
*.iml
.gradle
/local.properties
/.idea/workspace.xml
/.idea/libraries
.DS_Store
/build
/captures
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/dictionaries
.idea/libraries

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild

# Freeline
freeline.py
freeline/
freeline_project_description.json

### Android Patch ###
gen-external-apklibs

### Intellij ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff:
.idea/**/workspace.xml
.idea/**/tasks.xml

# Sensitive or high-churn files:
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.xml
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml

# Gradle:
.idea/**/gradle.xml
.idea/**/libraries

# CMake
cmake-build-debug/

# Mongo Explorer plugin:
.idea/**/mongoSettings.xml

## File-based project format:
*.iws

## Plugin-specific files:

# IntelliJ
/out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# Ruby plugin and RubyMine
/.rakeTasks

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

### Intellij Patch ###
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721

# *.iml
# modules.xml
# .idea/misc.xml
# *.ipr

# Sonarlint plugin
.idea/sonarlint

### Linux ###
*~

# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*

# KDE directory preferences
.directory

# Linux trash folder which might appear on any partition or disk
.Trash-*

# .nfs files are created when an open file is removed but is still being accessed
.nfs*

### macOS ###
*.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### Windows ###
# Windows thumbnail cache files
Thumbs.db
ehthumbs.db
ehthumbs_vista.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# Windows shortcuts
*.lnk


# End of https://www.gitignore.io/api/macos,linux,android,windows,intellij
74 changes: 74 additions & 0 deletions .idea/assetWizardSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified .idea/caches/build_file_checksums.ser
Binary file not shown.
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 29 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
CONTRIBUTING to daily-goal

First of all, thanks to all for taking the time to contribute in this project

The following is a set of guidelines on how to contribute:

How to Push Your Changes on Respective Branches?

1> Fork The Repo

2> Clone it

3> Make Changes in your local folder (using Android Studio)

4> -- After you're done --

5> Go to Git Bash (Open the location of your local folder/directory)

6> Add your changes git add .

7> Commit your changes git commit -m "Commit #Number"

8> Push your changes into your repo git push --force origin branch_name OR git push -u origin branch_name

9> Create PR

10> Type in i) Your Commit number ii) A Detailed Description of the changes you've made

take some help on generating a pull request at egghead.io course https://egghead.io/courses/practical-git-for-everyday-professional-use
58 changes: 58 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,61 @@ Daily goals app. An app that reminds you of your daily goals set. It will showca
to store performance.
The app will be like an assistant which will guide you throughout your life.
It will manage your day. It will manage how you spend your time. It will manage your relations and connections. Eg. It will give you optimized suggestions to spend that time effectively by considering how you spend your time, the app will build your schedule and will tell you accordingly. The app will use machine learning.


### Introduction

This application is a collaborative project made by the Google Udacity Android Basics Scholars.

### How to Setup

- Head over to the [Base Repository](https://github.com/UdacityAndroidBasicsScholarship/daily-goals) and Fork it.


#### Using Android Studio

- Copy the URL of your Fork & Clone it in Android Studio.

- Start Coding and Make Changes.

- Once done, push the changes to your fork.


#### Using CLI

- Clone your fork.
```
git clone https://github.com/<your_github_username>/daily-goals
```

- Change current working directory.
```
cd daily-goals
```

- Start Coding and Make Changes.

- Add individual modified file to Staging area and write Commit Message for it.
```
git add File1
git commit -m "Changed File1"

git add File2
git commit -m "Changed File2"
```

- Push changes to your Fork Repository.

### Submitting PR

- From your fork create a PR.

- Write a PR Title.

- In PR Description,

- Mention a short description of changes you've made.

- Or Attach a screenshot or gif of the same.

- Or Add your Slack ID (Display Name).
13 changes: 12 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

apply plugin: 'com.android.application'

// change gradle version from 4.1 to 4.4
// in Android Studio go to Project > Right Click > Project Structure>Change current version 4.1 to 4.4> OK

android {
compileSdkVersion 27
defaultConfig {
Expand Down Expand Up @@ -29,5 +31,14 @@ dependencies {
implementation 'com.android.support:cardview-v7:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
implementation 'com.android.support:preference-v7:27.1.1'
compile 'com.google.firebase:firebase-database:11.0.4'
compile 'com.google.firebase:firebase-storage:11.0.4'

implementation 'com.stephentuso:welcome:1.4.1'

implementation 'com.android.support:recyclerview-v7:27.1.1'

}

apply plugin: 'com.google.gms.google-services'
Loading