Skip to content

Commit

Permalink
## 4.5.1.11
Browse files Browse the repository at this point in the history
* Feature Addition
  * Enabling the cot type picker in the civilian builds
  • Loading branch information
takdeveloper committed Jul 6, 2022
1 parent 94e275d commit c327894
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 28 deletions.
5 changes: 5 additions & 0 deletions VERSION.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Version History

## 4.5.1.11

* Feature Addition
* Enabling the cot type picker in the civilian builds

## 4.5.1.10

* Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion atak/ATAK/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ buildscript {
apply from: '../../gradle/versions.gradle', to: project

ext.ATAK_VERSION = "4.5.1"
ext.ATAK_VERSION_SUBMINOR = ".10"
ext.ATAK_VERSION_SUBMINOR = ".11"

ext.isDevKitEnabled = { ->
return getProperty('takRepoMavenUrl', null) != null &&
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,14 @@
import android.widget.ToggleButton;

import com.atakmap.android.cotdetails.extras.ExtraDetailsLayout;
import com.atakmap.android.hashtags.view.RemarksLayout;

import com.atakmap.android.cotselector.CoTSelector;
import com.atakmap.android.drawing.details.GenericDetailsView;
import com.atakmap.android.gui.ColorPalette;
import com.atakmap.android.gui.ColorPalette.OnColorSelectedListener;
import com.atakmap.android.gui.CoordDialogView;
import com.atakmap.android.gui.RangeAndBearingTableHandler;
import com.atakmap.android.gui.RangeEntryDialog;
import com.atakmap.android.hashtags.view.RemarksLayout;
import com.atakmap.android.icons.Icon2525cTypeResolver;
import com.atakmap.android.icons.UserIcon;
import com.atakmap.android.image.ImageGalleryReceiver;
Expand All @@ -62,8 +61,8 @@
import com.atakmap.android.util.SimpleItemSelectedListener;
import com.atakmap.android.util.SpeedFormatter;
import com.atakmap.app.R;
import com.atakmap.app.system.FlavorProvider;
import com.atakmap.app.system.SystemComponentLoader;
import com.atakmap.coremap.conversions.Angle;
import com.atakmap.coremap.conversions.AngleUtilities;
import com.atakmap.coremap.conversions.CoordinateFormat;
import com.atakmap.coremap.conversions.Span;
import com.atakmap.coremap.conversions.SpanUtilities;
Expand All @@ -72,11 +71,8 @@
import com.atakmap.coremap.log.Log;
import com.atakmap.coremap.maps.coords.ErrorCategory;
import com.atakmap.coremap.maps.coords.GeoPoint;

import com.atakmap.coremap.conversions.Angle;
import com.atakmap.coremap.maps.coords.GeoPointMetaData;
import com.atakmap.coremap.maps.coords.NorthReference;
import com.atakmap.coremap.conversions.AngleUtilities;
import com.atakmap.map.CameraController;

import java.util.Date;
Expand Down Expand Up @@ -709,14 +705,6 @@ public void onCheckedChanged(
});

selector = new CoTSelector(mapView);

// check to see what type is being built - capabilities wise
FlavorProvider fp = SystemComponentLoader.getFlavorProvider();
if (fp == null || !fp.hasMilCapabilities()) {
findViewById(R.id.cotInfoCotLayout).setVisibility(View.GONE);
findViewById(R.id.cotInfoCotTitle).setVisibility(View.GONE);
}

}

private void _updateColorButtonDrawable() {
Expand Down
4 changes: 2 additions & 2 deletions depends/LASzip-3.4.3-mod.tar.gz
Git LFS file not shown
4 changes: 2 additions & 2 deletions depends/assimp-4.0.1-mod.tar.gz
Git LFS file not shown
4 changes: 2 additions & 2 deletions depends/gdal-2.4.4-mod.tar.gz
Git LFS file not shown
4 changes: 2 additions & 2 deletions depends/libLAS-1.8.2-mod.tar.gz
Git LFS file not shown
4 changes: 2 additions & 2 deletions depends/tinygltf-2.4.1-mod.tar.gz
Git LFS file not shown
4 changes: 2 additions & 2 deletions depends/tinygltfloader-0.9.5-mod.tar.gz
Git LFS file not shown
Binary file modified pluginsdk.zip
Binary file not shown.

0 comments on commit c327894

Please sign in to comment.