Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
e4efbc5
Changes needed to run the build
amanprataprao Nov 20, 2020
43e60b6
Merge pull request #1 from amanprataprao/master
amanprataprao Nov 20, 2020
ecf4c31
Merge pull request #2 from amanprataprao/develop
amanprataprao Nov 20, 2020
ae06b4e
Updated readme
AnishEllore Nov 20, 2020
11c65fe
Added "sort by loaction" and changed sort icon
PAVANI-BORLAKUNTA Nov 20, 2020
cff55a9
Added "sort by loaction" and changed sort icon
PAVANI-BORLAKUNTA Nov 20, 2020
e19c172
Added "sort by loaction" and changed sort icon
PAVANI-BORLAKUNTA Nov 20, 2020
4849e88
Merge pull request #3 from PAVANI-BORLAKUNTA/master
amanprataprao Nov 20, 2020
9db0ec2
Added location button
PAVANI-BORLAKUNTA Nov 20, 2020
9010f6c
Merge pull request #4 from PAVANI-BORLAKUNTA/master
amanprataprao Nov 20, 2020
2690417
Changed Empty Background Image
PAVANI-BORLAKUNTA Nov 20, 2020
6c5f5aa
Merge pull request #5 from PAVANI-BORLAKUNTA/master
amanprataprao Nov 20, 2020
220a197
Gradle changes
amanprataprao Nov 23, 2020
3895364
Merge pull request #6 from amanprataprao/develop
amanprataprao Nov 23, 2020
e5c75c3
Color changes
amanprataprao Nov 23, 2020
1347871
Merge pull request #7 from amanprataprao/develop
amanprataprao Nov 23, 2020
97a0988
Update markdown-navigator.xml
deepanshuv23 Nov 24, 2020
00e431f
added transparent bg image
PAVANI-BORLAKUNTA Nov 24, 2020
a179714
files updated
PAVANI-BORLAKUNTA Nov 24, 2020
9bb58ff
Merge pull request #9 from PAVANI-BORLAKUNTA/master
amanprataprao Nov 24, 2020
612d3c6
added default location feature
deepanshuv23 Nov 24, 2020
6cfd599
Merge pull request #10 from deepanshuv23/master
amanprataprao Nov 24, 2020
95f5540
added transparent bg image
PAVANI-BORLAKUNTA Nov 24, 2020
c866a2d
Merge pull request #11 from PAVANI-BORLAKUNTA/master
amanprataprao Nov 24, 2020
989b7c2
now working
deepanshuv23 Nov 24, 2020
bd82f8e
Merge pull request #12 from deepanshuv23/master
amanprataprao Nov 24, 2020
52c10b8
Merge branch 'develop' of https://github.com/amanprataprao/Notes into…
PAVANI-BORLAKUNTA Nov 24, 2020
a58b648
Integrated Maps search
AnishEllore Nov 24, 2020
da7167c
Merge pull request #13 from amanprataprao/dev/anish_maps
amanprataprao Nov 24, 2020
a98dcb9
Minor changes
amanprataprao Nov 24, 2020
b8e6786
added transparent bg image
PAVANI-BORLAKUNTA Nov 25, 2020
a59bc48
Sort by ditance functionality added with random locations
amanprataprao Nov 25, 2020
a2bccad
Merge pull request #15 from PAVANI-BORLAKUNTA/develop
amanprataprao Nov 25, 2020
d7050cc
Distance sorting fixed
amanprataprao Nov 26, 2020
42372fd
Gradle changes
amanprataprao Nov 26, 2020
846c8f5
Gradle changes to resolve merge conflict
amanprataprao Nov 26, 2020
c0bcfbb
Develop gradle changes to resolve merge conflict
amanprataprao Nov 26, 2020
719cc0d
Merge pull request #17 from amanprataprao/develop
amanprataprao Nov 26, 2020
dc661c4
Integrated custom location with current location
amanprataprao Nov 26, 2020
fc1b5f2
Updated street address
AnishEllore Nov 27, 2020
a3752d6
Merge pull request #18 from amanprataprao/dev/anish_maps_address
amanprataprao Nov 27, 2020
5e0c765
Hopefully this is the last commit
amanprataprao Nov 28, 2020
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
1 change: 1 addition & 0 deletions .idea/.name

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

3 changes: 3 additions & 0 deletions .idea/codeStyles/Project.xml

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

6 changes: 2 additions & 4 deletions .idea/gradle.xml

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

30 changes: 30 additions & 0 deletions .idea/jarRepositories.xml

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

10 changes: 10 additions & 0 deletions .idea/markdown-navigator-enh.xml

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

62 changes: 62 additions & 0 deletions .idea/markdown-navigator.xml

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

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.

1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Notes
App allows you to save your important informations that you need to remember.</br>
You can set notifications and share your notes.
You can also add your location

# Used technologies and Android components
- MVVM
Expand Down
8 changes: 7 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,15 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

dependencies {
implementation 'com.google.android.gms:play-services-maps:17.0.0'
implementation 'com.google.android.libraries.places:places:1.1.0'

// ViewModel and LiveData
def lifecycle_version = "2.1.0"
Expand All @@ -38,7 +44,7 @@ dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

implementation 'com.google.android.gms:play-services-location:17.0.0'
// Toasty
implementation 'com.github.GrenderG:Toasty:1.4.2'

Expand Down
18 changes: 13 additions & 5 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,24 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="patryk.tasks">

<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.INTERNET"/>
<application
android:allowBackup="true"
android:allowBackup="false"
android:hardwareAccelerated="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<meta-data
android:name="com.google.android.geo.API_KEY"
android:value="@string/google_maps_key" />
<activity android:name=".activities.SearchActivity"/>
<activity android:name=".activities.MapsActivity"
android:theme="@style/AppTheme.NoActionBar"/>

<receiver android:name="com.allyants.notifyme.NotificationPublisher" />
<receiver android:name="com.allyants.notifyme.BootNotifyMe">
Expand All @@ -23,7 +31,7 @@
</receiver>

<activity
android:name="patryk.tasks.activities.MainActivity"
android:name=".activities.MainActivity"
android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand All @@ -32,8 +40,8 @@
</intent-filter>
</activity>
<activity
android:name="patryk.tasks.activities.AddEditActivity"
android:parentActivityName="patryk.tasks.activities.MainActivity" />
android:name=".activities.AddEditActivity"
android:parentActivityName=".activities.MainActivity" />

<meta-data
android:name="preloaded_fonts"
Expand Down
58 changes: 57 additions & 1 deletion app/src/main/java/patryk/tasks/activities/AddEditActivity.java
Original file line number Diff line number Diff line change
@@ -1,25 +1,30 @@
package patryk.tasks.activities;

import android.app.Activity;
import android.app.DatePickerDialog;
import android.app.Dialog;
import android.app.TimePickerDialog;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.DatePicker;
import android.widget.EditText;
import android.widget.NumberPicker;
import android.widget.TimePicker;
import android.widget.Toast;

import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.DialogFragment;

import com.allyants.notifyme.NotifyMe;
import com.google.android.gms.maps.model.LatLng;

import java.text.DateFormat;
import java.text.SimpleDateFormat;
Expand All @@ -31,11 +36,14 @@
import patryk.tasks.R;

public class AddEditActivity extends AppCompatActivity {
private final int MY_LOCATION_ACTIVITY = 500;

public static final String EXTRA_ID = "package patryk.notes.EXTRA_ID";
public static final String EXTRA_TEXT = "package patryk.notes.EXTRA_TEXT";
public static final String EXTRA_DATE = "package patryk.notes.EXTRA_DATE";
public static final String EXTRA_PRIORITY = "package patryk.notes.EXTRA_PRIORITY";
public static final String EXTRA_LAT = "package patryk.notes.EXTRA_LAT";
public static final String EXTRA_LNG = "package patryk.notes.EXTRA_Lng";
private static final Calendar calendar = Calendar.getInstance();
public static boolean IS_ADD_ACTIVITY;
private static Intent intent = new Intent();
Expand All @@ -46,6 +54,7 @@ public class AddEditActivity extends AppCompatActivity {
private EditText userInput;
private NumberPicker priority;
private Intent incomingIntent;
public LatLng selectedLocation;

@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
Expand Down Expand Up @@ -91,6 +100,44 @@ public boolean onCreateOptionsMenu(Menu menu) {

return true;
}
public void selectLocationResult(View view){

// Intent resultIntent = new Intent();
// // TODO Add extras or a data URI to this intent as appropriate.
// final LatLng latLng = GlobalMarker.getPosition();
// resultIntent.putExtra("latLng", latLng);
// setResult(Activity.RESULT_OK, resultIntent);
// finish();

Intent intent = new Intent(AddEditActivity.this, SearchActivity.class);

startActivityForResult(intent, MY_LOCATION_ACTIVITY);

}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
switch(requestCode) {
case (MY_LOCATION_ACTIVITY) : {
if (resultCode == Activity.RESULT_OK) {
// TODO Extract the data returned from the child Activity.
selectedLocation = data.getExtras().getParcelable("latLng");
String streetAddress = data.getExtras().getString("streetAddress");

if(selectedLocation!=null){
//Toast.makeText(AddEditActivity.this, ""+selectedLocation.latitude, Toast.LENGTH_SHORT).show();
Toast.makeText(AddEditActivity.this, ""+streetAddress, Toast.LENGTH_LONG).show();

}
else{
Toast.makeText(AddEditActivity.this, "No location selected", Toast.LENGTH_SHORT).show();
}

}
break;
}
}
}

@Override
public boolean onOptionsItemSelected(MenuItem item) {
Expand Down Expand Up @@ -128,7 +175,16 @@ private void saveNote() {
if (id != -1) {
intent.putExtra(EXTRA_ID, id);
}

if(selectedLocation == null)
{
intent.putExtra(EXTRA_LAT, -500);
intent.putExtra(EXTRA_LNG, -500);
}
else
{
intent.putExtra(EXTRA_LAT, selectedLocation.latitude);
intent.putExtra(EXTRA_LNG, selectedLocation.longitude);
}
// Pick date for the note
datePickerDialogFragment.setFlag(DatePickerDialogFragment.FLAG_SAVE_NOTE);
datePickerDialogFragment.show(getSupportFragmentManager(), "datePicker");
Expand Down
Loading