From 23ca4c02de23178ef0ad8899ea9341796003f739 Mon Sep 17 00:00:00 2001 From: PRISHIta123 Date: Wed, 2 May 2018 23:41:11 +0530 Subject: [PATCH 01/19] Added Goal Achievement Popups Checkboxes required for Goal completion and number of goals missed and goals completed to be displayed --- .idea/caches/build_file_checksums.ser | Bin 535 -> 0 bytes .idea/codeStyles/Project.xml | 29 ------- .idea/misc.xml | 25 ++++-- .idea/vcs.xml | 2 - app/google-services.json | 55 ------------- app/src/main/AndroidManifest.xml | 8 ++ .../dhananjay/dailygoals/MainActivity.java | 76 ++++++++++++++++++ local.properties | 4 +- 8 files changed, 106 insertions(+), 93 deletions(-) delete mode 100644 .idea/caches/build_file_checksums.ser delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 app/google-services.json diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser deleted file mode 100644 index 2c2d1374c6cd45b5efd8cace8afd867105cf9afa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 535 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}uGBYr_F>vMNC#JY1CYR(Fc`|U8WE7eX4Zy-OGba`KZCb3mb0kXlrdnOa;5SKL@+ zyM1r0xxpS;J?<+DZ`>|n5JZG6hU$F+e-4!RXViLc&FCy_TohEopr)UZpPQ>}S}-^0I+*#+x5bbwJl878K}X_ezJ_+=&jap44T#Tblpgwd8RH E0P@VZy8r+H diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 30aa626..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 99202cc..cc72de3 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,12 +5,11 @@ @@ -25,10 +24,26 @@ - + + + + + + 1.8 + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 68eb31a..94a25f7 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,8 +1,6 @@ - - \ No newline at end of file diff --git a/app/google-services.json b/app/google-services.json deleted file mode 100644 index b8d9db9..0000000 --- a/app/google-services.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "project_info": { - "project_number": "891850808493", - "firebase_url": "https://daily-goals-a9c53.firebaseio.com", - "project_id": "daily-goals-a9c53", - "storage_bucket": "daily-goals-a9c53.appspot.com" - }, - "client": [ - { - "client_info": { - "mobilesdk_app_id": "1:891850808493:android:def136320218cb3a", - "android_client_info": { - "package_name": "com.example.dhananjay.dailygoals" - } - }, - "oauth_client": [ - { - "client_id": "891850808493-9ddh59ootunrok7pfi5kplm48h4jshv5.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.example.dhananjay.dailygoals", - "certificate_hash": "dc402beccbec5c64ee1f65fbbb06ddf429efe45a" - } - }, - { - "client_id": "891850808493-atp6khfqm1jv21o4a1cqnm8n2jf5f9ag.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyAF-ifz80FZWLZJaFYn4uky1Vx1kRNdPG8" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "891850808493-atp6khfqm1jv21o4a1cqnm8n2jf5f9ag.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "ads_service": { - "status": 2 - } - } - } - ], - "configuration_version": "1" -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6e7db27..958cea9 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,6 +23,14 @@ + + + + + + + + diff --git a/app/src/main/java/com/example/dhananjay/dailygoals/MainActivity.java b/app/src/main/java/com/example/dhananjay/dailygoals/MainActivity.java index 40f6cb0..45116df 100755 --- a/app/src/main/java/com/example/dhananjay/dailygoals/MainActivity.java +++ b/app/src/main/java/com/example/dhananjay/dailygoals/MainActivity.java @@ -83,9 +83,85 @@ public void onItemClicked(RecyclerView recyclerView, int position, View v) { welcomeScreen.show(savedInstanceState); } + 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(); + } + } + }}}; + @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); welcomeScreen.onSaveInstanceState(outState); } + } diff --git a/local.properties b/local.properties index cded8f2..4c74e49 100644 --- a/local.properties +++ b/local.properties @@ -7,5 +7,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Tue Apr 24 20:28:19 IST 2018 -sdk.dir=C\:\\Users\\Madhav Bangaru\\AppData\\Local\\Android\\Sdk +#Tue May 01 16:13:00 IST 2018 +sdk.dir=C\:\\Users\\PrishitaRay\\AppData\\Local\\Android\\Sdk From 21d3af8297b986334e9cda5e44ad859ccc527cbe Mon Sep 17 00:00:00 2001 From: Prishita Ray <30746562+PRISHIta123@users.noreply.github.com> Date: Fri, 11 May 2018 10:20:45 +0530 Subject: [PATCH 02/19] Resolved Conflicts in local.properties --- local.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/local.properties b/local.properties index 4c74e49..bc4d7d8 100644 --- a/local.properties +++ b/local.properties @@ -8,4 +8,4 @@ # For customization when using a Version Control System, please read the # header note. #Tue May 01 16:13:00 IST 2018 -sdk.dir=C\:\\Users\\PrishitaRay\\AppData\\Local\\Android\\Sdk +sdk.dir=C\:\\Users\\Madhav Bangaru\\AppData\\Local\\Android\\Sdk From e0cfa7644b41407e9cb008d4e218dea2f6027397 Mon Sep 17 00:00:00 2001 From: PRISHIta123 Date: Fri, 11 May 2018 10:46:57 +0530 Subject: [PATCH 03/19] Resolved Conflicts --- local.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/local.properties b/local.properties index 4c74e49..9c8d5b5 100644 --- a/local.properties +++ b/local.properties @@ -7,5 +7,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Tue May 01 16:13:00 IST 2018 -sdk.dir=C\:\\Users\\PrishitaRay\\AppData\\Local\\Android\\Sdk +#Mon Apr 30 19:44:24 IST 2018 +sdk.dir=C\:\\Users\\Madhav Bangaru\\AppData\\Local\\Android\\Sdk From 06383726546b285c148eec6e7ff3cd036672dd53 Mon Sep 17 00:00:00 2001 From: PRISHIta123 Date: Fri, 11 May 2018 11:29:28 +0530 Subject: [PATCH 04/19] Added google-services.json file that was removed --- app/google-services.json | 55 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 app/google-services.json diff --git a/app/google-services.json b/app/google-services.json new file mode 100644 index 0000000..575c23a --- /dev/null +++ b/app/google-services.json @@ -0,0 +1,55 @@ +{ + "project_info": { + "project_number": "891850808493", + "firebase_url": "https://daily-goals-a9c53.firebaseio.com", + "project_id": "daily-goals-a9c53", + "storage_bucket": "daily-goals-a9c53.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:891850808493:android:def136320218cb3a", + "android_client_info": { + "package_name": "com.example.android.dailygoals" + } + }, + "oauth_client": [ + { + "client_id": "891850808493-9ddh59ootunrok7pfi5kplm48h4jshv5.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.example.dhananjay.dailygoals", + "certificate_hash": "dc402beccbec5c64ee1f65fbbb06ddf429efe45a" + } + }, + { + "client_id": "891850808493-atp6khfqm1jv21o4a1cqnm8n2jf5f9ag.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyAF-ifz80FZWLZJaFYn4uky1Vx1kRNdPG8" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "891850808493-atp6khfqm1jv21o4a1cqnm8n2jf5f9ag.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "ads_service": { + "status": 2 + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file From 51f14be48603a594b47d1399ac912104f6ab07dc Mon Sep 17 00:00:00 2001 From: Prishita Ray <30746562+PRISHIta123@users.noreply.github.com> Date: Fri, 11 May 2018 11:31:41 +0530 Subject: [PATCH 05/19] Update google-services.json --- app/google-services.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/google-services.json b/app/google-services.json index 575c23a..775a840 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -10,7 +10,7 @@ "client_info": { "mobilesdk_app_id": "1:891850808493:android:def136320218cb3a", "android_client_info": { - "package_name": "com.example.android.dailygoals" + "package_name": "com.example.dhananjay.dailygoals" } }, "oauth_client": [ @@ -52,4 +52,4 @@ } ], "configuration_version": "1" -} \ No newline at end of file +} From b961691cc1554b3795c811d0ed7ae6f09c4dd008 Mon Sep 17 00:00:00 2001 From: PRISHIta123 Date: Fri, 11 May 2018 11:41:39 +0530 Subject: [PATCH 06/19] Changed username in google-services.json file --- app/google-services.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/google-services.json b/app/google-services.json index 575c23a..b8d9db9 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -10,7 +10,7 @@ "client_info": { "mobilesdk_app_id": "1:891850808493:android:def136320218cb3a", "android_client_info": { - "package_name": "com.example.android.dailygoals" + "package_name": "com.example.dhananjay.dailygoals" } }, "oauth_client": [ From a08a17510dc47121b0741361baca97662e1b16fe Mon Sep 17 00:00:00 2001 From: PRISHIta123 Date: Fri, 11 May 2018 11:47:45 +0530 Subject: [PATCH 07/19] Added Caches folder to .idea --- .idea/caches/build_file_checksums.ser | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .idea/caches/build_file_checksums.ser diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000..e69de29 From 7f1785214c2f3c9cc5f4f2c54fecd0ba3bd77517 Mon Sep 17 00:00:00 2001 From: PRISHIta123 Date: Fri, 11 May 2018 11:49:37 +0530 Subject: [PATCH 08/19] Added codeStyles folder to .idea --- .idea/codeStyles/Project.xml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .idea/codeStyles/Project.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..4526f4d --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file From e0b44df1012ede80f5ba898ea354961400631192 Mon Sep 17 00:00:00 2001 From: Prishita Ray <30746562+PRISHIta123@users.noreply.github.com> Date: Fri, 11 May 2018 12:04:13 +0530 Subject: [PATCH 09/19] Updates misc.xml --- .idea/misc.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index cc72de3..1d01005 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,11 +5,12 @@ @@ -24,7 +25,7 @@ - + @@ -46,4 +47,4 @@ - \ No newline at end of file + From d4adf391647baef9cf485038d3036503fb94622a Mon Sep 17 00:00:00 2001 From: Prishita Ray <30746562+PRISHIta123@users.noreply.github.com> Date: Sat, 12 May 2018 15:08:54 +0530 Subject: [PATCH 10/19] Update local.properties --- local.properties | 5 ----- 1 file changed, 5 deletions(-) diff --git a/local.properties b/local.properties index 090c5a1..332ee37 100644 --- a/local.properties +++ b/local.properties @@ -7,9 +7,4 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -<<<<<<< HEAD -#Mon Apr 30 19:44:24 IST 2018 -======= -#Tue May 01 16:13:00 IST 2018 ->>>>>>> 21d3af8297b986334e9cda5e44ad859ccc527cbe sdk.dir=C\:\\Users\\Madhav Bangaru\\AppData\\Local\\Android\\Sdk From 5c7f11e0ecfa302e362140fd436663ebf846abf4 Mon Sep 17 00:00:00 2001 From: Prishita Ray <30746562+PRISHIta123@users.noreply.github.com> Date: Sat, 12 May 2018 15:31:17 +0530 Subject: [PATCH 11/19] Update google-services.json From 5a8c3eaee7fafc1a2bdc7b42ba93acf5d87e7402 Mon Sep 17 00:00:00 2001 From: PRISHIta123 Date: Sat, 12 May 2018 15:41:42 +0530 Subject: [PATCH 12/19] Added files for Opening windows for each Activity , Goals completed Value to be updated at each click --- .../dhananjay/dailygoals/Breakfast.java | 13 ++++++++ .../example/dhananjay/dailygoals/Dinner.java | 13 ++++++++ .../example/dhananjay/dailygoals/Games.java | 13 ++++++++ .../example/dhananjay/dailygoals/Lunch.java | 13 ++++++++ .../example/dhananjay/dailygoals/Study1.java | 13 ++++++++ .../example/dhananjay/dailygoals/Study2.java | 13 ++++++++ app/src/main/res/layout/breakfast.xml | 33 +++++++++++++++++++ app/src/main/res/layout/dinner.xml | 33 +++++++++++++++++++ app/src/main/res/layout/games.xml | 33 +++++++++++++++++++ app/src/main/res/layout/lunch.xml | 33 +++++++++++++++++++ app/src/main/res/layout/study1.xml | 33 +++++++++++++++++++ app/src/main/res/layout/study2.xml | 33 +++++++++++++++++++ 12 files changed, 276 insertions(+) create mode 100644 app/src/main/java/com/example/dhananjay/dailygoals/Breakfast.java create mode 100644 app/src/main/java/com/example/dhananjay/dailygoals/Dinner.java create mode 100644 app/src/main/java/com/example/dhananjay/dailygoals/Games.java create mode 100644 app/src/main/java/com/example/dhananjay/dailygoals/Lunch.java create mode 100644 app/src/main/java/com/example/dhananjay/dailygoals/Study1.java create mode 100644 app/src/main/java/com/example/dhananjay/dailygoals/Study2.java create mode 100644 app/src/main/res/layout/breakfast.xml create mode 100644 app/src/main/res/layout/dinner.xml create mode 100644 app/src/main/res/layout/games.xml create mode 100644 app/src/main/res/layout/lunch.xml create mode 100644 app/src/main/res/layout/study1.xml create mode 100644 app/src/main/res/layout/study2.xml diff --git a/app/src/main/java/com/example/dhananjay/dailygoals/Breakfast.java b/app/src/main/java/com/example/dhananjay/dailygoals/Breakfast.java new file mode 100644 index 0000000..e6e585b --- /dev/null +++ b/app/src/main/java/com/example/dhananjay/dailygoals/Breakfast.java @@ -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); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/dhananjay/dailygoals/Dinner.java b/app/src/main/java/com/example/dhananjay/dailygoals/Dinner.java new file mode 100644 index 0000000..b216523 --- /dev/null +++ b/app/src/main/java/com/example/dhananjay/dailygoals/Dinner.java @@ -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); + } +} diff --git a/app/src/main/java/com/example/dhananjay/dailygoals/Games.java b/app/src/main/java/com/example/dhananjay/dailygoals/Games.java new file mode 100644 index 0000000..984f6ca --- /dev/null +++ b/app/src/main/java/com/example/dhananjay/dailygoals/Games.java @@ -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); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/dhananjay/dailygoals/Lunch.java b/app/src/main/java/com/example/dhananjay/dailygoals/Lunch.java new file mode 100644 index 0000000..42ad160 --- /dev/null +++ b/app/src/main/java/com/example/dhananjay/dailygoals/Lunch.java @@ -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); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/dhananjay/dailygoals/Study1.java b/app/src/main/java/com/example/dhananjay/dailygoals/Study1.java new file mode 100644 index 0000000..b77aec5 --- /dev/null +++ b/app/src/main/java/com/example/dhananjay/dailygoals/Study1.java @@ -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); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/dhananjay/dailygoals/Study2.java b/app/src/main/java/com/example/dhananjay/dailygoals/Study2.java new file mode 100644 index 0000000..c10870a --- /dev/null +++ b/app/src/main/java/com/example/dhananjay/dailygoals/Study2.java @@ -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); + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/breakfast.xml b/app/src/main/res/layout/breakfast.xml new file mode 100644 index 0000000..766ff5f --- /dev/null +++ b/app/src/main/res/layout/breakfast.xml @@ -0,0 +1,33 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dinner.xml b/app/src/main/res/layout/dinner.xml new file mode 100644 index 0000000..f90eedb --- /dev/null +++ b/app/src/main/res/layout/dinner.xml @@ -0,0 +1,33 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/games.xml b/app/src/main/res/layout/games.xml new file mode 100644 index 0000000..f8cefa5 --- /dev/null +++ b/app/src/main/res/layout/games.xml @@ -0,0 +1,33 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/lunch.xml b/app/src/main/res/layout/lunch.xml new file mode 100644 index 0000000..9121be0 --- /dev/null +++ b/app/src/main/res/layout/lunch.xml @@ -0,0 +1,33 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/study1.xml b/app/src/main/res/layout/study1.xml new file mode 100644 index 0000000..8b7cf10 --- /dev/null +++ b/app/src/main/res/layout/study1.xml @@ -0,0 +1,33 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/study2.xml b/app/src/main/res/layout/study2.xml new file mode 100644 index 0000000..5be5f2f --- /dev/null +++ b/app/src/main/res/layout/study2.xml @@ -0,0 +1,33 @@ + + + + + + + + + \ No newline at end of file From 4d46ac2d2258c590b6f4c01448f53bc8ca4a7296 Mon Sep 17 00:00:00 2001 From: PRISHIta123 Date: Mon, 14 May 2018 10:11:44 +0530 Subject: [PATCH 13/19] Removed conflicting file --- .idea/caches/build_file_checksums.ser | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .idea/caches/build_file_checksums.ser diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser deleted file mode 100644 index e69de29..0000000 From b7b3883563e549fcd9b5ff66bfd0cfcf3f7a5351 Mon Sep 17 00:00:00 2001 From: PRISHIta123 Date: Mon, 14 May 2018 10:15:19 +0530 Subject: [PATCH 14/19] Added build_file checksums.ser --- .idea/caches/build_file_checksums.ser | Bin 0 -> 538 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .idea/caches/build_file_checksums.ser diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000000000000000000000000000000000000..d5155fd36c017fc985b19bfd5a4af9484ea257bb GIT binary patch literal 538 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}Q#7BMhIJFWRF{)3Gp Date: Mon, 14 May 2018 10:23:41 +0530 Subject: [PATCH 15/19] Modified AndroidManifest.xml --- app/src/main/AndroidManifest.xml | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 958cea9..4bd64f3 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,6 +2,8 @@ + + - - - - + + + + + + + - - - + + + - - + + \ No newline at end of file From 66954c1a81885d08fe9d34e64123ac5bfb9f6d62 Mon Sep 17 00:00:00 2001 From: PRISHIta123 Date: Mon, 14 May 2018 10:37:11 +0530 Subject: [PATCH 16/19] Removed conflicting file --- local.properties | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 local.properties diff --git a/local.properties b/local.properties deleted file mode 100644 index 332ee37..0000000 --- a/local.properties +++ /dev/null @@ -1,10 +0,0 @@ -## This file is automatically generated by Android Studio. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -sdk.dir=C\:\\Users\\Madhav Bangaru\\AppData\\Local\\Android\\Sdk From dbc89bef886941b0a8bc9c66b8f13c9e41dd7807 Mon Sep 17 00:00:00 2001 From: PRISHIta123 Date: Mon, 14 May 2018 10:41:58 +0530 Subject: [PATCH 17/19] Added file --- local.properties | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 local.properties diff --git a/local.properties b/local.properties new file mode 100644 index 0000000..35509aa --- /dev/null +++ b/local.properties @@ -0,0 +1,9 @@ +## This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +#Sun Apr 29 18:38:18 IST 2018 +ndk.dir=C\:\\Users\\shivam\\AppData\\Local\\Android\\Sdk\\ndk-bundle +sdk.dir=C\:\\Users\\shivam\\AppData\\Local\\Android\\Sdk \ No newline at end of file From 7cba73eed9ce888ea6587716c4892bcf60b1309b Mon Sep 17 00:00:00 2001 From: PRISHIta123 Date: Mon, 14 May 2018 10:45:31 +0530 Subject: [PATCH 18/19] Removed file --- local.properties | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 local.properties diff --git a/local.properties b/local.properties deleted file mode 100644 index 35509aa..0000000 --- a/local.properties +++ /dev/null @@ -1,9 +0,0 @@ -## This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -#Sun Apr 29 18:38:18 IST 2018 -ndk.dir=C\:\\Users\\shivam\\AppData\\Local\\Android\\Sdk\\ndk-bundle -sdk.dir=C\:\\Users\\shivam\\AppData\\Local\\Android\\Sdk \ No newline at end of file From 47a9d712da67681c0ad963d4ba483c1cfd815b9c Mon Sep 17 00:00:00 2001 From: PRISHIta123 Date: Mon, 14 May 2018 10:52:03 +0530 Subject: [PATCH 19/19] Added file --- local.properties | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 local.properties diff --git a/local.properties b/local.properties new file mode 100644 index 0000000..35509aa --- /dev/null +++ b/local.properties @@ -0,0 +1,9 @@ +## This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +#Sun Apr 29 18:38:18 IST 2018 +ndk.dir=C\:\\Users\\shivam\\AppData\\Local\\Android\\Sdk\\ndk-bundle +sdk.dir=C\:\\Users\\shivam\\AppData\\Local\\Android\\Sdk \ No newline at end of file