Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Cleared colors and styles, basic application-wide dark theme setup
Arty Bishop4e9b312ae52f
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.ktindex 27a556e3..9b4485b7 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt@@ -41,7 +41,7 @@ class EntriesFragment : Fragment(R.layout.fragment_entries) {val linearLayoutMgr = LinearLayoutManager(requireContext())val divider = DividerItemDecoration(requireContext(), linearLayoutMgr.orientation)val drawable = ResourcesCompat- .getDrawable(resources, R.drawable.entries_divider, requireActivity().theme)+ .getDrawable(resources, R.drawable.rec_entries_divider, requireActivity().theme)drawable?.let { divider.setDrawable(it) }layoutManager = linearLayoutMgradapter = entriesAdapterdiff --git a/app/src/main/java/com/rtbishop/look4sat/ui/views/PolarView.kt b/app/src/main/java/com/rtbishop/look4sat/ui/views/PolarView.ktindex 4f692a8f..c5af45c8 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/views/PolarView.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/views/PolarView.kt@@ -29,13 +29,13 @@ class PolarView(context: Context) : View(context) {private val radarPaint = Paint().apply {isAntiAlias = true- color = ContextCompat.getColor(context, R.color.themePrimText)+ color = ContextCompat.getColor(context, R.color.onPrimary)style = Paint.Style.STROKEstrokeWidth = scale}private val txtPaint = Paint().apply {isAntiAlias = true- color = ContextCompat.getColor(context, R.color.themeAccent)+ color = ContextCompat.getColor(context, R.color.secondary)textSize = txtSize}private val trackPaint = Paint().apply {@@ -46,7 +46,7 @@ class PolarView(context: Context) : View(context) {}private val satPaint = Paint().apply {isAntiAlias = true- color = ContextCompat.getColor(context, R.color.themeAccent)+ color = ContextCompat.getColor(context, R.color.secondary)style = Paint.Style.FILL}diff --git a/app/src/main/res/color/nav_bottom_item.xml b/app/src/main/res/color/nav_bottom_item.xmlnew file mode 100644index 00000000..7c57159d--- /dev/null+++ b/app/src/main/res/color/nav_bottom_item.xml@@ -0,0 +1,5 @@+<?xml version="1.0" encoding="utf-8"?>+<selector xmlns:android="http://schemas.android.com/apk/res/android">+ <item android:color="@color/secondary" android:state_selected="true" />+ <item android:color="@color/onPrimary" />+</selector>\ No newline at end of filediff --git a/app/src/main/res/color/nav_item_selector.xml b/app/src/main/res/color/nav_item_selector.xmldeleted file mode 100644index 9a61fd78..00000000--- a/app/src/main/res/color/nav_item_selector.xml+++ /dev/null@@ -1,5 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<selector xmlns:android="http://schemas.android.com/apk/res/android">- <item android:color="@color/themeAccent" android:state_selected="true" />- <item android:color="@color/themePrimText" />-</selector>\ No newline at end of filediff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xmlindex 185e6535..5c247365 100644--- a/app/src/main/res/drawable/ic_add.xml+++ b/app/src/main/res/drawable/ic_add.xml@@ -4,6 +4,6 @@android:viewportWidth="24"android:viewportHeight="24"><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /></vector>diff --git a/app/src/main/res/drawable/ic_arrow.xml b/app/src/main/res/drawable/ic_arrow.xmlindex 221e9ac9..2894e824 100644--- a/app/src/main/res/drawable/ic_arrow.xml+++ b/app/src/main/res/drawable/ic_arrow.xml@@ -23,6 +23,6 @@android:viewportWidth="24"android:viewportHeight="24"><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z" /></vector>diff --git a/app/src/main/res/drawable/ic_fdroid_logo.xml b/app/src/main/res/drawable/ic_fdroid.xmlsimilarity index 97%rename from app/src/main/res/drawable/ic_fdroid_logo.xmlrename to app/src/main/res/drawable/ic_fdroid.xmlindex 3a910813..29c4eb57 100644--- a/app/src/main/res/drawable/ic_fdroid_logo.xml+++ b/app/src/main/res/drawable/ic_fdroid.xml@@ -5,7 +5,7 @@android:viewportWidth="48"android:viewportHeight="48"><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M8,20.0449C7.7923,20.0449 7.5902,20.0656 7.3945,20.1055C6.8076,20.225 6.2836,20.5152 5.877,20.9219C5.4703,21.3286 5.18,21.8506 5.0605,22.4375C5.0207,22.6331 5,22.8372 5,23.0449L5,30.0449L5,42.2754L5,43.0449C5,43.6682 5.1889,44.246 5.5117,44.7246C6.0498,45.5224 6.9612,46.0449 8,46.0449L40,46.0449C41.0387,46.0449 41.9502,45.5224 42.4883,44.7246C42.5959,44.5651 42.6899,44.3944 42.7656,44.2148C42.917,43.8557 43,43.4604 43,43.0449L43,42.2754L43,36.0449L43,23.8125L43,23.0449C43,22.6294 42.917,22.2342 42.7656,21.875C42.6899,21.6954 42.5959,21.5248 42.4883,21.3652C41.9502,20.5675 41.0387,20.0449 40,20.0449L8,20.0449zM24,22.5254A10.5182,10.5182 0,0 1,34.5176 33.0449A10.5182,10.5182 0,0 1,24 43.5625A10.5182,10.5182 0,0 1,13.4824 33.0449A10.5182,10.5182 0,0 1,24 22.5254zM24,24.4492A8.5958,8.5958 0,0 0,15.4043 33.0449A8.5958,8.5958 0,0 0,24 41.6406A8.5958,8.5958 0,0 0,32.5957 33.0449A8.5958,8.5958 0,0 0,24 24.4492zM24,26.75C27.434,26.75 30.25,29.566 30.25,33C30.25,36.434 27.434,39.25 24,39.25C21.0479,39.25 18.5583,37.1661 17.916,34.4004L21.0703,34.4004C21.5888,35.4973 22.6926,36.25 24,36.25C25.8127,36.25 27.25,34.8127 27.25,33C27.25,31.1873 25.8127,29.75 24,29.75C22.7748,29.75 21.734,30.415 21.1797,31.4004L17.9668,31.4004C18.6802,28.7347 21.1193,26.75 24,26.75z"android:strokeWidth="2"android:strokeColor="#00000000"@@ -13,7 +13,7 @@android:strokeLineJoin="miter"tools:ignore="VectorPath" /><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M2.3379,1.5254C1.8997,1.5254 1.378,1.6672 1.5137,2.3242C1.6007,2.7458 4.4144,6.2239 5.4434,7.4902C5.2677,7.7794 5.1304,8.0942 5.0605,8.4375C5.0207,8.6331 5,8.8372 5,9.0449L5,9.582L5,12.0449L5,13.0449L5,15.5059L5,16.0449C5,16.6682 5.1889,17.246 5.5117,17.7246C6.0498,18.5224 6.9612,19.0449 8,19.0449L40,19.0449C41.0387,19.0449 41.9502,18.5224 42.4883,17.7246C42.5959,17.5651 42.6899,17.3944 42.7656,17.2148C42.8413,17.0353 42.8996,16.846 42.9395,16.6504C42.9793,16.4547 43,16.2527 43,16.0449L43,15.5059L43,13.0449L43,12.0449L43,9.582L43,9.0449C43,8.8372 42.9793,8.6331 42.9395,8.4375C42.8696,8.0942 42.7323,7.7794 42.5566,7.4902C43.5856,6.2239 46.3993,2.7458 46.4863,2.3242C46.622,1.6672 46.1003,1.5254 45.6621,1.5254C45.1945,1.5396 44.8462,1.9932 44.5859,2.2832L41.3984,6.4023C40.9796,6.1808 40.5086,6.0449 40,6.0449L8,6.0449C7.7923,6.0449 7.5902,6.0656 7.3945,6.1055C7.1989,6.1453 7.0097,6.2036 6.8301,6.2793C6.7496,6.3132 6.6782,6.3618 6.6016,6.4023L3.4141,2.2832C3.1538,1.9932 2.8055,1.5396 2.3379,1.5254zM14.375,9.75A3.375,3.375 0,0 1,17.75 13.125A3.375,3.375 0,0 1,14.375 16.5A3.375,3.375 0,0 1,11 13.125A3.375,3.375 0,0 1,14.375 9.75zM33.875,9.75A3.375,3.375 0,0 1,37.25 13.125A3.375,3.375 0,0 1,33.875 16.5A3.375,3.375 0,0 1,30.5 13.125A3.375,3.375 0,0 1,33.875 9.75z"android:strokeWidth="2"android:strokeColor="#00000000"diff --git a/app/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xmlindex 72c1d085..f1582df3 100644--- a/app/src/main/res/drawable/ic_github.xml+++ b/app/src/main/res/drawable/ic_github.xml@@ -24,7 +24,7 @@android:viewportWidth="24"android:viewportHeight="24"><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M12,0.297c-6.63,0 -12,5.373 -12,12 0,5.303 3.438,9.8 8.205,11.385 0.6,0.113 0.82,-0.258 0.82,-0.577 0,-0.285 -0.01,-1.04 -0.015,-2.04 -3.338,0.724 -4.042,-1.61 -4.042,-1.61C4.422,18.07 3.633,17.7 3.633,17.7c-1.087,-0.744 0.084,-0.729 0.084,-0.729 1.205,0.084 1.838,1.236 1.838,1.236 1.07,1.835 2.809,1.305 3.495,0.998 0.108,-0.776 0.417,-1.305 0.76,-1.605 -2.665,-0.3 -5.466,-1.332 -5.466,-5.93 0,-1.31 0.465,-2.38 1.235,-3.22 -0.135,-0.303 -0.54,-1.523 0.105,-3.176 0,0 1.005,-0.322 3.3,1.23 0.96,-0.267 1.98,-0.399 3,-0.405 1.02,0.006 2.04,0.138 3,0.405 2.28,-1.552 3.285,-1.23 3.285,-1.23 0.645,1.653 0.24,2.873 0.12,3.176 0.765,0.84 1.23,1.91 1.23,3.22 0,4.61 -2.805,5.625 -5.475,5.92 0.42,0.36 0.81,1.096 0.81,2.22 0,1.606 -0.015,2.896 -0.015,3.286 0,0.315 0.21,0.69 0.825,0.57C20.565,22.092 24,17.592 24,12.297c0,-6.627 -5.373,-12 -12,-12"tools:ignore="VectorPath" /></vector>diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xmlindex 23d3d482..0764aef3 100644--- a/app/src/main/res/drawable/ic_launcher_background.xml+++ b/app/src/main/res/drawable/ic_launcher_background.xml@@ -20,6 +20,6 @@<shape xmlns:android="http://schemas.android.com/apk/res/android"android:shape="rectangle"><gradient- android:endColor="@color/darkBackground"- android:startColor="@color/darkBackground" />+ android:endColor="@color/background"+ android:startColor="@color/background" /></shape>diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xmlindex ead50a59..572bd784 100644--- a/app/src/main/res/drawable/ic_launcher_foreground.xml+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml@@ -30,10 +30,10 @@android:translateX="70.26573"android:translateY="70.26573"><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="m96.642,31.504c7.911,7.997 17.143,13.584 25.365,15.581l1.754,-3.997C123.78,43.048 123.786,43.005 123.802,42.965 125.834,38.995 127,34.495 127,29.715 127,13.881 114.379,1 98.867,1c-5.125,0 -9.92,1.429 -14.064,3.884l-3.398,1.598c0.08,0.306 0.133,0.599 0.221,0.91 2.32,8.104 7.652,16.667 15.016,24.112z" /><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M93.876,34.3C86.053,26.391 80.369,17.225 77.87,8.49 77.84,8.385 77.818,8.285 77.788,8.181L2.629,43.513c-1.404,0.66 -2.019,2.358 -1.372,3.791 0.472,1.046 1.485,1.663 2.545,1.663 0.392,0 0.79,-0.084 1.169,-0.263L74.045,16.235c-1.873,3.578 -2.997,7.611 -3.228,11.885L35.566,51.732c-1.294,0.866 -1.653,2.638 -0.805,3.957 0.538,0.836 1.431,1.29 2.344,1.29 0.526,0 1.06,-0.151 1.533,-0.469L71.189,34.707c1.4,8.11 6.135,15.044 12.715,19.285l-54.945,68.337c-0.981,1.22 -0.808,3.021 0.388,4.023 0.521,0.437 1.149,0.649 1.775,0.649 0.809,0 1.611,-0.357 2.166,-1.045L89.056,56.595c3.06,1.168 6.357,1.838 9.811,1.838 4.932,0 9.566,-1.312 13.601,-3.597L84.602,118.323c-0.633,1.44 0,3.131 1.41,3.777 0.372,0.17 0.76,0.25 1.144,0.25 1.07,0 2.092,-0.629 2.556,-1.691L120.402,50.739C111.642,48.416 102.042,42.555 93.876,34.3Z"tools:ignore="VectorPath" /></group>diff --git a/app/src/main/res/drawable/ic_map_pos.xml b/app/src/main/res/drawable/ic_map_pos.xmlindex 23dfe20f..82e171fb 100644--- a/app/src/main/res/drawable/ic_map_pos.xml+++ b/app/src/main/res/drawable/ic_map_pos.xml@@ -4,6 +4,6 @@android:viewportWidth="24"android:viewportHeight="24"><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z" /></vector>diff --git a/app/src/main/res/drawable/ic_map_sat.xml b/app/src/main/res/drawable/ic_map_sat.xmlindex cb15a017..78ead447 100644--- a/app/src/main/res/drawable/ic_map_sat.xml+++ b/app/src/main/res/drawable/ic_map_sat.xml@@ -4,6 +4,6 @@android:viewportWidth="24"android:viewportHeight="24"><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" /></vector>diff --git a/app/src/main/res/drawable/ic_menu_entries.xml b/app/src/main/res/drawable/ic_menu_entries.xmlindex 66d61d98..db477027 100644--- a/app/src/main/res/drawable/ic_menu_entries.xml+++ b/app/src/main/res/drawable/ic_menu_entries.xml@@ -5,10 +5,10 @@android:viewportWidth="128"android:viewportHeight="128"><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="m96.642,31.504c7.911,7.997 17.143,13.584 25.365,15.581l1.754,-3.997C123.78,43.048 123.786,43.005 123.802,42.965 125.834,38.995 127,34.495 127,29.715 127,13.881 114.379,1 98.867,1c-5.125,0 -9.92,1.429 -14.064,3.884l-3.398,1.598c0.08,0.306 0.133,0.599 0.221,0.91 2.32,8.104 7.652,16.667 15.016,24.112z" /><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M93.876,34.3C86.053,26.391 80.369,17.225 77.87,8.49 77.84,8.385 77.818,8.285 77.788,8.181L2.629,43.513c-1.404,0.66 -2.019,2.358 -1.372,3.791 0.472,1.046 1.485,1.663 2.545,1.663 0.392,0 0.79,-0.084 1.169,-0.263L74.045,16.235c-1.873,3.578 -2.997,7.611 -3.228,11.885L35.566,51.732c-1.294,0.866 -1.653,2.638 -0.805,3.957 0.538,0.836 1.431,1.29 2.344,1.29 0.526,0 1.06,-0.151 1.533,-0.469L71.189,34.707c1.4,8.11 6.135,15.044 12.715,19.285l-54.945,68.337c-0.981,1.22 -0.808,3.021 0.388,4.023 0.521,0.437 1.149,0.649 1.775,0.649 0.809,0 1.611,-0.357 2.166,-1.045L89.056,56.595c3.06,1.168 6.357,1.838 9.811,1.838 4.932,0 9.566,-1.312 13.601,-3.597L84.602,118.323c-0.633,1.44 0,3.131 1.41,3.777 0.372,0.17 0.76,0.25 1.144,0.25 1.07,0 2.092,-0.629 2.556,-1.691L120.402,50.739C111.642,48.416 102.042,42.555 93.876,34.3Z"tools:ignore="VectorPath" /></vector>diff --git a/app/src/main/res/drawable/ic_menu_info.xml b/app/src/main/res/drawable/ic_menu_info.xmlindex 4620235d..89031791 100644--- a/app/src/main/res/drawable/ic_menu_info.xml+++ b/app/src/main/res/drawable/ic_menu_info.xml@@ -4,6 +4,6 @@android:viewportWidth="24"android:viewportHeight="24"><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z" /></vector>diff --git a/app/src/main/res/drawable/ic_menu_map.xml b/app/src/main/res/drawable/ic_menu_map.xmlindex f8719a00..a8932207 100644--- a/app/src/main/res/drawable/ic_menu_map.xml+++ b/app/src/main/res/drawable/ic_menu_map.xml@@ -23,6 +23,6 @@android:viewportWidth="24"android:viewportHeight="24"><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z" /></vector>diff --git a/app/src/main/res/drawable/ic_menu_passes.xml b/app/src/main/res/drawable/ic_menu_passes.xmlindex 4a2250f1..52403faa 100644--- a/app/src/main/res/drawable/ic_menu_passes.xml+++ b/app/src/main/res/drawable/ic_menu_passes.xml@@ -4,6 +4,6 @@android:viewportWidth="24"android:viewportHeight="24"><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.5c-0.83,0 -1.5,0.68 -1.5,1.5s0.68,1.5 1.5,1.5 1.5,-0.68 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z" /></vector>diff --git a/app/src/main/res/drawable/ic_menu_prefs.xml b/app/src/main/res/drawable/ic_menu_prefs.xmlindex 04c3c2ef..d7cff8df 100644--- a/app/src/main/res/drawable/ic_menu_prefs.xml+++ b/app/src/main/res/drawable/ic_menu_prefs.xml@@ -23,6 +23,6 @@android:viewportWidth="24"android:viewportHeight="24"><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z" /></vector>diff --git a/app/src/main/res/drawable/ic_pass_active.xml b/app/src/main/res/drawable/ic_pass_active.xmlindex b8579448..7af13efd 100644--- a/app/src/main/res/drawable/ic_pass_active.xml+++ b/app/src/main/res/drawable/ic_pass_active.xml@@ -23,6 +23,6 @@android:viewportWidth="24"android:viewportHeight="24"><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5 5,-2.24 5,-5 -2.24,-5 -5,-5zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z" /></vector>diff --git a/app/src/main/res/drawable/ic_pass_inactive.xml b/app/src/main/res/drawable/ic_pass_inactive.xmlindex e8d43b7c..243b70a4 100644--- a/app/src/main/res/drawable/ic_pass_inactive.xml+++ b/app/src/main/res/drawable/ic_pass_inactive.xml@@ -23,6 +23,6 @@android:viewportWidth="24"android:viewportHeight="24"><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z" /></vector>diff --git a/app/src/main/res/drawable/ic_proceed.xml b/app/src/main/res/drawable/ic_proceed.xmlindex 0e761d37..5ad0a42f 100644--- a/app/src/main/res/drawable/ic_proceed.xml+++ b/app/src/main/res/drawable/ic_proceed.xml@@ -4,6 +4,6 @@android:viewportWidth="24"android:viewportHeight="24"><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z" /></vector>diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xmlindex 92e942ad..69052294 100644--- a/app/src/main/res/drawable/ic_refresh.xml+++ b/app/src/main/res/drawable/ic_refresh.xml@@ -4,6 +4,6 @@android:viewportWidth="24"android:viewportHeight="24"><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M12,6v3l4,-4 -4,-4v3c-4.42,0 -8,3.58 -8,8 0,1.57 0.46,3.03 1.24,4.26L6.7,14.8c-0.45,-0.83 -0.7,-1.79 -0.7,-2.8 0,-3.31 2.69,-6 6,-6zM18.76,7.74L17.3,9.2c0.44,0.84 0.7,1.79 0.7,2.8 0,3.31 -2.69,6 -6,6v-3l-4,4 4,4v-3c4.42,0 8,-3.58 8,-8 0,-1.57 -0.46,-3.03 -1.24,-4.26z" /></vector>diff --git a/app/src/main/res/drawable/ic_select_all.xml b/app/src/main/res/drawable/ic_select_all.xmlindex 01948a0e..b6f450cb 100644--- a/app/src/main/res/drawable/ic_select_all.xml+++ b/app/src/main/res/drawable/ic_select_all.xml@@ -4,6 +4,6 @@android:viewportWidth="24"android:viewportHeight="24"><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z" /></vector>diff --git a/app/src/main/res/drawable/ic_trans.xml b/app/src/main/res/drawable/ic_trans.xmlindex da8d3d54..12a3ae87 100644--- a/app/src/main/res/drawable/ic_trans.xml+++ b/app/src/main/res/drawable/ic_trans.xml@@ -4,6 +4,6 @@android:viewportWidth="24"android:viewportHeight="24"><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M12,11c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,13c0,-3.31 -2.69,-6 -6,-6s-6,2.69 -6,6c0,2.22 1.21,4.15 3,5.19l1,-1.74c-1.19,-0.7 -2,-1.97 -2,-3.45 0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,1.48 -0.81,2.75 -2,3.45l1,1.74c1.79,-1.04 3,-2.97 3,-5.19zM12,3C6.48,3 2,7.48 2,13c0,3.7 2.01,6.92 4.99,8.65l1,-1.73C5.61,18.53 4,15.96 4,13c0,-4.42 3.58,-8 8,-8s8,3.58 8,8c0,2.96 -1.61,5.53 -4,6.92l1,1.73c2.99,-1.73 5,-4.95 5,-8.65 0,-5.52 -4.48,-10 -10,-10z" /></vector>diff --git a/app/src/main/res/drawable/ic_trans_doppler.xml b/app/src/main/res/drawable/ic_trans_doppler.xmlindex 536164e4..7e98778d 100644--- a/app/src/main/res/drawable/ic_trans_doppler.xml+++ b/app/src/main/res/drawable/ic_trans_doppler.xml@@ -4,15 +4,15 @@android:viewportWidth="100"android:viewportHeight="100"><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M63.5,45.5c-2.485,0 -4.5,2.015 -4.5,4.5c0,2.485 2.015,4.5 4.5,4.5S68,52.485 68,50C68,47.515 65.985,45.5 63.5,45.5L63.5,45.5z" /><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M54.5,23c14.888,0 27,12.112 27,27s-12.112,27 -27,27s-27,-12.112 -27,-27S39.612,23 54.5,23M54.5,18.5C37.103,18.5 23,32.603 23,50s14.103,31.5 31.5,31.5S86,67.397 86,50S71.897,18.5 54.5,18.5L54.5,18.5z" /><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M50,9.5c22.332,0 40.5,18.168 40.5,40.5S72.332,90.5 50,90.5S9.5,72.332 9.5,50S27.668,9.5 50,9.5M50,5C25.147,5 5,25.147 5,50s20.147,45 45,45s45,-20.147 45,-45S74.853,5 50,5L50,5z" /><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M59,36.5c7.444,0 13.5,6.056 13.5,13.5c0,7.444 -6.056,13.5 -13.5,13.5c-7.444,0 -13.5,-6.056 -13.5,-13.5C45.5,42.556 51.556,36.5 59,36.5M59,32c-9.941,0 -18,8.059 -18,18s8.059,18 18,18s18,-8.059 18,-18S68.941,32 59,32L59,32z" /></vector>diff --git a/app/src/main/res/drawable/ic_update_file.xml b/app/src/main/res/drawable/ic_update_file.xmlindex 0e122f79..32103cdf 100644--- a/app/src/main/res/drawable/ic_update_file.xml+++ b/app/src/main/res/drawable/ic_update_file.xml@@ -4,6 +4,6 @@android:viewportWidth="24"android:viewportHeight="24"><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M18,2h-8L4.02,8 4,20c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM12,8h-2L10,4h2v4zM15,8h-2L13,4h2v4zM18,8h-2L16,4h2v4z" /></vector>diff --git a/app/src/main/res/drawable/ic_update_web.xml b/app/src/main/res/drawable/ic_update_web.xmlindex f6bfc51b..3d91300d 100644--- a/app/src/main/res/drawable/ic_update_web.xml+++ b/app/src/main/res/drawable/ic_update_web.xml@@ -4,6 +4,6 @@android:viewportWidth="24"android:viewportHeight="24"><path- android:fillColor="@color/themeAccent"+ android:fillColor="@color/secondary"android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z" /></vector>diff --git a/app/src/main/res/drawable/entries_divider.xml b/app/src/main/res/drawable/rec_entries_divider.xmlsimilarity index 82%rename from app/src/main/res/drawable/entries_divider.xmlrename to app/src/main/res/drawable/rec_entries_divider.xmlindex b8f65133..530c4c76 100644--- a/app/src/main/res/drawable/entries_divider.xml+++ b/app/src/main/res/drawable/rec_entries_divider.xml@@ -7,7 +7,7 @@<sizeandroid:width="1dp"android:height="0.5dp" />- <solid android:color="@color/themeSecText" />+ <solid android:color="#808080" /></shape></item></layer-list>\ No newline at end of filediff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xmlindex bd306265..a9ebd8cb 100644--- a/app/src/main/res/layout/activity_main.xml+++ b/app/src/main/res/layout/activity_main.xml@@ -20,10 +20,9 @@android:id="@+id/nav_bottom"android:layout_width="match_parent"android:layout_height="48dp"- android:background="@color/themeDark"- app:itemIconSize="24dp"- app:itemIconTint="@color/nav_item_selector"- app:itemTextColor="@color/nav_item_selector"+ android:background="@color/primary"+ app:itemIconTint="@color/nav_bottom_item"+ app:itemTextColor="@color/nav_bottom_item"app:labelVisibilityMode="labeled"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toEndOf="parent"diff --git a/app/src/main/res/layout/dialog_sources.xml b/app/src/main/res/layout/dialog_sources.xmlindex b5e80ff5..bd40ee96 100644--- a/app/src/main/res/layout/dialog_sources.xml+++ b/app/src/main/res/layout/dialog_sources.xml@@ -8,10 +8,12 @@<TextViewandroid:id="@+id/tleSourcesTitle"- style="@style/DialogText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginStart="12dp"android:layout_marginTop="10dp"android:text="@string/dialog_tle_sources"+ android:textSize="17sp"app:layout_constraintEnd_toStartOf="@+id/tleSourceBtnAdd"app:layout_constraintHorizontal_bias="0.5"app:layout_constraintHorizontal_chainStyle="spread_inside"@@ -51,27 +53,33 @@<TextViewandroid:id="@+id/tleSourcesWarning"- style="@style/DialogText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginTop="4dp"android:gravity="center"android:text="@string/https_only"+ android:textSize="17sp"app:layout_constraintStart_toStartOf="@+id/tleSourcesTitle"app:layout_constraintTop_toBottomOf="@+id/tleSourcesTitle" /><TextViewandroid:id="@+id/tleSourcesBtnNeg"- style="@style/DialogText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginEnd="24dp"android:text="@string/btn_cancel"+ android:textSize="17sp"app:layout_constraintBaseline_toBaselineOf="@+id/tleSourcesBtnPos"app:layout_constraintEnd_toStartOf="@+id/tleSourcesBtnPos"app:layout_constraintHorizontal_chainStyle="spread_inside" /><TextViewandroid:id="@+id/tleSourcesBtnPos"- style="@style/DialogText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginBottom="8dp"android:text="@string/btn_ok"+ android:textSize="17sp"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toEndOf="@+id/tleSourceBtnAdd" />diff --git a/app/src/main/res/layout/fragment_entries.xml b/app/src/main/res/layout/fragment_entries.xmlindex c880d509..6275d7fe 100644--- a/app/src/main/res/layout/fragment_entries.xml+++ b/app/src/main/res/layout/fragment_entries.xml@@ -30,7 +30,7 @@android:id="@+id/entries_bar"android:layout_width="0dp"android:layout_height="48dp"- android:background="@color/themeDark"+ android:background="@color/primary"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent" />@@ -50,7 +50,7 @@android:id="@+id/import_web"android:layout_width="64dp"android:layout_height="48dp"- android:backgroundTint="@color/darkBackground"+ android:backgroundTint="@color/background"android:contentDescription="@string/placeholder"android:src="@drawable/ic_update_web"app:layout_constraintBottom_toBottomOf="@+id/import_file"@@ -62,7 +62,7 @@android:layout_width="64dp"android:layout_height="48dp"android:layout_marginEnd="4dp"- android:backgroundTint="@color/darkBackground"+ android:backgroundTint="@color/background"android:contentDescription="@string/placeholder"android:src="@drawable/ic_update_file"app:layout_constraintEnd_toEndOf="parent"@@ -83,7 +83,7 @@android:id="@+id/select_all"android:layout_width="64dp"android:layout_height="48dp"- android:backgroundTint="@color/themeDark"+ android:backgroundTint="@color/primary"android:contentDescription="@string/placeholder"android:src="@drawable/ic_select_all"app:layout_constraintEnd_toEndOf="@+id/import_file"diff --git a/app/src/main/res/layout/fragment_info.xml b/app/src/main/res/layout/fragment_info.xmlindex 55dd463f..147a0350 100644--- a/app/src/main/res/layout/fragment_info.xml+++ b/app/src/main/res/layout/fragment_info.xml@@ -30,10 +30,13 @@<TextViewandroid:id="@+id/title"- style="@style/AboutTitle"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginStart="4dp"android:layout_marginEnd="16dp"android:text="@string/app_name"+ android:textColor="@color/secondary"+ android:textSize="42sp"app:layout_constraintBottom_toBottomOf="@+id/title_img"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintHorizontal_bias="0.5"@@ -57,38 +60,48 @@<TextViewandroid:id="@+id/version"- style="@style/AboutSubtitle"+ android:layout_width="0dp"+ android:layout_height="wrap_content"android:layout_marginStart="32dp"android:layout_marginTop="8dp"android:layout_marginEnd="32dp"+ android:gravity="center"android:text="@string/app_version"+ android:textSize="16sp"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toBottomOf="@+id/title" /><TextViewandroid:id="@+id/subtitle"- style="@style/AboutSubtitle"+ android:layout_width="0dp"+ android:layout_height="wrap_content"android:layout_marginStart="32dp"android:layout_marginTop="8dp"android:layout_marginEnd="32dp"+ android:gravity="center"android:text="@string/about_subtitle"+ android:textSize="16sp"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toBottomOf="@+id/version" /><TextViewandroid:id="@+id/thanks"- style="@style/AboutSubtitle"+ android:layout_width="0dp"+ android:layout_height="wrap_content"android:layout_marginTop="16dp"+ android:gravity="center"android:text="@string/about_thanks_to"+ android:textSize="16sp"app:layout_constraintEnd_toEndOf="@+id/subtitle"app:layout_constraintStart_toStartOf="@+id/subtitle"app:layout_constraintTop_toBottomOf="@+id/subtitle" /><TextViewandroid:id="@+id/message"- style="@style/AboutRegular"+ android:layout_width="0dp"+ android:layout_height="wrap_content"android:layout_marginStart="16dp"android:layout_marginTop="16dp"android:layout_marginEnd="16dp"diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xmlindex c24e25a0..24293b51 100644--- a/app/src/main/res/layout/fragment_map.xml+++ b/app/src/main/res/layout/fragment_map.xml@@ -42,9 +42,11 @@<TextViewandroid:id="@+id/id_name"- style="@style/MapOsmSatInfo.Name"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginTop="4dp"android:text="@string/pat_osm_idName"+ android:textColor="@color/secondary"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintHorizontal_bias="0.5"app:layout_constraintStart_toStartOf="parent"@@ -52,33 +54,41 @@<TextViewandroid:id="@+id/altitude"- style="@style/MapOsmSatInfo"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginStart="4dp"android:text="@string/pat_altitude"+ android:textColor="@color/secondary"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toBottomOf="@+id/id_name" /><TextViewandroid:id="@+id/distance"- style="@style/MapOsmSatInfo"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginBottom="4dp"android:text="@string/pat_distance"+ android:textColor="@color/secondary"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintStart_toStartOf="@+id/altitude"app:layout_constraintTop_toBottomOf="@+id/altitude" /><TextViewandroid:id="@+id/velocity"- style="@style/MapOsmSatInfo"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginEnd="4dp"android:text="@string/pat_osm_vel"+ android:textColor="@color/secondary"app:layout_constraintBaseline_toBaselineOf="@+id/altitude"app:layout_constraintEnd_toEndOf="parent" /><TextViewandroid:id="@+id/lat_lon"- style="@style/MapOsmSatInfo"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:text="@string/pat_osm_latLon"+ android:textColor="@color/secondary"app:layout_constraintBaseline_toBaselineOf="@+id/distance"app:layout_constraintEnd_toEndOf="@+id/velocity" />@@ -86,8 +96,12 @@<TextViewandroid:id="@+id/copyright"- style="@style/MapOsmCopyright"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:gravity="center"android:text="@string/osmCopyright"+ android:textColor="@color/secondary"+ android:textSize="12sp"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent" />diff --git a/app/src/main/res/layout/fragment_passes.xml b/app/src/main/res/layout/fragment_passes.xmlindex 5f7f2bba..c189418d 100644--- a/app/src/main/res/layout/fragment_passes.xml+++ b/app/src/main/res/layout/fragment_passes.xml@@ -31,7 +31,7 @@android:id="@+id/passes_bar"android:layout_width="0dp"android:layout_height="48dp"- android:background="@color/themeDark"+ android:background="@color/primary"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent" />@@ -42,7 +42,7 @@android:layout_height="wrap_content"android:fontFamily="@font/digital_dismay"android:text="@string/timer_zero"- android:textColor="@color/themeAccent"+ android:textColor="@color/secondary"android:textSize="48sp"app:layout_constraintBottom_toBottomOf="@+id/passes_bar"app:layout_constraintEnd_toEndOf="parent"diff --git a/app/src/main/res/layout/fragment_polar.xml b/app/src/main/res/layout/fragment_polar.xmlindex 2ecd4a60..dd1cbe74 100644--- a/app/src/main/res/layout/fragment_polar.xml+++ b/app/src/main/res/layout/fragment_polar.xml@@ -34,33 +34,41 @@<TextViewandroid:id="@+id/azimuth"- style="@style/PolarViewText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginStart="4dp"android:text="@string/pat_azimuth"+ android:textSize="15sp"app:layout_constraintStart_toStartOf="@+id/frame"app:layout_constraintTop_toTopOf="@+id/frame" /><TextViewandroid:id="@+id/elevation"- style="@style/PolarViewText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginEnd="4dp"android:text="@string/pat_elevation"+ android:textSize="15sp"app:layout_constraintEnd_toEndOf="@+id/frame"app:layout_constraintTop_toTopOf="@+id/frame" /><TextViewandroid:id="@+id/altitude"- style="@style/PolarViewText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginStart="4dp"android:text="@string/pat_altitude"+ android:textSize="15sp"app:layout_constraintBottom_toBottomOf="@+id/frame"app:layout_constraintStart_toStartOf="@+id/frame" /><TextViewandroid:id="@+id/distance"- style="@style/PolarViewText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginEnd="4dp"android:text="@string/pat_distance"+ android:textSize="15sp"app:layout_constraintBottom_toBottomOf="@+id/frame"app:layout_constraintEnd_toEndOf="@+id/frame" />@@ -76,11 +84,12 @@<TextViewandroid:id="@+id/no_trans_msg"- style="@style/PolarViewText"android:layout_width="0dp"+ android:layout_height="wrap_content"android:layout_marginTop="8dp"android:gravity="center"android:text="@string/no_trans"+ android:textSize="15sp"android:visibility="invisible"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintHorizontal_bias="0.5"diff --git a/app/src/main/res/layout/item_pass_geo.xml b/app/src/main/res/layout/item_pass_geo.xmlindex 4d065720..e0ee50ad 100644--- a/app/src/main/res/layout/item_pass_geo.xml+++ b/app/src/main/res/layout/item_pass_geo.xml@@ -56,8 +56,11 @@<TextViewandroid:id="@+id/pass_geo_name"- style="@style/CardPassName"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:text="@string/pass_satName"+ android:textColor="@color/secondary"+ android:textSize="16sp"app:layout_constraintBaseline_toBaselineOf="@+id/pass_geo_id"app:layout_constraintEnd_toStartOf="@+id/pass_geo_id"app:layout_constraintHorizontal_bias="0.02"@@ -65,17 +68,22 @@<TextViewandroid:id="@+id/pass_geo_id"- style="@style/CardPassName"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginTop="4dp"android:text="@string/pass_satId"+ android:textColor="@color/secondary"+ android:textSize="16sp"app:layout_constraintEnd_toEndOf="@+id/pass_geo_el"app:layout_constraintTop_toTopOf="parent" /><TextViewandroid:id="@+id/pass_geo_az"- style="@style/CardPassText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginStart="6dp"android:text="@string/pat_azimuth"+ android:textSize="15sp"app:layout_constraintBaseline_toBaselineOf="@+id/pass_geo_el"app:layout_constraintEnd_toStartOf="@+id/pass_geo_el"app:layout_constraintHorizontal_bias="0.5"@@ -84,11 +92,13 @@<TextViewandroid:id="@+id/pass_geo_el"- style="@style/CardPassText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginTop="4dp"android:layout_marginEnd="6dp"android:layout_marginBottom="4dp"android:text="@string/pat_elevation"+ android:textSize="15sp"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toEndOf="@+id/pass_geo_az"diff --git a/app/src/main/res/layout/item_pass_leo.xml b/app/src/main/res/layout/item_pass_leo.xmlindex 2a38819d..f959f4cc 100644--- a/app/src/main/res/layout/item_pass_leo.xml+++ b/app/src/main/res/layout/item_pass_leo.xml@@ -46,8 +46,10 @@<TextViewandroid:id="@+id/pass_leo_losAz"- style="@style/CardPassText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:text="@string/pass_los_az"+ android:textSize="15sp"app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_maxEl"app:layout_constraintEnd_toEndOf="@+id/pass_leo_progress"app:layout_constraintHorizontal_bias="1.0"@@ -55,17 +57,22 @@<TextViewandroid:id="@+id/pass_leo_satId"- style="@style/CardPassName"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginTop="4dp"android:text="@string/pass_satId"+ android:textColor="@color/secondary"+ android:textSize="16sp"app:layout_constraintEnd_toEndOf="@+id/pass_leo_progress"app:layout_constraintTop_toTopOf="parent" /><TextViewandroid:id="@+id/pass_leo_maxEl"- style="@style/CardPassText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginTop="2dp"android:text="@string/pat_elevation"+ android:textSize="15sp"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintHorizontal_bias="0.5"app:layout_constraintStart_toStartOf="parent"@@ -83,10 +90,11 @@<TextViewandroid:id="@+id/pass_leo_satName"- style="@style/CardPassName"android:layout_width="wrap_content"android:layout_height="wrap_content"android:text="@string/pass_satName"+ android:textColor="@color/secondary"+ android:textSize="16sp"app:layout_constraintBottom_toBottomOf="@+id/pass_leo_satId"app:layout_constraintEnd_toStartOf="@+id/pass_leo_satId"app:layout_constraintHorizontal_bias="0.02"@@ -95,8 +103,10 @@<TextViewandroid:id="@+id/pass_leo_aosAz"- style="@style/CardPassText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:text="@string/pass_aos_az"+ android:textSize="15sp"app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_maxEl"app:layout_constraintEnd_toStartOf="@+id/pass_leo_maxEl"app:layout_constraintHorizontal_bias="0.0"@@ -104,8 +114,10 @@<TextViewandroid:id="@+id/pass_leo_aosTime"- style="@style/CardPassText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:text="@string/pass_dateTime"+ android:textSize="15sp"app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_losTime"app:layout_constraintEnd_toStartOf="@+id/pass_leo_losTime"app:layout_constraintHorizontal_bias="0.5"@@ -114,9 +126,11 @@<TextViewandroid:id="@+id/pass_leo_losTime"- style="@style/CardPassText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginBottom="4dp"android:text="@string/pass_dateTime"+ android:textSize="15sp"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toEndOf="@+id/pass_leo_progress"app:layout_constraintHorizontal_bias="0.5"diff --git a/app/src/main/res/layout/item_sat_entry.xml b/app/src/main/res/layout/item_sat_entry.xmlindex 2daebcec..ec4a7565 100644--- a/app/src/main/res/layout/item_sat_entry.xml+++ b/app/src/main/res/layout/item_sat_entry.xml@@ -27,5 +27,4 @@android:paddingStart="24dp"android:paddingEnd="20dp"android:text="@string/placeholder"- android:textColor="@color/themePrimText"android:textSize="17sp" />diff --git a/app/src/main/res/layout/item_trans.xml b/app/src/main/res/layout/item_trans.xmlindex 145ed4a2..5785bdbb 100644--- a/app/src/main/res/layout/item_trans.xml+++ b/app/src/main/res/layout/item_trans.xml@@ -1,5 +1,4 @@-<?xml version="1.0" encoding="utf-8"?>-<!--+<?xml version="1.0" encoding="utf-8"?><!--~ Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android.~ Copyright (C) 2019, 2020 Arty Bishop ([email protected])~@@ -34,24 +33,30 @@<TextViewandroid:id="@+id/trans_description"- style="@style/CardTransText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:text="@string/trans_description"+ android:textSize="15sp"app:layout_constraintBottom_toBottomOf="@+id/trans_img"app:layout_constraintStart_toEndOf="@+id/trans_img"app:layout_constraintTop_toTopOf="@+id/trans_img" /><TextViewandroid:id="@+id/trans_downlink"- style="@style/CardTransText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:text="@string/trans_down_lowHigh"+ android:textSize="15sp"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toEndOf="@+id/trans_img_downlink"app:layout_constraintTop_toBottomOf="@+id/trans_description" /><TextViewandroid:id="@+id/trans_uplink"- style="@style/CardTransText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:text="@string/trans_up_lowHigh"+ android:textSize="15sp"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintHorizontal_bias="0.5"app:layout_constraintStart_toEndOf="@+id/trans_img_uplink"@@ -72,17 +77,21 @@<TextViewandroid:id="@+id/trans_downlink_doppler"- style="@style/CardTransText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginTop="1dp"android:text="@string/trans_down_lowHigh_doppler"+ android:textSize="15sp"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toEndOf="@+id/trans_img_downlink_doppler"app:layout_constraintTop_toBottomOf="@+id/separator" /><TextViewandroid:id="@+id/trans_uplink_doppler"- style="@style/CardTransText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:text="@string/trans_up_lowHigh_doppler"+ android:textSize="15sp"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintHorizontal_bias="0.5"app:layout_constraintStart_toEndOf="@+id/trans_img_uplink_doppler"@@ -90,19 +99,23 @@<TextViewandroid:id="@+id/trans_mode"- style="@style/CardTransText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginStart="6dp"android:layout_marginBottom="2dp"android:text="@string/trans_mode"+ android:textSize="15sp"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toBottomOf="@+id/trans_uplink_doppler" /><TextViewandroid:id="@+id/trans_inverted"- style="@style/CardTransText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:layout_marginEnd="6dp"android:text="@string/trans_inverted"+ android:textSize="15sp"app:layout_constraintBaseline_toBaselineOf="@+id/trans_mode"app:layout_constraintEnd_toEndOf="parent" />@@ -178,6 +191,5 @@app:srcCompat="@drawable/ic_trans_doppler" />-</androidx.constraintlayout.widget.ConstraintLayout></com.google.android.material.card.MaterialCardView>diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xmlindex 6f50f684..e955ebde 100644--- a/app/src/main/res/values-ru/strings.xml+++ b/app/src/main/res/values-ru/strings.xml@@ -115,6 +115,7 @@<string name="btn_ok">OK</string><string name="btn_cancel">Отмена</string>+ <string name="tle_source">Источник TLE</string><string name="https_only">Используйте протокол HTTPS</string><string name="sat_import">Импорт спутников</string></resources>diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xmlindex 6ed79b6c..df74de1b 100644--- a/app/src/main/res/values/colors.xml+++ b/app/src/main/res/values/colors.xml@@ -18,17 +18,26 @@--><resources>- <!-- main colors -->- <color name="themeAccent">#FFE082</color>- <color name="themePrimText">#E8E8E8</color>- <color name="themeSecText">#808080</color>- <!-- background colors -->- <color name="primBackground">#282828</color>- <color name="secBackground">#242424</color>- <color name="themeDark">#191919</color>- <color name="darkBackground">#121212</color>- <color name="mapInfoLayout">#66000000</color>- <!-- satellite colors -->- <color name="satTrack">#CE2029</color>+ <!-- theme colors -->+ <color name="primary">#191919</color> <!---->+ <color name="onPrimary">#E0E0E0</color> <!---->+ <color name="primaryVariant">#242424</color>++ <color name="secondary">#FFE082</color> <!---->+ <color name="onSecondary">#121212</color>+ <color name="secondaryVariant">#B00020</color>++ <color name="error">#B00020</color>+ <color name="onError">#E0E0E0</color>++ <color name="surface">#121212</color>+ <color name="onSurface">#E0E0E0</color>++ <color name="background">#121212</color> <!---->+ <color name="onBackground">#E0E0E0</color>++ <!-- map colors -->+ <color name="satTrack">#B00020</color><color name="satFootprint">#26FFE082</color>+ <color name="mapInfoLayout">#66000000</color></resources>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex 124efa06..1e0098d4 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -122,7 +122,7 @@<string name="btn_ok">OK</string><string name="btn_cancel">Cancel</string>- <string name="tle_source" translatable="false">https://</string>+ <string name="tle_source">TLE source</string><string name="https_only">Please use HTTPS URLs only</string><string name="placeholder" translatable="false">Placeholder</string><string name="osmCopyright" translatable="false">Wikimedia maps | Map data © OpenStreetMap contributors</string>diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xmlindex d7ef4e76..ddd7a8b5 100644--- a/app/src/main/res/values/styles.xml+++ b/app/src/main/res/values/styles.xml@@ -20,89 +20,24 @@<resources><style name="AppTheme" parent="Theme.MaterialComponents.NoActionBar">- <item name="colorPrimary">@color/themeAccent</item>- <item name="colorSecondary">@color/themeAccent</item>- <item name="colorSurface">@color/darkBackground</item>+ <item name="colorPrimary">@color/primary</item>+ <item name="colorOnPrimary">@color/onPrimary</item>+ <item name="colorPrimaryVariant">@color/primaryVariant</item>- <item name="colorOnPrimary">@color/darkBackground</item>- <item name="colorOnSecondary">@color/darkBackground</item>- <item name="colorOnSurface">@color/themePrimText</item>+ <item name="colorSecondary">@color/secondary</item>+ <item name="colorOnSecondary">@color/onSecondary</item>+ <item name="colorSecondaryVariant">@color/secondaryVariant</item>- <item name="android:statusBarColor">@android:color/transparent</item>- </style>-- <style name="CardPassText">- <item name="android:layout_width">wrap_content</item>- <item name="android:layout_height">wrap_content</item>- <item name="android:textSize">15sp</item>- </style>+ <item name="colorSurface">@color/surface</item>+ <item name="colorOnSurface">@color/onSurface</item>- <style name="CardPassName">- <item name="android:layout_width">wrap_content</item>- <item name="android:layout_height">wrap_content</item>- <item name="android:textSize">16sp</item>- <item name="android:textColor">@color/themeAccent</item>- </style>+ <item name="colorError">@color/error</item>+ <item name="colorOnError">@color/onError</item>- <style name="PolarViewText">- <item name="android:layout_width">wrap_content</item>- <item name="android:layout_height">wrap_content</item>- <item name="android:textColor">@color/themePrimText</item>- <item name="android:textSize">15sp</item>- </style>+ <item name="android:colorBackground">@color/background</item>+ <item name="colorOnBackground">@color/onBackground</item>- <style name="CardTransText">- <item name="android:layout_width">wrap_content</item>- <item name="android:layout_height">wrap_content</item>- <item name="android:textColor">@color/themePrimText</item>- <item name="android:textSize">15sp</item>- </style>-- <style name="DialogText">- <item name="android:layout_width">wrap_content</item>- <item name="android:layout_height">wrap_content</item>- <item name="android:textColor">@color/themeAccent</item>- <item name="android:textSize">17sp</item>- </style>-- <style name="MapOsmSatInfo">- <item name="android:layout_width">wrap_content</item>- <item name="android:layout_height">wrap_content</item>- <item name="android:textColor">@color/themeAccent</item>- </style>-- <style name="MapOsmSatInfo.Name">- <item name="android:textSize">16sp</item>- </style>-- <style name="MapOsmCopyright">- <item name="android:layout_width">wrap_content</item>- <item name="android:layout_height">wrap_content</item>- <item name="android:gravity">center</item>- <item name="android:textColor">@color/themeAccent</item>- <item name="android:textSize">12sp</item>- </style>-- <style name="AboutTitle">- <item name="android:layout_width">wrap_content</item>- <item name="android:layout_height">wrap_content</item>- <item name="android:textColor">@color/themeAccent</item>- <item name="android:textSize">42sp</item>- </style>-- <style name="AboutSubtitle">- <item name="android:layout_width">0dp</item>- <item name="android:layout_height">wrap_content</item>- <item name="android:gravity">center</item>- <item name="android:textColor">@color/themePrimText</item>- <item name="android:textSize">16sp</item>- </style>-- <style name="AboutRegular">- <item name="android:layout_width">0dp</item>- <item name="android:layout_height">wrap_content</item>- <item name="android:textColor">@color/themePrimText</item>- <item name="android:textSize">15sp</item>+ <item name="android:statusBarColor">@android:color/transparent</item></style></resources>