Cleanup: clarify options for Marker.TypeLocalized.

This commit is contained in:
Dennis Guse
2025-12-03 19:17:41 +01:00
parent 4c55468571
commit 0774ee512f
2 changed files with 9 additions and 3 deletions
@@ -16,9 +16,12 @@
package de.dennisguse.opentracks.data.tables;
import android.content.Context;
import android.net.Uri;
import android.provider.BaseColumns;
import android.widget.ArrayAdapter;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.data.ContentProviderUtils;
/**
@@ -66,4 +69,8 @@ public interface MarkerColumns extends BaseColumns {
+ ")";
String CREATE_TABLE_INDEX = "CREATE INDEX " + TABLE_NAME + "_" + TRACKID + "_index ON " + TABLE_NAME + "(" + TRACKID + ")";
static ArrayAdapter<CharSequence> getTypes(Context context) {
return ArrayAdapter.createFromResource(context, R.array.marker_types, android.R.layout.simple_dropdown_item_1line);
}
}
@@ -30,7 +30,6 @@ import android.util.Pair;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.Toast;
import androidx.activity.result.ActivityResultLauncher;
@@ -49,6 +48,7 @@ import de.dennisguse.opentracks.data.models.Marker;
import de.dennisguse.opentracks.data.models.Position;
import de.dennisguse.opentracks.data.models.Track;
import de.dennisguse.opentracks.data.models.TrackPoint;
import de.dennisguse.opentracks.data.tables.MarkerColumns;
import de.dennisguse.opentracks.databinding.MarkerEditBinding;
/**
@@ -111,8 +111,7 @@ public class MarkerEditActivity extends AbstractActivity {
hasCamera = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY);
// Setup UI elements
ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.marker_types, android.R.layout.simple_dropdown_item_1line);
viewBinding.markerEditMarkerType.setAdapter(adapter);
viewBinding.markerEditMarkerType.setAdapter(MarkerColumns.getTypes(this));
viewBinding.markerEditPhotoDelete.setOnClickListener(v -> viewModel.onPhotoDelete(viewBinding.markerEditName.getText().toString(),
viewBinding.markerEditMarkerType.getText().toString(),
viewBinding.markerEditDescription.getText().toString()));