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

Commit #125 #40

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
23ca4c0
Added Goal Achievement Popups Checkboxes required for Goal completion…
PRISHIta123 May 2, 2018
21d3af8
Resolved Conflicts in local.properties
PRISHIta123 May 11, 2018
e0cfa76
Resolved Conflicts
PRISHIta123 May 11, 2018
6c85e5a
Resolved merge conflicts
PRISHIta123 May 11, 2018
0638372
Added google-services.json file that was removed
PRISHIta123 May 11, 2018
51f14be
Update google-services.json
PRISHIta123 May 11, 2018
b961691
Changed username in google-services.json file
PRISHIta123 May 11, 2018
4132447
Changed username in google-services.json to resolve conflict
PRISHIta123 May 11, 2018
a08a175
Added Caches folder to .idea
PRISHIta123 May 11, 2018
7f17852
Added codeStyles folder to .idea
PRISHIta123 May 11, 2018
e0b44df
Updates misc.xml
PRISHIta123 May 11, 2018
d4adf39
Update local.properties
PRISHIta123 May 12, 2018
5c7f11e
Update google-services.json
PRISHIta123 May 12, 2018
5a8c3ea
Added files for Opening windows for each Activity , Goals completed V…
PRISHIta123 May 12, 2018
f4017d1
Modified misc.xml and local.properties
PRISHIta123 May 12, 2018
4d46ac2
Removed conflicting file
PRISHIta123 May 14, 2018
b7b3883
Added build_file checksums.ser
PRISHIta123 May 14, 2018
dd66f2f
Modified AndroidManifest.xml
PRISHIta123 May 14, 2018
66954c1
Removed conflicting file
PRISHIta123 May 14, 2018
dbc89be
Added file
PRISHIta123 May 14, 2018
7cba73e
Removed file
PRISHIta123 May 14, 2018
47a9d71
Added file
PRISHIta123 May 14, 2018
74f7a1e
Merge branch 'master' into master
PRISHIta123 May 14, 2018
c61f523
Merge branch 'master' into master
PRISHIta123 May 15, 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
54 changes: 27 additions & 27 deletions .idea/codeStyles/Project.xml

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

18 changes: 17 additions & 1 deletion .idea/misc.xml

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

2 changes: 1 addition & 1 deletion app/google-services.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@
}
],
"configuration_version": "1"
}
}
8 changes: 8 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@

<receiver android:name=".NotificationActivity" />


<activity android:name=".Breakfast" />
<activity android:name=".Lunch" />
<activity android:name=".Dinner" />
<activity android:name=".Games" />
<activity android:name=".Study1" />
<activity android:name=".Study2" />

<activity android:name=".Goals_Completed" />
<activity android:name=".Goals_Missed" />
<activity android:name=".Achievements"></activity>
Expand Down
13 changes: 13 additions & 0 deletions app/src/main/java/com/example/dhananjay/dailygoals/Breakfast.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.example.android.dailygoals;

import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;

public class Breakfast extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.breakfast);
}
}
13 changes: 13 additions & 0 deletions app/src/main/java/com/example/dhananjay/dailygoals/Dinner.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.example.android.dailygoals;

import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;

public class Dinner extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.dinner);
}
}
13 changes: 13 additions & 0 deletions app/src/main/java/com/example/dhananjay/dailygoals/Games.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.example.android.dailygoals;

import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;

public class Games extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.games);
}
}
13 changes: 13 additions & 0 deletions app/src/main/java/com/example/dhananjay/dailygoals/Lunch.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.example.android.dailygoals;

import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;

public class Lunch extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.lunch);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,82 @@ public void onLongClick(View view, int position) {
}


recyclerView1.addOnItemTouchListener(new RecyclerTouchListener(this,
recyclerView1, new ClickListener() {
@Override
public void onClick(View view, final int position) {
//Values are passing to activity & to fragment as well


if(position == 0)
{
Intent intent = new Intent(getApplicationContext(), Breakfast.class);
startActivity(intent);
}

if(position == 1)
{
Intent intent = new Intent(getApplicationContext(), Study1.class);
startActivity(intent);
}
if(position == 2)
{
Intent intent = new Intent(getApplicationContext(), Lunch.class);
startActivity(intent);
}
if(position == 3)
{
Intent intent = new Intent(getApplicationContext(), Study2.class);
startActivity(intent);
}
if(position == 4)
{
Intent intent = new Intent(getApplicationContext(), Games.class);
startActivity(intent);
}
if(position == 5)
{
Intent intent = new Intent(getApplicationContext(), Dinner.class);
startActivity(intent);
}
}
@Override
public void onLongClick(View view, int position) {
if(position == 0)
{
Toast.makeText(getApplicationContext(), "Breakfast Completed",
Toast.LENGTH_SHORT).show();
}

if(position == 1)
{
Toast.makeText(getApplicationContext(), "Studies Completed",
Toast.LENGTH_SHORT).show();
}
if(position == 2)
{
Toast.makeText(getApplicationContext(), "Lunch Completed",
Toast.LENGTH_SHORT).show();
}
if(position == 3)
{
Toast.makeText(getApplicationContext(), "Studies Completed",
Toast.LENGTH_SHORT).show();
}
if(position == 4)
{
Toast.makeText(getApplicationContext(), "Games Completed",
Toast.LENGTH_SHORT).show();
}
if(position == 5)
{
Toast.makeText(getApplicationContext(), "Dinner Completed",
Toast.LENGTH_SHORT).show();
}
}
}}};


class RecyclerTouchListener implements RecyclerView.OnItemTouchListener{

private ClickListener clicklistener;
Expand Down Expand Up @@ -203,4 +279,5 @@ protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
welcomeScreen.onSaveInstanceState(outState);
}

}
13 changes: 13 additions & 0 deletions app/src/main/java/com/example/dhananjay/dailygoals/Study1.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.example.android.dailygoals;

import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;

public class Study1 extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.study1);
}
}
13 changes: 13 additions & 0 deletions app/src/main/java/com/example/dhananjay/dailygoals/Study2.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.example.android.dailygoals;

import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;

public class Study2 extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.study2);
}
}
33 changes: 33 additions & 0 deletions app/src/main/res/layout/breakfast.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".Breakfast"
android:orientation="vertical"
android:background="#E1F5FE"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/breakfast"
android:textSize="30sp"
android:layout_gravity="center"
android:textStyle="bold"
/>
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/linearlayout_breakfast"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="#81D4FA"
>

</LinearLayout>
</ScrollView>
</LinearLayout>
33 changes: 33 additions & 0 deletions app/src/main/res/layout/dinner.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".Dinner"
android:orientation="vertical"
android:background="#E1F5FE"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/dinner"
android:textSize="30sp"
android:layout_gravity="center"
android:textStyle="bold"
/>
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/linearlayout_dinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="#81D4FA"
>

</LinearLayout>
</ScrollView>
</LinearLayout>
33 changes: 33 additions & 0 deletions app/src/main/res/layout/games.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".Games"
android:orientation="vertical"
android:background="#E1F5FE"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/games"
android:textSize="30sp"
android:layout_gravity="center"
android:textStyle="bold"
/>
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/linearlayout_games"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="#81D4FA"
>

</LinearLayout>
</ScrollView>
</LinearLayout>
Loading