penguin86/nextcloud-maps-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Flow fix

Browse Source
This commit is contained in:
Daniele Verducci (Slimpenguin) 2022-01-14 08:39:34 +01:00
parent 15c11a33ee
commit a40b64baca
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/it/danieleverducci/nextcloudmaps/activity/detail/GeofavoriteDetailActivity.java
View File

@ -53,6 +53,7 @@ import java.util.HashSet;
import it.danieleverducci.nextcloudmaps.BuildConfig; import it.danieleverducci.nextcloudmaps.BuildConfig;
import it.danieleverducci.nextcloudmaps.R; import it.danieleverducci.nextcloudmaps.R;
import it.danieleverducci.nextcloudmaps.activity.mappicker.MapPickerActivity;
import it.danieleverducci.nextcloudmaps.databinding.ActivityGeofavoriteDetailBinding; import it.danieleverducci.nextcloudmaps.databinding.ActivityGeofavoriteDetailBinding;
import it.danieleverducci.nextcloudmaps.model.Geofavorite; import it.danieleverducci.nextcloudmaps.model.Geofavorite;
import it.danieleverducci.nextcloudmaps.utils.GeoUriParser; import it.danieleverducci.nextcloudmaps.utils.GeoUriParser;
@ -87,6 +88,11 @@ public class GeofavoriteDetailActivity extends AppCompatActivity implements Loca
finish(); finish();
} }
@Override
public void onMapEditPressed() {
//TODO
}
@Override @Override
public void onActionIconShareClicked() { public void onActionIconShareClicked() {
startActivity(Intent.createChooser(IntentGenerator.newShareIntent(GeofavoriteDetailActivity.this, mGeofavorite), getString(R.string.share_via))); startActivity(Intent.createChooser(IntentGenerator.newShareIntent(GeofavoriteDetailActivity.this, mGeofavorite), getString(R.string.share_via)));
@ -407,6 +413,9 @@ public class GeofavoriteDetailActivity extends AppCompatActivity implements Loca
if (v.getId() == R.id.back_bt && this.listener != null) { if (v.getId() == R.id.back_bt && this.listener != null) {
this.listener.onBackPressed(); this.listener.onBackPressed();
} }
if (v.getId() == R.id.manual_pos_bt && this.listener != null) {
this.listener.onMapEditPressed();
}
// Actions // Actions
if (v.getId() == R.id.action_icon_share && this.listener != null) { if (v.getId() == R.id.action_icon_share && this.listener != null) {
@ -425,6 +434,7 @@ public class GeofavoriteDetailActivity extends AppCompatActivity implements Loca
void onSubmit(); void onSubmit();
void onMapClicked(); void onMapClicked();
void onBackPressed(); void onBackPressed();
void onMapEditPressed();
void onActionIconShareClicked(); void onActionIconShareClicked();
void onActionIconNavClicked(); void onActionIconNavClicked();
void onActionIconDeleteClicked(); void onActionIconDeleteClicked();

1
app/src/main/java/it/danieleverducci/nextcloudmaps/activity/mappicker/MapPickerActivity.java
View File

@ -70,6 +70,7 @@ public class MapPickerActivity extends AppCompatActivity {
Intent i = new Intent(MapPickerActivity.this, GeofavoriteDetailActivity.class); Intent i = new Intent(MapPickerActivity.this, GeofavoriteDetailActivity.class);
i.setData(geoUri); i.setData(geoUri);
startActivity(i); startActivity(i);
finish();
} }
}); });
Location l = getLastKnownPosition(); Location l = getLastKnownPosition();