kopia lustrzana https://github.com/sh123/codec2_talkie
Added map view
rodzic
424e3c87fa
commit
3c2bdb6128
|
@ -59,6 +59,9 @@
|
||||||
<activity
|
<activity
|
||||||
android:name=".storage.message.MessageItemActivity"
|
android:name=".storage.message.MessageItemActivity"
|
||||||
android:configChanges="orientation|screenSize" />
|
android:configChanges="orientation|screenSize" />
|
||||||
|
<activity
|
||||||
|
android:name=".maps.MapActivity"
|
||||||
|
android:configChanges="orientation|screenSize" />
|
||||||
<activity
|
<activity
|
||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
android:configChanges="orientation|screenSize">
|
android:configChanges="orientation|screenSize">
|
||||||
|
|
|
@ -53,6 +53,7 @@ import com.radio.codec2talkie.connect.BleConnectActivity;
|
||||||
import com.radio.codec2talkie.connect.BluetoothConnectActivity;
|
import com.radio.codec2talkie.connect.BluetoothConnectActivity;
|
||||||
import com.radio.codec2talkie.connect.BluetoothSocketHandler;
|
import com.radio.codec2talkie.connect.BluetoothSocketHandler;
|
||||||
import com.radio.codec2talkie.connect.TcpIpConnectActivity;
|
import com.radio.codec2talkie.connect.TcpIpConnectActivity;
|
||||||
|
import com.radio.codec2talkie.maps.MapActivity;
|
||||||
import com.radio.codec2talkie.settings.SettingsWrapper;
|
import com.radio.codec2talkie.settings.SettingsWrapper;
|
||||||
import com.radio.codec2talkie.storage.log.LogItemActivity;
|
import com.radio.codec2talkie.storage.log.LogItemActivity;
|
||||||
import com.radio.codec2talkie.protocol.ProtocolFactory;
|
import com.radio.codec2talkie.protocol.ProtocolFactory;
|
||||||
|
@ -379,6 +380,9 @@ public class MainActivity extends AppCompatActivity implements ServiceConnection
|
||||||
_logViewActivityLauncher.launch(new Intent(this, LogItemActivity.class));
|
_logViewActivityLauncher.launch(new Intent(this, LogItemActivity.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected void startMapViewActivity() {
|
||||||
|
_logViewActivityLauncher.launch(new Intent(this, MapActivity.class));
|
||||||
|
}
|
||||||
private final ActivityResultLauncher<Intent> _settingsActivityLauncher = registerForActivityResult(
|
private final ActivityResultLauncher<Intent> _settingsActivityLauncher = registerForActivityResult(
|
||||||
new ActivityResultContracts.StartActivityForResult(), result -> restartApplication());
|
new ActivityResultContracts.StartActivityForResult(), result -> restartApplication());
|
||||||
|
|
||||||
|
@ -605,6 +609,10 @@ public class MainActivity extends AppCompatActivity implements ServiceConnection
|
||||||
startLogViewActivity();
|
startLogViewActivity();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
else if (itemId == R.id.aprs_map) {
|
||||||
|
startMapViewActivity();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,47 @@
|
||||||
|
package com.radio.codec2talkie.maps;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.view.MenuItem;
|
||||||
|
|
||||||
|
import androidx.appcompat.app.ActionBar;
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
|
||||||
|
import com.radio.codec2talkie.R;
|
||||||
|
|
||||||
|
import org.osmdroid.config.Configuration;
|
||||||
|
import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
|
||||||
|
import org.osmdroid.views.MapView;
|
||||||
|
|
||||||
|
public class MapActivity extends AppCompatActivity {
|
||||||
|
private static final String TAG = MapActivity.class.getSimpleName();
|
||||||
|
|
||||||
|
private MapView map = null;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setTitle(R.string.menu_aprs_map);
|
||||||
|
setContentView(R.layout.activity_map_view);
|
||||||
|
ActionBar actionBar = getSupportActionBar();
|
||||||
|
if (actionBar != null) actionBar.setDisplayHomeAsUpEnabled(true);
|
||||||
|
|
||||||
|
map = findViewById(R.id.map);
|
||||||
|
map.setTileSource(TileSourceFactory.MAPNIK);
|
||||||
|
map.setMultiTouchControls(true);
|
||||||
|
|
||||||
|
Configuration.getInstance().setUserAgentValue("C2T");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onOptionsItemSelected(MenuItem item)
|
||||||
|
{
|
||||||
|
int itemId = item.getItemId();
|
||||||
|
|
||||||
|
if (itemId == android.R.id.home) {
|
||||||
|
finish();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return super.onOptionsItemSelected(item);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,9 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="fill_parent">
|
||||||
|
<org.osmdroid.views.MapView android:id="@+id/map"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="fill_parent" />
|
||||||
|
</LinearLayout>
|
|
@ -13,6 +13,9 @@
|
||||||
<item
|
<item
|
||||||
android:id="@+id/aprs_log"
|
android:id="@+id/aprs_log"
|
||||||
android:title="@string/menu_aprs_log" />
|
android:title="@string/menu_aprs_log" />
|
||||||
|
<item
|
||||||
|
android:id="@+id/aprs_map"
|
||||||
|
android:title="@string/menu_aprs_map" />
|
||||||
</group>
|
</group>
|
||||||
<group android:id="@+id/group_main">
|
<group android:id="@+id/group_main">
|
||||||
<item
|
<item
|
||||||
|
|
|
@ -354,4 +354,5 @@
|
||||||
<string name="aprsis_wrong_pass">APRS-IS wrong pass</string>
|
<string name="aprsis_wrong_pass">APRS-IS wrong pass</string>
|
||||||
<string name="aprs_is_enable_self_title">Enable own APRS to APRS-IS</string>
|
<string name="aprs_is_enable_self_title">Enable own APRS to APRS-IS</string>
|
||||||
<string name="aprs_is_enable_self_summary">Send own APRS data to APRS-IS in addition to currently selected transport</string>
|
<string name="aprs_is_enable_self_summary">Send own APRS data to APRS-IS in addition to currently selected transport</string>
|
||||||
|
<string name="menu_aprs_map">Map</string>
|
||||||
</resources>
|
</resources>
|
Ładowanie…
Reference in New Issue