mirror of
https://github.com/rt-bishop/Look4Sat.git
synced 2026-10-02 03:15:37 +00:00
Further changes to fragments and layouts
This commit is contained in:
Arty Bishop committed
1 parent
9c137ada9f
commit
ad3bdff823
54 files changed
+306
-372
No files matched your search
@@ -42,7 +42,6 @@ class PreferencesSource @Inject constructor(
|
|||||||
const val keyModes = "satModes"
|
const val keyModes = "satModes"
|
||||||
const val keyCompass = "compass"
|
const val keyCompass = "compass"
|
||||||
const val keyRadarSweep = "radarSweep"
|
const val keyRadarSweep = "radarSweep"
|
||||||
const val keyTextLabels = "shouldUseTextLabels"
|
|
||||||
const val keyTimeUTC = "timeUTC"
|
const val keyTimeUTC = "timeUTC"
|
||||||
const val keyHoursAhead = "hoursAhead"
|
const val keyHoursAhead = "hoursAhead"
|
||||||
const val keyMinElevation = "minElevation"
|
const val keyMinElevation = "minElevation"
|
||||||
@@ -107,10 +106,6 @@ class PreferencesSource @Inject constructor(
|
|||||||
return preferences.getInt(keyMinElevation, 16).toDouble()
|
return preferences.getInt(keyMinElevation, 16).toDouble()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun shouldUseTextLabels(): Boolean {
|
|
||||||
return preferences.getBoolean(keyTextLabels, false)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getUseUTC(): Boolean {
|
fun getUseUTC(): Boolean {
|
||||||
return preferences.getBoolean(keyTimeUTC, false)
|
return preferences.getBoolean(keyTimeUTC, false)
|
||||||
}
|
}
|
||||||
@@ -189,7 +184,7 @@ class PreferencesSource @Inject constructor(
|
|||||||
|
|
||||||
override fun loadDataSources(): List<String> {
|
override fun loadDataSources(): List<String> {
|
||||||
val sourcesList = preferences.getStringSet(keyDataSources, null)?.toList()
|
val sourcesList = preferences.getStringSet(keyDataSources, null)?.toList()
|
||||||
return if (sourcesList.isNullOrEmpty()) defaultSources else sourcesList
|
return if (sourcesList.isNullOrEmpty()) defaultSources else sourcesList.sortedDescending()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun saveDataSources(sources: List<String>) {
|
override fun saveDataSources(sources: List<String>) {
|
||||||
|
|||||||
@@ -1,40 +0,0 @@
|
|||||||
/*
|
|
||||||
* Look4Sat. Amateur radio satellite tracker and pass predictor.
|
|
||||||
* Copyright (C) 2019-2021 Arty Bishop (bishop.arty@gmail.com)
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
package com.rtbishop.look4sat.framework.local
|
|
||||||
|
|
||||||
import androidx.room.*
|
|
||||||
import com.rtbishop.look4sat.framework.model.Source
|
|
||||||
|
|
||||||
@Dao
|
|
||||||
interface SourcesDao {
|
|
||||||
|
|
||||||
@Query("SELECT sourceUrl FROM sources")
|
|
||||||
suspend fun getSources(): List<String>
|
|
||||||
|
|
||||||
@Transaction
|
|
||||||
suspend fun updateSources(sources: List<Source>) {
|
|
||||||
deleteSources()
|
|
||||||
insertSources(sources)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Query("DELETE from sources")
|
|
||||||
suspend fun deleteSources()
|
|
||||||
|
|
||||||
@Insert(onConflict = OnConflictStrategy.REPLACE)
|
|
||||||
suspend fun insertSources(sources: List<Source>)
|
|
||||||
}
|
|
||||||
@@ -101,7 +101,7 @@ class MapFragment : Fragment(R.layout.fragment_map) {
|
|||||||
Marker(mapView).apply {
|
Marker(mapView).apply {
|
||||||
setInfoWindow(null)
|
setInfoWindow(null)
|
||||||
setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM)
|
setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM)
|
||||||
icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_map_pos)
|
icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_pos)
|
||||||
position = GeoPoint(stationPos.latitude, stationPos.longitude)
|
position = GeoPoint(stationPos.latitude, stationPos.longitude)
|
||||||
mapView.overlays[0] = this
|
mapView.overlays[0] = this
|
||||||
mapView.invalidate()
|
mapView.invalidate()
|
||||||
|
|||||||
@@ -18,12 +18,12 @@
|
|||||||
package com.rtbishop.look4sat.presentation.mapScreen
|
package com.rtbishop.look4sat.presentation.mapScreen
|
||||||
|
|
||||||
import androidx.lifecycle.*
|
import androidx.lifecycle.*
|
||||||
import com.rtbishop.look4sat.domain.predict.Predictor
|
|
||||||
import com.rtbishop.look4sat.domain.DataRepository
|
import com.rtbishop.look4sat.domain.DataRepository
|
||||||
import com.rtbishop.look4sat.framework.PreferencesSource
|
|
||||||
import com.rtbishop.look4sat.domain.predict.GeoPos
|
|
||||||
import com.rtbishop.look4sat.domain.QthConverter
|
import com.rtbishop.look4sat.domain.QthConverter
|
||||||
|
import com.rtbishop.look4sat.domain.predict.GeoPos
|
||||||
|
import com.rtbishop.look4sat.domain.predict.Predictor
|
||||||
import com.rtbishop.look4sat.domain.predict.Satellite
|
import com.rtbishop.look4sat.domain.predict.Satellite
|
||||||
|
import com.rtbishop.look4sat.framework.PreferencesSource
|
||||||
import dagger.hilt.android.lifecycle.HiltViewModel
|
import dagger.hilt.android.lifecycle.HiltViewModel
|
||||||
import kotlinx.coroutines.*
|
import kotlinx.coroutines.*
|
||||||
import java.util.*
|
import java.util.*
|
||||||
@@ -35,7 +35,7 @@ import kotlin.math.min
|
|||||||
class MapViewModel @Inject constructor(
|
class MapViewModel @Inject constructor(
|
||||||
private val dataRepository: DataRepository,
|
private val dataRepository: DataRepository,
|
||||||
private val predictor: Predictor,
|
private val predictor: Predictor,
|
||||||
private val preferences: PreferencesSource,
|
preferences: PreferencesSource,
|
||||||
) : ViewModel() {
|
) : ViewModel() {
|
||||||
|
|
||||||
private val stationPos = preferences.loadStationPosition()
|
private val stationPos = preferences.loadStationPosition()
|
||||||
@@ -61,10 +61,6 @@ class MapViewModel @Inject constructor(
|
|||||||
private val _satPositions = MutableLiveData<Map<Satellite, GeoPos>>()
|
private val _satPositions = MutableLiveData<Map<Satellite, GeoPos>>()
|
||||||
val satPositions: LiveData<Map<Satellite, GeoPos>> = _satPositions
|
val satPositions: LiveData<Map<Satellite, GeoPos>> = _satPositions
|
||||||
|
|
||||||
fun shouldUseTextLabels(): Boolean {
|
|
||||||
return preferences.shouldUseTextLabels()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun scrollSelection(decrement: Boolean) {
|
fun scrollSelection(decrement: Boolean) {
|
||||||
if (allSatList.isNotEmpty()) {
|
if (allSatList.isNotEmpty()) {
|
||||||
val index = allSatList.indexOf(selectedSat)
|
val index = allSatList.indexOf(selectedSat)
|
||||||
|
|||||||
@@ -76,8 +76,8 @@ class PassesFragment : Fragment(R.layout.fragment_passes), PassesAdapter.PassesC
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
passesSwipe.apply {
|
passesSwipe.apply {
|
||||||
setColorSchemeResources(R.color.greySurface)
|
setColorSchemeResources(R.color.surfaceToolbar)
|
||||||
setProgressBackgroundColorSchemeResource(R.color.themeLight)
|
setProgressBackgroundColorSchemeResource(R.color.themeAccent)
|
||||||
setOnRefreshListener { passesViewModel.forceCalculation() }
|
setOnRefreshListener { passesViewModel.forceCalculation() }
|
||||||
}
|
}
|
||||||
passesFilter.setOnClickListener { findNavController().navigate(R.id.nav_pass_prefs) }
|
passesFilter.setOnClickListener { findNavController().navigate(R.id.nav_pass_prefs) }
|
||||||
|
|||||||
@@ -27,9 +27,9 @@ import androidx.recyclerview.widget.LinearLayoutManager
|
|||||||
import androidx.recyclerview.widget.SimpleItemAnimator
|
import androidx.recyclerview.widget.SimpleItemAnimator
|
||||||
import com.rtbishop.look4sat.R
|
import com.rtbishop.look4sat.R
|
||||||
import com.rtbishop.look4sat.databinding.FragmentRadarBinding
|
import com.rtbishop.look4sat.databinding.FragmentRadarBinding
|
||||||
import com.rtbishop.look4sat.framework.PreferencesSource
|
|
||||||
import com.rtbishop.look4sat.domain.predict.SatPass
|
import com.rtbishop.look4sat.domain.predict.SatPass
|
||||||
import com.rtbishop.look4sat.domain.predict.SatPos
|
import com.rtbishop.look4sat.domain.predict.SatPos
|
||||||
|
import com.rtbishop.look4sat.framework.PreferencesSource
|
||||||
import com.rtbishop.look4sat.presentation.ItemDivider
|
import com.rtbishop.look4sat.presentation.ItemDivider
|
||||||
import com.rtbishop.look4sat.presentation.navigateSafe
|
import com.rtbishop.look4sat.presentation.navigateSafe
|
||||||
import com.rtbishop.look4sat.presentation.toTimerString
|
import com.rtbishop.look4sat.presentation.toTimerString
|
||||||
@@ -105,35 +105,11 @@ class RadarFragment : Fragment(R.layout.fragment_radar) {
|
|||||||
orientation.third
|
orientation.third
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
binding.radarToMapButton.setOnClickListener {
|
binding.radarMap.setOnClickListener {
|
||||||
val bundle = bundleOf("catNum" to pass.catNum)
|
val bundle = bundleOf("catNum" to pass.catNum)
|
||||||
findNavController().navigateSafe(R.id.action_radar_to_map, bundle)
|
findNavController().navigateSafe(R.id.action_radar_to_map, bundle)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// binding.radarNotifyButton.setOnClickListener {
|
|
||||||
// this.context?.let { context ->
|
|
||||||
//
|
|
||||||
// val choicesList = arrayOf(
|
|
||||||
// getString(R.string.notification_on_start_pass),
|
|
||||||
// getString(R.string.notification_5_min_before),
|
|
||||||
// getString(R.string.notification_10_min_before),
|
|
||||||
// getString(R.string.notification_15_min_before),
|
|
||||||
// )
|
|
||||||
//
|
|
||||||
// MaterialAlertDialogBuilder(context)
|
|
||||||
// .setTitle(getString(R.string.notification_title))
|
|
||||||
// .setSingleChoiceItems(choicesList, -1) { dialog, which ->
|
|
||||||
// // TODO in this place should set a notification by NotificationBuilder
|
|
||||||
// Toast.makeText(context, "Reminder was saved", Toast.LENGTH_SHORT).show()
|
|
||||||
// dialog.dismiss()
|
|
||||||
// }
|
|
||||||
// .setNegativeButton(getString(R.string.btn_cancel)) { _, _ ->
|
|
||||||
// // noop
|
|
||||||
// }
|
|
||||||
// .show()
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setPassText(satPass: SatPass, satPos: SatPos, binding: FragmentRadarBinding) {
|
private fun setPassText(satPass: SatPass, satPos: SatPos, binding: FragmentRadarBinding) {
|
||||||
@@ -157,7 +133,9 @@ class RadarFragment : Fragment(R.layout.fragment_radar) {
|
|||||||
binding.radarTimer.text = millisBeforeEnd.toTimerString()
|
binding.radarTimer.text = millisBeforeEnd.toTimerString()
|
||||||
if (timeNow > satPass.losTime) {
|
if (timeNow > satPass.losTime) {
|
||||||
binding.radarTimer.text = 0L.toTimerString()
|
binding.radarTimer.text = 0L.toTimerString()
|
||||||
findNavController().navigateSafe(R.id.action_radar_to_passes)
|
// findNavController().navigateSafe(R.id.action_radar_to_passes)
|
||||||
|
findNavController().popBackStack(R.id.nav_passes, true)
|
||||||
|
// requireActivity().onNavigateUp()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ import kotlin.math.sin
|
|||||||
|
|
||||||
class RadarView(context: Context) : View(context) {
|
class RadarView(context: Context) : View(context) {
|
||||||
|
|
||||||
private val defaultColor = ContextCompat.getColor(context, R.color.themeLight)
|
private val defaultColor = ContextCompat.getColor(context, R.color.themeAccent)
|
||||||
private val scale = resources.displayMetrics.density
|
private val scale = resources.displayMetrics.density
|
||||||
private val radarWidth = resources.displayMetrics.widthPixels
|
private val radarWidth = resources.displayMetrics.widthPixels
|
||||||
private val radarRadius = radarWidth * 0.48f
|
private val radarRadius = radarWidth * 0.48f
|
||||||
@@ -38,7 +38,7 @@ class RadarView(context: Context) : View(context) {
|
|||||||
private var position: SatPos? = null
|
private var position: SatPos? = null
|
||||||
private var positions: List<SatPos> = emptyList()
|
private var positions: List<SatPos> = emptyList()
|
||||||
|
|
||||||
private var radarColor = ContextCompat.getColor(context, R.color.greyLight)
|
private var radarColor = ContextCompat.getColor(context, R.color.themeLight)
|
||||||
private var radarCircleNum = 3
|
private var radarCircleNum = 3
|
||||||
private var radarPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
|
private var radarPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
|
||||||
color = radarColor
|
color = radarColor
|
||||||
@@ -79,7 +79,7 @@ class RadarView(context: Context) : View(context) {
|
|||||||
|
|
||||||
private val arrowPath = Path()
|
private val arrowPath = Path()
|
||||||
private var arrowPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
|
private var arrowPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
|
||||||
color = ContextCompat.getColor(context, R.color.themeLight)
|
color = ContextCompat.getColor(context, R.color.themeAccent)
|
||||||
style = Paint.Style.FILL
|
style = Paint.Style.FILL
|
||||||
strokeWidth = strokeSize
|
strokeWidth = strokeSize
|
||||||
}
|
}
|
||||||
@@ -135,7 +135,7 @@ class RadarView(context: Context) : View(context) {
|
|||||||
isTrackCreated = true
|
isTrackCreated = true
|
||||||
}
|
}
|
||||||
|
|
||||||
canvas.drawColor(ContextCompat.getColor(context, R.color.greyDark))
|
canvas.drawColor(ContextCompat.getColor(context, R.color.surfaceBg))
|
||||||
drawRadarCircle(canvas, cx, cy, radarRadius)
|
drawRadarCircle(canvas, cx, cy, radarRadius)
|
||||||
drawRadarCross(canvas, cx, cy, radarRadius)
|
drawRadarCross(canvas, cx, cy, radarRadius)
|
||||||
drawRadarText(canvas, cx, radarRadius)
|
drawRadarText(canvas, cx, radarRadius)
|
||||||
|
|||||||
@@ -4,6 +4,6 @@
|
|||||||
android:viewportWidth="24"
|
android:viewportWidth="24"
|
||||||
android:viewportHeight="24">
|
android:viewportHeight="24">
|
||||||
<path
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@color/themeAccent"
|
||||||
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
|
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
|
||||||
</vector>
|
</vector>
|
||||||
@@ -4,6 +4,6 @@
|
|||||||
android:viewportWidth="24"
|
android:viewportWidth="24"
|
||||||
android:viewportHeight="24">
|
android:viewportHeight="24">
|
||||||
<path
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@color/themeAccent"
|
||||||
android:pathData="M8,5v14l11,-7z" />
|
android:pathData="M8,5v14l11,-7z" />
|
||||||
</vector>
|
</vector>
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
android:height="24dp"
|
android:height="24dp"
|
||||||
android:viewportWidth="24"
|
android:viewportWidth="24"
|
||||||
android:viewportHeight="24">
|
android:viewportHeight="24">
|
||||||
<path
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@android:color/white"
|
||||||
android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z" />
|
android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
|
||||||
</vector>
|
</vector>
|
||||||
@@ -6,6 +6,6 @@
|
|||||||
android:viewportHeight="338.40268">
|
android:viewportHeight="338.40268">
|
||||||
<path
|
<path
|
||||||
android:pathData="m113.404,0c-10.877,-0.015 -21.753,0.458 -32.594,1.417 -12.911,1.175 -26.51,2.595 -38.779,7.061 -4.484,1.634 -9.105,3.597 -12.514,7.061 -4.184,4.257 -5.55,10.84 -2.495,16.148 2.172,3.77 5.85,6.432 9.752,8.194 5.082,2.27 10.389,3.998 15.834,5.154 15.16,3.351 30.861,4.666 46.349,5.227 17.166,0.693 34.36,0.131 51.444,-1.68 4.225,-0.464 8.442,-1.021 12.651,-1.671 4.958,-0.76 8.14,-7.243 6.679,-11.759 -1.748,-5.399 -6.446,-7.493 -11.759,-6.678 -0.783,0.123 -1.561,0.236 -2.345,0.35l-0.564,0.082c-1.8,0.228 -3.6,0.44 -5.4,0.638 -3.718,0.401 -7.445,0.728 -11.181,0.983 -8.368,0.583 -16.758,0.851 -25.144,0.865 -8.24,0 -16.485,-0.232 -24.707,-0.774 -3.751,-0.246 -7.493,-0.559 -11.226,-0.938 -1.698,-0.178 -3.392,-0.364 -5.085,-0.574l-1.612,-0.205 -0.35,-0.05 -1.671,-0.241c-3.414,-0.515 -6.829,-1.106 -10.207,-1.821 -0.341,-0.076 -0.646,-0.266 -0.865,-0.538 -0.219,-0.272 -0.337,-0.611 -0.337,-0.96 0,-0.349 0.119,-0.688 0.337,-0.96 0.219,-0.272 0.524,-0.462 0.865,-0.537l0.064,0c2.927,-0.624 5.877,-1.156 8.836,-1.621 0.987,-0.155 1.976,-0.307 2.968,-0.455l0.027,0c1.853,-0.123 3.715,-0.455 5.559,-0.674 16.042,-1.669 32.178,-2.238 48.298,-1.703 7.826,0.228 15.647,0.687 23.436,1.479 1.675,0.173 3.342,0.355 5.008,0.56 0.637,0.077 1.279,0.169 1.921,0.246l1.293,0.187c3.77,0.561 7.519,1.243 11.249,2.044 5.527,1.202 12.625,1.594 15.083,7.649 0.783,1.921 1.138,4.056 1.57,6.072l0.551,2.572c0.015,0.046 0.025,0.093 0.032,0.141 1.302,6.07 2.605,12.14 3.91,18.21 0.096,0.448 0.098,0.912 0.007,1.361 -0.091,0.45 -0.274,0.875 -0.537,1.251 -0.263,0.375 -0.601,0.693 -0.992,0.932 -0.391,0.239 -0.827,0.395 -1.282,0.458l-0.037,0l-0.797,0.109 -0.787,0.105c-2.495,0.325 -4.993,0.628 -7.494,0.911 -4.926,0.561 -9.86,1.047 -14.801,1.457 -9.818,0.816 -19.656,1.352 -29.514,1.607 -5.023,0.133 -10.044,0.196 -15.064,0.187 -19.981,-0.016 -39.945,-1.177 -59.793,-3.478 -2.149,-0.255 -4.298,-0.528 -6.447,-0.806 1.666,0.214 -1.211,-0.164 -1.793,-0.246 -1.366,-0.191 -2.732,-0.39 -4.098,-0.596 -4.584,-0.688 -9.142,-1.534 -13.717,-2.276 -5.531,-0.91 -10.821,-0.455 -15.824,2.276 -4.107,2.247 -7.431,5.694 -9.529,9.879 -2.158,4.461 -2.799,9.319 -3.765,14.113 -0.965,4.794 -2.468,9.952 -1.899,14.873 1.225,10.621 8.65,19.252 19.33,21.183 10.047,1.821 20.149,3.296 30.279,4.553 39.791,4.873 79.99,5.456 119.905,1.739 3.25,-0.303 6.496,-0.634 9.738,-0.992 1.013,-0.111 2.037,0.005 2.998,0.341 0.962,0.336 1.836,0.883 2.558,1.6 0.723,0.718 1.276,1.588 1.619,2.547 0.343,0.959 0.467,1.983 0.363,2.996l-1.011,9.824c-2.037,19.852 -4.073,39.703 -6.11,59.552 -2.124,20.845 -4.263,41.687 -6.415,62.527 -0.607,5.871 -1.214,11.74 -1.821,17.606 -0.583,5.778 -0.665,11.737 -1.762,17.446 -1.73,8.977 -7.807,14.491 -16.675,16.508 -8.125,1.849 -16.425,2.82 -24.757,2.894 -9.237,0.05 -18.469,-0.36 -27.706,-0.31 -9.861,0.056 -21.939,-0.854 -29.551,-8.194 -6.688,-6.445 -7.612,-16.539 -8.522,-25.268 -1.214,-11.554 -2.417,-23.107 -3.61,-34.658L52.284,188.281 47.954,146.722c-0.073,-0.687 -0.146,-1.366 -0.214,-2.058 -0.519,-4.957 -4.029,-9.81 -9.561,-9.56 -4.734,0.209 -10.116,4.234 -9.56,9.56l3.209,30.812 6.638,63.735c1.891,18.104 3.777,36.21 5.659,54.321 0.364,3.469 0.705,6.948 1.088,10.416 2.081,18.957 16.558,29.173 34.486,32.049 10.471,1.685 21.196,2.032 31.822,2.204 13.621,0.22 27.379,0.744 40.777,-1.725 19.854,-3.643 34.749,-16.899 36.875,-37.462 0.607,-5.937 1.214,-11.875 1.821,-17.814 2.018,-19.643 4.034,-39.288 6.046,-58.933l6.583,-64.19 3.018,-29.418c0.15,-1.459 0.766,-2.831 1.756,-3.912 0.99,-1.081 2.303,-1.816 3.742,-2.093 5.677,-1.106 11.104,-2.995 15.142,-7.316 6.428,-6.879 7.707,-15.847 5.435,-24.888l-1.862,-9.392C229.186,72.629 225.394,64.666 216.744,61.621 213.971,60.646 210.825,60.228 208.699,58.211c-2.126,-2.017 -2.754,-5.149 -3.246,-8.053 -0.911,-5.331 -1.766,-10.667 -2.7,-15.989 -0.806,-4.575 -1.443,-9.715 -3.542,-13.912 -2.732,-5.636 -8.4,-8.932 -14.036,-11.113 -2.888,-1.078 -5.835,-1.99 -8.827,-2.731 -14.081,-3.715 -28.886,-5.081 -43.373,-5.86 -6.52,-0.36 -13.047,-0.544 -19.573,-0.552zM29.029,78.272c6.185,0.029 12.996,2.347 18.907,3.243 8.134,1.241 16.298,2.235 24.492,2.982 34.973,3.187 70.533,2.691 105.351,-1.971 6.346,-0.853 12.67,-1.844 18.97,-2.973 5.613,-1.006 11.837,-2.895 15.229,2.918 2.326,3.961 2.635,9.26 2.276,13.735 -0.111,1.95 -0.963,3.783 -2.381,5.126l0.004,0c-2.039,1.939 -5.112,2.841 -8.149,3.292 -34.053,5.053 -68.602,7.612 -103.028,6.483 -24.638,-0.842 -49.017,-3.578 -73.409,-7.024 -2.39,-0.337 -4.981,-0.774 -6.624,-2.536C17.57,98.223 19.091,91.531 19.896,87.515 20.634,83.837 22.046,78.934 26.421,78.411c0.854,-0.1 1.725,-0.143 2.608,-0.138zM19.164,96.794c-0.127,0.059 -0.155,0.523 -0.141,1.047 0.068,-0.346 0.228,-1.088 0.141,-1.047zM19.736,101.053c0.059,0.016 0.179,0.18 0.302,0.371 -0.214,-0.201 -0.351,-0.351 -0.328,-0.369l0.005,0c0.006,-0.004 0.013,-0.004 0.021,-0.002zM21.34,102.652l0.005,0 0.027,0c0,0.032 0.05,0.064 0.068,0.096 -0.03,-0.035 -0.064,-0.068 -0.1,-0.096zM156.916,147.68c-11.645,-0.005 -21.028,4.006 -31.868,8.645 -12.155,5.204 -25.9Line truncated
|
android:pathData="m113.404,0c-10.877,-0.015 -21.753,0.458 -32.594,1.417 -12.911,1.175 -26.51,2.595 -38.779,7.061 -4.484,1.634 -9.105,3.597 -12.514,7.061 -4.184,4.257 -5.55,10.84 -2.495,16.148 2.172,3.77 5.85,6.432 9.752,8.194 5.082,2.27 10.389,3.998 15.834,5.154 15.16,3.351 30.861,4.666 46.349,5.227 17.166,0.693 34.36,0.131 51.444,-1.68 4.225,-0.464 8.442,-1.021 12.651,-1.671 4.958,-0.76 8.14,-7.243 6.679,-11.759 -1.748,-5.399 -6.446,-7.493 -11.759,-6.678 -0.783,0.123 -1.561,0.236 -2.345,0.35l-0.564,0.082c-1.8,0.228 -3.6,0.44 -5.4,0.638 -3.718,0.401 -7.445,0.728 -11.181,0.983 -8.368,0.583 -16.758,0.851 -25.144,0.865 -8.24,0 -16.485,-0.232 -24.707,-0.774 -3.751,-0.246 -7.493,-0.559 -11.226,-0.938 -1.698,-0.178 -3.392,-0.364 -5.085,-0.574l-1.612,-0.205 -0.35,-0.05 -1.671,-0.241c-3.414,-0.515 -6.829,-1.106 -10.207,-1.821 -0.341,-0.076 -0.646,-0.266 -0.865,-0.538 -0.219,-0.272 -0.337,-0.611 -0.337,-0.96 0,-0.349 0.119,-0.688 0.337,-0.96 0.219,-0.272 0.524,-0.462 0.865,-0.537l0.064,0c2.927,-0.624 5.877,-1.156 8.836,-1.621 0.987,-0.155 1.976,-0.307 2.968,-0.455l0.027,0c1.853,-0.123 3.715,-0.455 5.559,-0.674 16.042,-1.669 32.178,-2.238 48.298,-1.703 7.826,0.228 15.647,0.687 23.436,1.479 1.675,0.173 3.342,0.355 5.008,0.56 0.637,0.077 1.279,0.169 1.921,0.246l1.293,0.187c3.77,0.561 7.519,1.243 11.249,2.044 5.527,1.202 12.625,1.594 15.083,7.649 0.783,1.921 1.138,4.056 1.57,6.072l0.551,2.572c0.015,0.046 0.025,0.093 0.032,0.141 1.302,6.07 2.605,12.14 3.91,18.21 0.096,0.448 0.098,0.912 0.007,1.361 -0.091,0.45 -0.274,0.875 -0.537,1.251 -0.263,0.375 -0.601,0.693 -0.992,0.932 -0.391,0.239 -0.827,0.395 -1.282,0.458l-0.037,0l-0.797,0.109 -0.787,0.105c-2.495,0.325 -4.993,0.628 -7.494,0.911 -4.926,0.561 -9.86,1.047 -14.801,1.457 -9.818,0.816 -19.656,1.352 -29.514,1.607 -5.023,0.133 -10.044,0.196 -15.064,0.187 -19.981,-0.016 -39.945,-1.177 -59.793,-3.478 -2.149,-0.255 -4.298,-0.528 -6.447,-0.806 1.666,0.214 -1.211,-0.164 -1.793,-0.246 -1.366,-0.191 -2.732,-0.39 -4.098,-0.596 -4.584,-0.688 -9.142,-1.534 -13.717,-2.276 -5.531,-0.91 -10.821,-0.455 -15.824,2.276 -4.107,2.247 -7.431,5.694 -9.529,9.879 -2.158,4.461 -2.799,9.319 -3.765,14.113 -0.965,4.794 -2.468,9.952 -1.899,14.873 1.225,10.621 8.65,19.252 19.33,21.183 10.047,1.821 20.149,3.296 30.279,4.553 39.791,4.873 79.99,5.456 119.905,1.739 3.25,-0.303 6.496,-0.634 9.738,-0.992 1.013,-0.111 2.037,0.005 2.998,0.341 0.962,0.336 1.836,0.883 2.558,1.6 0.723,0.718 1.276,1.588 1.619,2.547 0.343,0.959 0.467,1.983 0.363,2.996l-1.011,9.824c-2.037,19.852 -4.073,39.703 -6.11,59.552 -2.124,20.845 -4.263,41.687 -6.415,62.527 -0.607,5.871 -1.214,11.74 -1.821,17.606 -0.583,5.778 -0.665,11.737 -1.762,17.446 -1.73,8.977 -7.807,14.491 -16.675,16.508 -8.125,1.849 -16.425,2.82 -24.757,2.894 -9.237,0.05 -18.469,-0.36 -27.706,-0.31 -9.861,0.056 -21.939,-0.854 -29.551,-8.194 -6.688,-6.445 -7.612,-16.539 -8.522,-25.268 -1.214,-11.554 -2.417,-23.107 -3.61,-34.658L52.284,188.281 47.954,146.722c-0.073,-0.687 -0.146,-1.366 -0.214,-2.058 -0.519,-4.957 -4.029,-9.81 -9.561,-9.56 -4.734,0.209 -10.116,4.234 -9.56,9.56l3.209,30.812 6.638,63.735c1.891,18.104 3.777,36.21 5.659,54.321 0.364,3.469 0.705,6.948 1.088,10.416 2.081,18.957 16.558,29.173 34.486,32.049 10.471,1.685 21.196,2.032 31.822,2.204 13.621,0.22 27.379,0.744 40.777,-1.725 19.854,-3.643 34.749,-16.899 36.875,-37.462 0.607,-5.937 1.214,-11.875 1.821,-17.814 2.018,-19.643 4.034,-39.288 6.046,-58.933l6.583,-64.19 3.018,-29.418c0.15,-1.459 0.766,-2.831 1.756,-3.912 0.99,-1.081 2.303,-1.816 3.742,-2.093 5.677,-1.106 11.104,-2.995 15.142,-7.316 6.428,-6.879 7.707,-15.847 5.435,-24.888l-1.862,-9.392C229.186,72.629 225.394,64.666 216.744,61.621 213.971,60.646 210.825,60.228 208.699,58.211c-2.126,-2.017 -2.754,-5.149 -3.246,-8.053 -0.911,-5.331 -1.766,-10.667 -2.7,-15.989 -0.806,-4.575 -1.443,-9.715 -3.542,-13.912 -2.732,-5.636 -8.4,-8.932 -14.036,-11.113 -2.888,-1.078 -5.835,-1.99 -8.827,-2.731 -14.081,-3.715 -28.886,-5.081 -43.373,-5.86 -6.52,-0.36 -13.047,-0.544 -19.573,-0.552zM29.029,78.272c6.185,0.029 12.996,2.347 18.907,3.243 8.134,1.241 16.298,2.235 24.492,2.982 34.973,3.187 70.533,2.691 105.351,-1.971 6.346,-0.853 12.67,-1.844 18.97,-2.973 5.613,-1.006 11.837,-2.895 15.229,2.918 2.326,3.961 2.635,9.26 2.276,13.735 -0.111,1.95 -0.963,3.783 -2.381,5.126l0.004,0c-2.039,1.939 -5.112,2.841 -8.149,3.292 -34.053,5.053 -68.602,7.612 -103.028,6.483 -24.638,-0.842 -49.017,-3.578 -73.409,-7.024 -2.39,-0.337 -4.981,-0.774 -6.624,-2.536C17.57,98.223 19.091,91.531 19.896,87.515 20.634,83.837 22.046,78.934 26.421,78.411c0.854,-0.1 1.725,-0.143 2.608,-0.138zM19.164,96.794c-0.127,0.059 -0.155,0.523 -0.141,1.047 0.068,-0.346 0.228,-1.088 0.141,-1.047zM19.736,101.053c0.059,0.016 0.179,0.18 0.302,0.371 -0.214,-0.201 -0.351,-0.351 -0.328,-0.369l0.005,0c0.006,-0.004 0.013,-0.004 0.021,-0.002zM21.34,102.652l0.005,0 0.027,0c0,0.032 0.05,0.064 0.068,0.096 -0.03,-0.035 -0.064,-0.068 -0.1,-0.096zM156.916,147.68c-11.645,-0.005 -21.028,4.006 -31.868,8.645 -12.155,5.204 -25.9Line truncated
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@color/themeAccent"
|
||||||
tools:ignore="VectorPath" />
|
tools:ignore="VectorPath" />
|
||||||
</vector>
|
</vector>
|
||||||
@@ -5,7 +5,7 @@
|
|||||||
android:viewportWidth="48"
|
android:viewportWidth="48"
|
||||||
android:viewportHeight="48">
|
android:viewportHeight="48">
|
||||||
<path
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@color/themeAccent"
|
||||||
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: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:strokeWidth="2"
|
||||||
android:strokeColor="#00000000"
|
android:strokeColor="#00000000"
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
android:strokeLineJoin="miter"
|
android:strokeLineJoin="miter"
|
||||||
tools:ignore="VectorPath" />
|
tools:ignore="VectorPath" />
|
||||||
<path
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@color/themeAccent"
|
||||||
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: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:strokeWidth="2"
|
||||||
android:strokeColor="#00000000"
|
android:strokeColor="#00000000"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
android:viewportWidth="24"
|
android:viewportWidth="24"
|
||||||
android:viewportHeight="24">
|
android:viewportHeight="24">
|
||||||
<path
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@color/themeAccent"
|
||||||
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"
|
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" />
|
tools:ignore="VectorPath" />
|
||||||
</vector>
|
</vector>
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
<path
|
|
||||||
android:fillColor="@color/themeLight"
|
|
||||||
android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" />
|
|
||||||
</vector>
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:shape="rectangle">
|
android:shape="rectangle">
|
||||||
<gradient
|
<gradient
|
||||||
android:endColor="@color/greyDark"
|
android:endColor="@color/surfaceBg"
|
||||||
android:startColor="@color/greyDark" />
|
android:startColor="@color/surfaceBg" />
|
||||||
</shape>
|
</shape>
|
||||||
@@ -11,10 +11,10 @@
|
|||||||
android:translateX="70.26573"
|
android:translateX="70.26573"
|
||||||
android:translateY="70.26573">
|
android:translateY="70.26573">
|
||||||
<path
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@color/themeAccent"
|
||||||
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" />
|
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
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@color/themeAccent"
|
||||||
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"
|
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" />
|
tools:ignore="VectorPath" />
|
||||||
</group>
|
</group>
|
||||||
|
|||||||
@@ -4,6 +4,6 @@
|
|||||||
android:viewportWidth="24"
|
android:viewportWidth="24"
|
||||||
android:viewportHeight="24">
|
android:viewportHeight="24">
|
||||||
<path
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@android:color/white"
|
||||||
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" />
|
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>
|
</vector>
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
<path
|
|
||||||
android:fillColor="@color/themeLight"
|
|
||||||
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>
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
<path
|
|
||||||
android:fillColor="@color/themeLight"
|
|
||||||
android:pathData="M2,21h19v-3H2v3zM20,8H3c-0.55,0 -1,0.45 -1,1v6c0,0.55 0.45,1 1,1h17c0.55,0 1,-0.45 1,-1V9c0,-0.55 -0.45,-1 -1,-1zM2,3v3h19V3H2z" />
|
|
||||||
</vector>
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
<path
|
|
||||||
android:fillColor="@color/themeLight"
|
|
||||||
android:pathData="M21,19V20H3V19L5,17V11C5,7.9 7.03,5.17 10,4.29C10,4.19 10,4.1 10,4A2,2 0 0,1 12,2A2,2 0 0,1 14,4C14,4.1 14,4.19 14,4.29C16.97,5.17 19,7.9 19,11V17L21,19M14,21A2,2 0 0,1 12,23A2,2 0 0,1 10,21" />
|
|
||||||
</vector>
|
|
||||||
@@ -4,6 +4,6 @@
|
|||||||
android:viewportWidth="24"
|
android:viewportWidth="24"
|
||||||
android:viewportHeight="24">
|
android:viewportHeight="24">
|
||||||
<path
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@color/themeAccent"
|
||||||
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" />
|
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>
|
</vector>
|
||||||
File renamed without changes.
@@ -4,6 +4,6 @@
|
|||||||
android:viewportWidth="24"
|
android:viewportWidth="24"
|
||||||
android:viewportHeight="24">
|
android:viewportHeight="24">
|
||||||
<path
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@color/themeAccent"
|
||||||
android:pathData="M21.41,11.58l-9,-9C12.05,2.22 11.55,2 11,2H4c-1.1,0 -2,0.9 -2,2v7c0,0.55 0.22,1.05 0.59,1.42l9,9c0.36,0.36 0.86,0.58 1.41,0.58 0.55,0 1.05,-0.22 1.41,-0.59l7,-7c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-0.55 -0.23,-1.06 -0.59,-1.42zM5.5,7C4.67,7 4,6.33 4,5.5S4.67,4 5.5,4 7,4.67 7,5.5 6.33,7 5.5,7z" />
|
android:pathData="M21.41,11.58l-9,-9C12.05,2.22 11.55,2 11,2H4c-1.1,0 -2,0.9 -2,2v7c0,0.55 0.22,1.05 0.59,1.42l9,9c0.36,0.36 0.86,0.58 1.41,0.58 0.55,0 1.05,-0.22 1.41,-0.59l7,-7c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-0.55 -0.23,-1.06 -0.59,-1.42zM5.5,7C4.67,7 4,6.33 4,5.5S4.67,4 5.5,4 7,4.67 7,5.5 6.33,7 5.5,7z" />
|
||||||
</vector>
|
</vector>
|
||||||
@@ -5,19 +5,19 @@
|
|||||||
android:viewportWidth="128"
|
android:viewportWidth="128"
|
||||||
android:viewportHeight="128">
|
android:viewportHeight="128">
|
||||||
<path
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@color/themeAccent"
|
||||||
android:pathData="m105.138,114.121a2.864,2.864 90,0 0,1.701 -0.85l19.334,-19.331a2.864,2.864 90,0 0,-0 -4.027l-26.584,-26.625a2.864,2.864 90,0 0,-1.835 -0.805l-7.922,-0.626 5.773,-5.772a2.864,2.864 90,0 0,-0 -4.027l-19.602,-19.644a2.864,2.864 90,0 0,-4.073 -0l-5.773,5.772 -0.627,-7.92a2.864,2.864 90,0 0,-0.805 -1.835l-26.629,-26.58a2.864,2.864 90,0 0,-4.073 -0l-19.289,19.286a2.864,2.864 90,0 0,-0 4.072l26.584,26.625a2.864,2.864 90,0 0,1.835 0.805l7.922,0.626 -5.773,5.772a2.864,2.864 90,0 0,-0 4.072l19.603,19.599a2.864,2.864 90,0 0,4.073 -0l5.773,-5.772 0.626,7.92a2.864,2.864 90,0 0,0.806 1.835l26.629,26.58a2.864,2.864 90,0 0,2.059 0.85,2.864 2.864,90 0,0 0.269,-0zM104.825,107.23 L80.97,83.38 80.165,72.685 85.58,67.271 96.276,68.121 120.13,91.926zM55.326,47.85 L44.629,47 20.775,23.194 36.081,7.891 59.891,31.741 60.741,42.436z"
|
android:pathData="m105.138,114.121a2.864,2.864 90,0 0,1.701 -0.85l19.334,-19.331a2.864,2.864 90,0 0,-0 -4.027l-26.584,-26.625a2.864,2.864 90,0 0,-1.835 -0.805l-7.922,-0.626 5.773,-5.772a2.864,2.864 90,0 0,-0 -4.027l-19.602,-19.644a2.864,2.864 90,0 0,-4.073 -0l-5.773,5.772 -0.627,-7.92a2.864,2.864 90,0 0,-0.805 -1.835l-26.629,-26.58a2.864,2.864 90,0 0,-4.073 -0l-19.289,19.286a2.864,2.864 90,0 0,-0 4.072l26.584,26.625a2.864,2.864 90,0 0,1.835 0.805l7.922,0.626 -5.773,5.772a2.864,2.864 90,0 0,-0 4.072l19.603,19.599a2.864,2.864 90,0 0,4.073 -0l5.773,-5.772 0.626,7.92a2.864,2.864 90,0 0,0.806 1.835l26.629,26.58a2.864,2.864 90,0 0,2.059 0.85,2.864 2.864,90 0,0 0.269,-0zM104.825,107.23 L80.97,83.38 80.165,72.685 85.58,67.271 96.276,68.121 120.13,91.926zM55.326,47.85 L44.629,47 20.775,23.194 36.081,7.891 59.891,31.741 60.741,42.436z"
|
||||||
tools:ignore="VectorPath" />
|
tools:ignore="VectorPath" />
|
||||||
<path
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@color/themeAccent"
|
||||||
android:pathData="m62.653,115.806a2.864,2.864 90,1 0,-0 -5.727c-11.457,-0 -22.876,-4.351 -31.634,-13.107 -8.741,-8.74 -13.095,-20.174 -13.095,-31.614a2.864,2.864 90,1 0,-5.728 -0c-0,12.897 4.935,25.829 14.773,35.664 9.85,9.848 22.772,14.785 35.684,14.785z" />
|
android:pathData="m62.653,115.806a2.864,2.864 90,1 0,-0 -5.727c-11.457,-0 -22.876,-4.351 -31.634,-13.107 -8.741,-8.74 -13.095,-20.174 -13.095,-31.614a2.864,2.864 90,1 0,-5.728 -0c-0,12.897 4.935,25.829 14.773,35.664 9.85,9.848 22.772,14.785 35.684,14.785z" />
|
||||||
<path
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@color/themeAccent"
|
||||||
android:pathData="m62.653,127a2.864,2.864 90,1 0,-0 -5.727c-14.325,-0 -28.612,-5.441 -39.547,-16.375 -10.935,-10.933 -16.378,-25.233 -16.378,-39.541a2.864,2.864 90,1 0,-5.728 -0c-0,15.763 6.025,31.562 18.055,43.59 12.029,12.028 27.818,18.052 43.597,18.052z" />
|
android:pathData="m62.653,127a2.864,2.864 90,1 0,-0 -5.727c-14.325,-0 -28.612,-5.441 -39.547,-16.375 -10.935,-10.933 -16.378,-25.233 -16.378,-39.541a2.864,2.864 90,1 0,-5.728 -0c-0,15.763 6.025,31.562 18.055,43.59 12.029,12.028 27.818,18.052 43.597,18.052z" />
|
||||||
<path
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@color/themeAccent"
|
||||||
android:pathData="m62.653,104.698a2.864,2.864 90,1 0,-0 -5.727c-8.62,-0 -17.201,-3.263 -23.778,-9.839 -6.577,-6.576 -9.855,-15.174 -9.855,-23.774a2.864,2.864 90,1 0,-5.728 -0c-0,10.061 3.861,20.153 11.533,27.824 7.672,7.671 17.756,11.517 27.829,11.517z" />
|
android:pathData="m62.653,104.698a2.864,2.864 90,1 0,-0 -5.727c-8.62,-0 -17.201,-3.263 -23.778,-9.839 -6.577,-6.576 -9.855,-15.174 -9.855,-23.774a2.864,2.864 90,1 0,-5.728 -0c-0,10.061 3.861,20.153 11.533,27.824 7.672,7.671 17.756,11.517 27.829,11.517z" />
|
||||||
<path
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@color/themeAccent"
|
||||||
android:pathData="m62.653,93.475a2.864,2.864 90,1 0,-0 -5.727c-5.737,-0 -11.453,-2.174 -15.836,-6.557 -4.384,-4.383 -6.558,-10.098 -6.558,-15.834a2.864,2.864 90,1 0,-5.728 -0c-0,7.192 2.757,14.406 8.236,19.883 5.479,5.478 12.693,8.234 19.887,8.234z" />
|
android:pathData="m62.653,93.475a2.864,2.864 90,1 0,-0 -5.727c-5.737,-0 -11.453,-2.174 -15.836,-6.557 -4.384,-4.383 -6.558,-10.098 -6.558,-15.834a2.864,2.864 90,1 0,-5.728 -0c-0,7.192 2.757,14.406 8.236,19.883 5.479,5.478 12.693,8.234 19.887,8.234z" />
|
||||||
</vector>
|
</vector>
|
||||||
@@ -4,6 +4,6 @@
|
|||||||
android:viewportWidth="24"
|
android:viewportWidth="24"
|
||||||
android:viewportHeight="24">
|
android:viewportHeight="24">
|
||||||
<path
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@color/themeAccent"
|
||||||
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" />
|
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>
|
</vector>
|
||||||
@@ -5,7 +5,7 @@
|
|||||||
android:viewportWidth="105.83323"
|
android:viewportWidth="105.83323"
|
||||||
android:viewportHeight="114.01299">
|
android:viewportHeight="114.01299">
|
||||||
<path
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@color/themeAccent"
|
||||||
android:pathData="m104.005,111.936q0.504,0 0.958,-0.063 0.467,-0.076 0.87,-0.176l0,1.674q-0.202,0.101 -0.555,0.214 -0.34,0.113 -0.807,0.201 -0.454,0.101 -1.034,0.164 -0.58,0.063 -1.261,0.063 -0.87,0 -1.576,-0.214 -0.706,-0.201 -1.198,-0.68 -0.492,-0.491 -0.757,-1.259 -0.265,-0.78 -0.265,-1.913l0,-8.244l-1.942,0l0,-1.322q0.832,0 1.488,-0.327 0.656,-0.327 1.047,-0.755 0.794,-0.831 1.185,-2.555l2.144,0l0,3.197l3.304,0l0,1.762l-3.304,0l0,7.98q0,1.171 0.391,1.712 0.404,0.541 1.311,0.541zM85.595,109.922q0,1.108 0.353,1.661 0.353,0.554 1.11,0.554 0.555,0 0.996,-0.227 0.454,-0.239 0.769,-0.667 0.328,-0.428 0.492,-1.032 0.177,-0.617 0.177,-1.372l0,-1.938l-1.16,0.076q-0.769,0.038 -1.299,0.252 -0.53,0.201 -0.845,0.566 -0.315,0.365 -0.454,0.894 -0.139,0.529 -0.139,1.233zM87.89,101.188q-0.492,0 -0.832,0.214 -0.328,0.201 -0.53,0.579 -0.202,0.365 -0.29,0.881 -0.076,0.503 -0.076,1.108 -1.74,0 -2.623,-0.39 -0.87,-0.39 -0.87,-1.334 0,-0.705 0.416,-1.208 0.429,-0.503 1.147,-0.818 0.731,-0.315 1.69,-0.453 0.971,-0.151 2.068,-0.151 1.362,0 2.371,0.239 1.021,0.227 1.69,0.743 0.681,0.516 1.021,1.359 0.34,0.831 0.34,2.039l0,6.57q0,0.529 0.076,0.881 0.088,0.352 0.265,0.566 0.177,0.201 0.479,0.289 0.303,0.088 0.731,0.088l0.101,0l0,1.372l-4.804,0l-0.542,-1.775l-0.227,0q-0.429,0.516 -0.807,0.906 -0.378,0.378 -0.807,0.629 -0.429,0.252 -0.971,0.365 -0.53,0.126 -1.261,0.126 -0.857,0 -1.601,-0.252 -0.731,-0.252 -1.286,-0.768 -0.542,-0.529 -0.857,-1.309 -0.315,-0.793 -0.315,-1.863 0,-2.102 1.438,-3.109 1.45,-1.007 4.35,-1.095l2.118,-0.076l0,-1.422q0,-0.642 -0.05,-1.183 -0.05,-0.541 -0.214,-0.931 -0.164,-0.39 -0.492,-0.604 -0.315,-0.214 -0.845,-0.214zM72.115,114.013q-1.74,0 -2.9,-0.327 -1.16,-0.327 -1.866,-0.843 -0.694,-0.516 -0.996,-1.158 -0.29,-0.642 -0.29,-1.271 0,-0.667 0.24,-1.12 0.252,-0.453 0.656,-0.743 0.416,-0.289 0.933,-0.415 0.53,-0.126 1.097,-0.126 0,1.108 0.265,1.951 0.265,0.831 0.731,1.397 0.467,0.554 1.11,0.843 0.656,0.277 1.425,0.277 0.757,0 1.349,-0.214 0.593,-0.214 1.009,-0.592 0.416,-0.378 0.63,-0.881 0.214,-0.516 0.214,-1.108 0,-0.654 -0.265,-1.158 -0.265,-0.516 -0.807,-0.944 -0.53,-0.441 -1.349,-0.831 -0.807,-0.403 -1.891,-0.856 -1.349,-0.554 -2.282,-1.133 -0.921,-0.592 -1.488,-1.271 -0.567,-0.68 -0.82,-1.473 -0.24,-0.793 -0.24,-1.737 0,-1.183 0.479,-2.14 0.479,-0.957 1.324,-1.636 0.845,-0.68 2.005,-1.045 1.16,-0.365 2.522,-0.365 1.425,0 2.459,0.239 1.034,0.227 1.702,0.629 0.681,0.403 1.009,0.957 0.328,0.541 0.328,1.171 0,0.453 -0.202,0.843 -0.189,0.39 -0.593,0.68 -0.391,0.289 -0.996,0.453 -0.593,0.164 -1.387,0.164 0,-0.541 -0.151,-1.158 -0.139,-0.629 -0.467,-1.158 -0.328,-0.541 -0.857,-0.894 -0.517,-0.352 -1.261,-0.352 -0.517,0 -0.984,0.151 -0.467,0.151 -0.82,0.453 -0.34,0.302 -0.542,0.755 -0.202,0.441 -0.202,1.019 0,0.541 0.177,1.019 0.177,0.478 0.643,0.944 0.479,0.453 1.299,0.919 0.832,0.453 2.144,0.982 1.324,0.541 2.257,1.108 0.933,0.566 1.526,1.221 0.605,0.642 0.87,1.422 0.277,0.768 0.277,1.712 0,1.246 -0.492,2.291 -0.492,1.032 -1.412,1.775 -0.921,0.743 -2.219,1.158 -1.286,0.415 -2.9,0.415zM62.115,108.966l0,1.573q0,0.604 0.164,0.969 0.177,0.365 0.454,0.566 0.29,0.189 0.681,0.252 0.391,0.063 0.82,0.063l0.328,0l0,1.372l-9.054,0l0,-1.372l0.719,0q0.441,0 0.82,-0.063 0.391,-0.063 0.668,-0.252 0.29,-0.201 0.454,-0.566 0.177,-0.365 0.177,-0.969l0,-1.573l-7.15,0l0,-1.573l7.326,-12.032l3.594,0l0,11.906l2.686,0l0,1.699zM58.345,102.761q0,-1.133 0.038,-2.442 0.038,-1.309 0.139,-2.517 -0.126,0.302 -0.404,0.831 -0.277,0.529 -0.593,1.095 -0.315,0.554 -0.605,1.057 -0.29,0.491 -0.441,0.73l-3.48,5.752l5.347,0zM50.855,113.761l-0.366,0q-1.412,0 -2.371,-0.063 -0.958,-0.063 -1.652,-0.289 -0.694,-0.227 -1.198,-0.68 -0.504,-0.466 -1.009,-1.259l-2.295,-3.612 -1.034,0.768l0,2.089q0,0.554 0.177,0.881 0.189,0.327 0.454,0.503 0.277,0.176 0.605,0.239 0.328,0.05 0.605,0.05l0.303,0l0,1.372L34.866,113.761l0,-1.372l0.303,0q0.29,0 0.605,-0.05 0.328,-0.063 0.593,-0.239 0.277,-0.176 0.454,-0.503 0.189,-0.327 0.189,-0.881l0,-13.606q0,-0.516 -0.189,-0.818 -0.177,-0.315 -0.454,-0.478 -0.277,-0.176 -0.605,-0.227 -0.315,-0.05 -0.593,-0.05l-0.303,0l0,-1.359l6.065,0l0,9.943q0,0.352 -0.025,0.818 -0.013,0.453 -0.038,0.868 -0.038,0.491 -0.063,0.994l3.253,-3.637q0.429,-0.478 0.555,-0.755 0.139,-0.289 0.139,-0.478 0,-0.327 -0.353,-0.503 -0.34,-0.189 -0.984,-0.189l0,-1.296l6.507,0l0,1.296q-0.895,0 -1.765,0.529 -0.857,0.516 -1.879,1.661l-1.627,1.85 3.43,5.11q0.681,1.019 1.374,1.51 0.694,0.491 1.311,0.491l0.088,0zM33.517,106.31q0,1.007 -0.29,1.901 -0.29,0.894 -0.82,1.573 -0.517,0.667 -1.261,1.057 -0.731,0.39 -1.627,0.39 -1.198,0 -2.333,-0.73 -1.122,-0.743 -2.055,-2.417 -0.794,1.523 -1.828,2.303 -1.034,0.768 -2.181,0.768 -0.883,0 -1.627,-0.34 -0.744,-0.352 -1.286,-0.982 -0.542,-0.642 -0.845,-1.548 -0.29,-0.919 -0.29,-2.052 0,-1.032 0.29,-1.926 0.29,-0.906 0.82,-1.561 0.53,-0.667 1.274,-1.045 0.744,-0.39 1.664,-0.39 0.593,0 1.173,0.176 0.593,0.164 1.147,0.541 0.567,0.365 1.072,0.944 0.517,0.579 0.946,1.41 0.794,-1.498 1.791,-2.24 0.996,-0.755 2.295,-0.755 0.8Line truncated
|
android:pathData="m104.005,111.936q0.504,0 0.958,-0.063 0.467,-0.076 0.87,-0.176l0,1.674q-0.202,0.101 -0.555,0.214 -0.34,0.113 -0.807,0.201 -0.454,0.101 -1.034,0.164 -0.58,0.063 -1.261,0.063 -0.87,0 -1.576,-0.214 -0.706,-0.201 -1.198,-0.68 -0.492,-0.491 -0.757,-1.259 -0.265,-0.78 -0.265,-1.913l0,-8.244l-1.942,0l0,-1.322q0.832,0 1.488,-0.327 0.656,-0.327 1.047,-0.755 0.794,-0.831 1.185,-2.555l2.144,0l0,3.197l3.304,0l0,1.762l-3.304,0l0,7.98q0,1.171 0.391,1.712 0.404,0.541 1.311,0.541zM85.595,109.922q0,1.108 0.353,1.661 0.353,0.554 1.11,0.554 0.555,0 0.996,-0.227 0.454,-0.239 0.769,-0.667 0.328,-0.428 0.492,-1.032 0.177,-0.617 0.177,-1.372l0,-1.938l-1.16,0.076q-0.769,0.038 -1.299,0.252 -0.53,0.201 -0.845,0.566 -0.315,0.365 -0.454,0.894 -0.139,0.529 -0.139,1.233zM87.89,101.188q-0.492,0 -0.832,0.214 -0.328,0.201 -0.53,0.579 -0.202,0.365 -0.29,0.881 -0.076,0.503 -0.076,1.108 -1.74,0 -2.623,-0.39 -0.87,-0.39 -0.87,-1.334 0,-0.705 0.416,-1.208 0.429,-0.503 1.147,-0.818 0.731,-0.315 1.69,-0.453 0.971,-0.151 2.068,-0.151 1.362,0 2.371,0.239 1.021,0.227 1.69,0.743 0.681,0.516 1.021,1.359 0.34,0.831 0.34,2.039l0,6.57q0,0.529 0.076,0.881 0.088,0.352 0.265,0.566 0.177,0.201 0.479,0.289 0.303,0.088 0.731,0.088l0.101,0l0,1.372l-4.804,0l-0.542,-1.775l-0.227,0q-0.429,0.516 -0.807,0.906 -0.378,0.378 -0.807,0.629 -0.429,0.252 -0.971,0.365 -0.53,0.126 -1.261,0.126 -0.857,0 -1.601,-0.252 -0.731,-0.252 -1.286,-0.768 -0.542,-0.529 -0.857,-1.309 -0.315,-0.793 -0.315,-1.863 0,-2.102 1.438,-3.109 1.45,-1.007 4.35,-1.095l2.118,-0.076l0,-1.422q0,-0.642 -0.05,-1.183 -0.05,-0.541 -0.214,-0.931 -0.164,-0.39 -0.492,-0.604 -0.315,-0.214 -0.845,-0.214zM72.115,114.013q-1.74,0 -2.9,-0.327 -1.16,-0.327 -1.866,-0.843 -0.694,-0.516 -0.996,-1.158 -0.29,-0.642 -0.29,-1.271 0,-0.667 0.24,-1.12 0.252,-0.453 0.656,-0.743 0.416,-0.289 0.933,-0.415 0.53,-0.126 1.097,-0.126 0,1.108 0.265,1.951 0.265,0.831 0.731,1.397 0.467,0.554 1.11,0.843 0.656,0.277 1.425,0.277 0.757,0 1.349,-0.214 0.593,-0.214 1.009,-0.592 0.416,-0.378 0.63,-0.881 0.214,-0.516 0.214,-1.108 0,-0.654 -0.265,-1.158 -0.265,-0.516 -0.807,-0.944 -0.53,-0.441 -1.349,-0.831 -0.807,-0.403 -1.891,-0.856 -1.349,-0.554 -2.282,-1.133 -0.921,-0.592 -1.488,-1.271 -0.567,-0.68 -0.82,-1.473 -0.24,-0.793 -0.24,-1.737 0,-1.183 0.479,-2.14 0.479,-0.957 1.324,-1.636 0.845,-0.68 2.005,-1.045 1.16,-0.365 2.522,-0.365 1.425,0 2.459,0.239 1.034,0.227 1.702,0.629 0.681,0.403 1.009,0.957 0.328,0.541 0.328,1.171 0,0.453 -0.202,0.843 -0.189,0.39 -0.593,0.68 -0.391,0.289 -0.996,0.453 -0.593,0.164 -1.387,0.164 0,-0.541 -0.151,-1.158 -0.139,-0.629 -0.467,-1.158 -0.328,-0.541 -0.857,-0.894 -0.517,-0.352 -1.261,-0.352 -0.517,0 -0.984,0.151 -0.467,0.151 -0.82,0.453 -0.34,0.302 -0.542,0.755 -0.202,0.441 -0.202,1.019 0,0.541 0.177,1.019 0.177,0.478 0.643,0.944 0.479,0.453 1.299,0.919 0.832,0.453 2.144,0.982 1.324,0.541 2.257,1.108 0.933,0.566 1.526,1.221 0.605,0.642 0.87,1.422 0.277,0.768 0.277,1.712 0,1.246 -0.492,2.291 -0.492,1.032 -1.412,1.775 -0.921,0.743 -2.219,1.158 -1.286,0.415 -2.9,0.415zM62.115,108.966l0,1.573q0,0.604 0.164,0.969 0.177,0.365 0.454,0.566 0.29,0.189 0.681,0.252 0.391,0.063 0.82,0.063l0.328,0l0,1.372l-9.054,0l0,-1.372l0.719,0q0.441,0 0.82,-0.063 0.391,-0.063 0.668,-0.252 0.29,-0.201 0.454,-0.566 0.177,-0.365 0.177,-0.969l0,-1.573l-7.15,0l0,-1.573l7.326,-12.032l3.594,0l0,11.906l2.686,0l0,1.699zM58.345,102.761q0,-1.133 0.038,-2.442 0.038,-1.309 0.139,-2.517 -0.126,0.302 -0.404,0.831 -0.277,0.529 -0.593,1.095 -0.315,0.554 -0.605,1.057 -0.29,0.491 -0.441,0.73l-3.48,5.752l5.347,0zM50.855,113.761l-0.366,0q-1.412,0 -2.371,-0.063 -0.958,-0.063 -1.652,-0.289 -0.694,-0.227 -1.198,-0.68 -0.504,-0.466 -1.009,-1.259l-2.295,-3.612 -1.034,0.768l0,2.089q0,0.554 0.177,0.881 0.189,0.327 0.454,0.503 0.277,0.176 0.605,0.239 0.328,0.05 0.605,0.05l0.303,0l0,1.372L34.866,113.761l0,-1.372l0.303,0q0.29,0 0.605,-0.05 0.328,-0.063 0.593,-0.239 0.277,-0.176 0.454,-0.503 0.189,-0.327 0.189,-0.881l0,-13.606q0,-0.516 -0.189,-0.818 -0.177,-0.315 -0.454,-0.478 -0.277,-0.176 -0.605,-0.227 -0.315,-0.05 -0.593,-0.05l-0.303,0l0,-1.359l6.065,0l0,9.943q0,0.352 -0.025,0.818 -0.013,0.453 -0.038,0.868 -0.038,0.491 -0.063,0.994l3.253,-3.637q0.429,-0.478 0.555,-0.755 0.139,-0.289 0.139,-0.478 0,-0.327 -0.353,-0.503 -0.34,-0.189 -0.984,-0.189l0,-1.296l6.507,0l0,1.296q-0.895,0 -1.765,0.529 -0.857,0.516 -1.879,1.661l-1.627,1.85 3.43,5.11q0.681,1.019 1.374,1.51 0.694,0.491 1.311,0.491l0.088,0zM33.517,106.31q0,1.007 -0.29,1.901 -0.29,0.894 -0.82,1.573 -0.517,0.667 -1.261,1.057 -0.731,0.39 -1.627,0.39 -1.198,0 -2.333,-0.73 -1.122,-0.743 -2.055,-2.417 -0.794,1.523 -1.828,2.303 -1.034,0.768 -2.181,0.768 -0.883,0 -1.627,-0.34 -0.744,-0.352 -1.286,-0.982 -0.542,-0.642 -0.845,-1.548 -0.29,-0.919 -0.29,-2.052 0,-1.032 0.29,-1.926 0.29,-0.906 0.82,-1.561 0.53,-0.667 1.274,-1.045 0.744,-0.39 1.664,-0.39 0.593,0 1.173,0.176 0.593,0.164 1.147,0.541 0.567,0.365 1.072,0.944 0.517,0.579 0.946,1.41 0.794,-1.498 1.791,-2.24 0.996,-0.755 2.295,-0.755 0.8Line truncated
|
||||||
tools:ignore="VectorPath" />
|
tools:ignore="VectorPath" />
|
||||||
</vector>
|
</vector>
|
||||||
+2
-2
@@ -5,10 +5,10 @@
|
|||||||
android:viewportWidth="128"
|
android:viewportWidth="128"
|
||||||
android:viewportHeight="128">
|
android:viewportHeight="128">
|
||||||
<path
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@color/themeAccent"
|
||||||
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" />
|
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
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@color/themeAccent"
|
||||||
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"
|
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" />
|
tools:ignore="VectorPath" />
|
||||||
</vector>
|
</vector>
|
||||||
@@ -5,10 +5,10 @@
|
|||||||
android:viewportWidth="128"
|
android:viewportWidth="128"
|
||||||
android:viewportHeight="128">
|
android:viewportHeight="128">
|
||||||
<path
|
<path
|
||||||
android:fillColor="@color/greyDark"
|
android:fillColor="@color/surfaceBg"
|
||||||
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" />
|
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
|
<path
|
||||||
android:fillColor="@color/greyDark"
|
android:fillColor="@color/surfaceBg"
|
||||||
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"
|
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" />
|
tools:ignore="VectorPath" />
|
||||||
</vector>
|
</vector>
|
||||||
@@ -4,6 +4,6 @@
|
|||||||
android:viewportWidth="24"
|
android:viewportWidth="24"
|
||||||
android:viewportHeight="24">
|
android:viewportHeight="24">
|
||||||
<path
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@color/themeAccent"
|
||||||
android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z" />
|
android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z" />
|
||||||
</vector>
|
</vector>
|
||||||
@@ -4,6 +4,6 @@
|
|||||||
android:viewportWidth="24"
|
android:viewportWidth="24"
|
||||||
android:viewportHeight="24">
|
android:viewportHeight="24">
|
||||||
<path
|
<path
|
||||||
android:fillColor="@color/themeLight"
|
android:fillColor="@color/themeAccent"
|
||||||
android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM17,13l-5,5 -5,-5h3V9h4v4h3z" />
|
android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM17,13l-5,5 -5,-5h3V9h4v4h3z" />
|
||||||
</vector>
|
</vector>
|
||||||
@@ -5,7 +5,7 @@
|
|||||||
<size
|
<size
|
||||||
android:width="1dp"
|
android:width="1dp"
|
||||||
android:height="1dp" />
|
android:height="1dp" />
|
||||||
<solid android:color="@color/greyDark" />
|
<solid android:color="@color/surfaceBg" />
|
||||||
</shape>
|
</shape>
|
||||||
</item>
|
</item>
|
||||||
</layer-list>
|
</layer-list>
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
|
<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:id="@+id/main_nav_host"
|
android:id="@+id/nav_host"
|
||||||
android:name="androidx.navigation.fragment.NavHostFragment"
|
android:name="androidx.navigation.fragment.NavHostFragment"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
|
|||||||
@@ -9,8 +9,7 @@
|
|||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:contentDescription="@string/placeholder"
|
android:src="@drawable/ic_sputnik"
|
||||||
android:src="@drawable/ic_nav_entries"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/about_version"
|
app:layout_constraintBottom_toBottomOf="@+id/about_version"
|
||||||
app:layout_constraintDimensionRatio="h,1:1"
|
app:layout_constraintDimensionRatio="h,1:1"
|
||||||
app:layout_constraintEnd_toStartOf="@+id/about_title"
|
app:layout_constraintEnd_toStartOf="@+id/about_title"
|
||||||
@@ -26,7 +25,7 @@
|
|||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:includeFontPadding="false"
|
android:includeFontPadding="false"
|
||||||
android:text="@string/app_name"
|
android:text="@string/app_name"
|
||||||
android:textColor="@color/themeLight"
|
android:textColor="@color/themeAccent"
|
||||||
android:textSize="48sp"
|
android:textSize="48sp"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@+id/about_img"
|
app:layout_constraintStart_toEndOf="@+id/about_img"
|
||||||
@@ -37,7 +36,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/about_version"
|
android:text="@string/about_version"
|
||||||
android:textColor="@color/greyLight"
|
android:textColor="@color/themeLight"
|
||||||
android:textSize="22sp"
|
android:textSize="22sp"
|
||||||
app:layout_constraintStart_toStartOf="@+id/about_title"
|
app:layout_constraintStart_toStartOf="@+id/about_title"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/about_title" />
|
app:layout_constraintTop_toBottomOf="@+id/about_title" />
|
||||||
@@ -48,6 +47,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="4dp"
|
android:layout_marginTop="4dp"
|
||||||
android:text="@string/about_subtitle"
|
android:text="@string/about_subtitle"
|
||||||
|
android:textColor="@color/themeLight"
|
||||||
android:textSize="20sp"
|
android:textSize="20sp"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
@@ -65,7 +65,6 @@
|
|||||||
android:text="@string/about_github"
|
android:text="@string/about_github"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toStartOf="@+id/about_btn_donate"
|
app:layout_constraintEnd_toStartOf="@+id/about_btn_donate"
|
||||||
app:layout_constraintHorizontal_bias="0.5"
|
|
||||||
app:layout_constraintHorizontal_chainStyle="spread_inside"
|
app:layout_constraintHorizontal_chainStyle="spread_inside"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/about_subtitle" />
|
app:layout_constraintTop_toBottomOf="@+id/about_subtitle" />
|
||||||
@@ -79,7 +78,6 @@
|
|||||||
android:text="@string/about_support"
|
android:text="@string/about_support"
|
||||||
app:layout_constraintBaseline_toBaselineOf="@+id/about_btn_github"
|
app:layout_constraintBaseline_toBaselineOf="@+id/about_btn_github"
|
||||||
app:layout_constraintEnd_toStartOf="@+id/about_btn_fdroid"
|
app:layout_constraintEnd_toStartOf="@+id/about_btn_fdroid"
|
||||||
app:layout_constraintHorizontal_bias="0.5"
|
|
||||||
app:layout_constraintStart_toEndOf="@+id/about_btn_github" />
|
app:layout_constraintStart_toEndOf="@+id/about_btn_github" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
@@ -92,7 +90,6 @@
|
|||||||
android:text="@string/about_fdroid"
|
android:text="@string/about_fdroid"
|
||||||
app:layout_constraintBaseline_toBaselineOf="@+id/about_btn_github"
|
app:layout_constraintBaseline_toBaselineOf="@+id/about_btn_github"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintHorizontal_bias="0.5"
|
|
||||||
app:layout_constraintStart_toEndOf="@+id/about_btn_donate" />
|
app:layout_constraintStart_toEndOf="@+id/about_btn_donate" />
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:text="@string/location_title"
|
android:text="@string/location_title"
|
||||||
android:textColor="@color/themeLight"
|
android:textColor="@color/themeAccent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
@@ -23,7 +23,7 @@
|
|||||||
android:layout_marginStart="4dp"
|
android:layout_marginStart="4dp"
|
||||||
android:layout_marginTop="4dp"
|
android:layout_marginTop="4dp"
|
||||||
android:layout_marginBottom="4dp"
|
android:layout_marginBottom="4dp"
|
||||||
android:drawableStart="@drawable/ic_gps"
|
android:drawableStart="@drawable/ic_pos"
|
||||||
android:text="@string/location_gps"
|
android:text="@string/location_gps"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toStartOf="@+id/location_btn_qth"
|
app:layout_constraintEnd_toStartOf="@+id/location_btn_qth"
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:text="@string/other_title"
|
android:text="@string/other_title"
|
||||||
android:textColor="@color/themeLight"
|
android:textColor="@color/themeAccent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
android:layout_marginEnd="4dp"
|
android:layout_marginEnd="4dp"
|
||||||
android:minHeight="48dp"
|
android:minHeight="48dp"
|
||||||
android:text="@string/other_switch_utc"
|
android:text="@string/other_switch_utc"
|
||||||
android:textColor="@color/greyLight"
|
android:textColor="@color/themeLight"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/other_title" />
|
app:layout_constraintTop_toBottomOf="@+id/other_title" />
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:minHeight="48dp"
|
android:minHeight="48dp"
|
||||||
android:text="@string/other_switch_sweep"
|
android:text="@string/other_switch_sweep"
|
||||||
android:textColor="@color/greyLight"
|
android:textColor="@color/themeLight"
|
||||||
app:layout_constraintEnd_toEndOf="@+id/other_switch_utc"
|
app:layout_constraintEnd_toEndOf="@+id/other_switch_utc"
|
||||||
app:layout_constraintStart_toStartOf="@+id/other_switch_utc"
|
app:layout_constraintStart_toStartOf="@+id/other_switch_utc"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/other_switch_utc" />
|
app:layout_constraintTop_toBottomOf="@+id/other_switch_utc" />
|
||||||
@@ -47,7 +47,7 @@
|
|||||||
android:layout_marginBottom="8dp"
|
android:layout_marginBottom="8dp"
|
||||||
android:minHeight="48dp"
|
android:minHeight="48dp"
|
||||||
android:text="@string/other_switch_sensors"
|
android:text="@string/other_switch_sensors"
|
||||||
android:textColor="@color/greyLight"
|
android:textColor="@color/themeLight"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="@+id/other_switch_utc"
|
app:layout_constraintEnd_toEndOf="@+id/other_switch_utc"
|
||||||
app:layout_constraintStart_toStartOf="@+id/other_switch_sweep"
|
app:layout_constraintStart_toStartOf="@+id/other_switch_sweep"
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:text="@string/tracking_title"
|
android:text="@string/tracking_title"
|
||||||
android:textColor="@color/themeLight"
|
android:textColor="@color/themeAccent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
@@ -23,7 +23,7 @@
|
|||||||
android:layout_marginEnd="4dp"
|
android:layout_marginEnd="4dp"
|
||||||
android:minHeight="48dp"
|
android:minHeight="48dp"
|
||||||
android:text="@string/tracking_switch"
|
android:text="@string/tracking_switch"
|
||||||
android:textColor="@color/greyLight"
|
android:textColor="@color/themeLight"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/tracking_title" />
|
app:layout_constraintTop_toBottomOf="@+id/tracking_title" />
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:text="@string/update_title"
|
android:text="@string/update_title"
|
||||||
android:textColor="@color/themeLight"
|
android:textColor="@color/themeAccent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
@@ -20,29 +20,29 @@
|
|||||||
style="@style/InfoButton"
|
style="@style/InfoButton"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="4dp"
|
android:layout_marginEnd="4dp"
|
||||||
android:layout_marginTop="4dp"
|
|
||||||
android:layout_marginBottom="4dp"
|
|
||||||
android:drawableStart="@drawable/ic_update_web"
|
android:drawableStart="@drawable/ic_update_web"
|
||||||
android:text="@string/update_web"
|
android:text="@string/update_web"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBaseline_toBaselineOf="@+id/update_btn_file"
|
||||||
app:layout_constraintEnd_toStartOf="@+id/update_btn_file"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintHorizontal_bias="0.5"
|
app:layout_constraintHorizontal_bias="0.5"
|
||||||
app:layout_constraintHorizontal_chainStyle="spread_inside"
|
app:layout_constraintHorizontal_chainStyle="spread_inside"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toEndOf="@+id/update_btn_file" />
|
||||||
app:layout_constraintTop_toBottomOf="@+id/update_title" />
|
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/update_btn_file"
|
android:id="@+id/update_btn_file"
|
||||||
style="@style/InfoButton"
|
style="@style/InfoButton"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginEnd="4dp"
|
android:layout_marginStart="4dp"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:layout_marginBottom="4dp"
|
||||||
android:drawableStart="@drawable/ic_update_file"
|
android:drawableStart="@drawable/ic_update_file"
|
||||||
android:text="@string/update_file"
|
android:text="@string/update_file"
|
||||||
app:layout_constraintBaseline_toBaselineOf="@+id/update_btn_web"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toStartOf="@+id/update_btn_web"
|
||||||
app:layout_constraintHorizontal_bias="0.5"
|
app:layout_constraintHorizontal_bias="0.5"
|
||||||
app:layout_constraintStart_toEndOf="@+id/update_btn_web" />
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/update_title" />
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:text="@string/warranty_title"
|
android:text="@string/warranty_title"
|
||||||
android:textColor="@color/themeLight"
|
android:textColor="@color/themeAccent"
|
||||||
android:textSize="15sp"
|
android:textSize="15sp"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
android:layout_marginTop="4dp"
|
android:layout_marginTop="4dp"
|
||||||
android:layout_marginEnd="8dp"
|
android:layout_marginEnd="8dp"
|
||||||
android:text="@string/warranty_thanks"
|
android:text="@string/warranty_thanks"
|
||||||
android:textColor="@color/greyLight"
|
android:textColor="@color/themeLight"
|
||||||
android:textSize="15sp"
|
android:textSize="15sp"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
@@ -37,7 +37,7 @@
|
|||||||
android:layout_marginTop="4dp"
|
android:layout_marginTop="4dp"
|
||||||
android:layout_marginBottom="8dp"
|
android:layout_marginBottom="8dp"
|
||||||
android:text="@string/warranty_license"
|
android:text="@string/warranty_license"
|
||||||
android:textColor="@color/greyLight"
|
android:textColor="@color/themeLight"
|
||||||
android:textSize="15sp"
|
android:textSize="15sp"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="@+id/warranty_thanks"
|
app:layout_constraintEnd_toEndOf="@+id/warranty_thanks"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="@color/greyDark">
|
android:background="@color/surfaceBg">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/pass_pref_title"
|
android:id="@+id/pass_pref_title"
|
||||||
@@ -69,10 +69,10 @@
|
|||||||
android:layout_marginStart="16dp"
|
android:layout_marginStart="16dp"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:layout_marginBottom="16dp"
|
android:layout_marginBottom="16dp"
|
||||||
android:backgroundTint="@color/greySurface"
|
android:backgroundTint="@color/surfaceToolbar"
|
||||||
android:text="@string/btn_cancel"
|
android:text="@string/btn_cancel"
|
||||||
android:textAllCaps="false"
|
android:textAllCaps="false"
|
||||||
android:textColor="@color/themeLight"
|
android:textColor="@color/themeAccent"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toStartOf="@+id/pass_pref_btn_pos"
|
app:layout_constraintEnd_toStartOf="@+id/pass_pref_btn_pos"
|
||||||
app:layout_constraintHorizontal_bias="0.5"
|
app:layout_constraintHorizontal_bias="0.5"
|
||||||
@@ -85,10 +85,10 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginEnd="16dp"
|
android:layout_marginEnd="16dp"
|
||||||
android:backgroundTint="@color/greySurface"
|
android:backgroundTint="@color/surfaceToolbar"
|
||||||
android:text="@string/btn_update"
|
android:text="@string/btn_update"
|
||||||
android:textAllCaps="false"
|
android:textAllCaps="false"
|
||||||
android:textColor="@color/themeLight"
|
android:textColor="@color/themeAccent"
|
||||||
app:layout_constraintBaseline_toBaselineOf="@+id/pass_pref_btn_neg"
|
app:layout_constraintBaseline_toBaselineOf="@+id/pass_pref_btn_neg"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintHorizontal_bias="0.5"
|
app:layout_constraintHorizontal_bias="0.5"
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
android:id="@+id/sources_root"
|
android:id="@+id/sources_root"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="@color/greyDark"
|
android:background="@color/surfaceBg"
|
||||||
android:padding="4dp">
|
android:padding="4dp">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
android:id="@+id/sources_btn_add"
|
android:id="@+id/sources_btn_add"
|
||||||
android:layout_width="48dp"
|
android:layout_width="48dp"
|
||||||
android:layout_height="48dp"
|
android:layout_height="48dp"
|
||||||
android:backgroundTint="@color/greySurface"
|
android:backgroundTint="@color/surfaceToolbar"
|
||||||
android:contentDescription="@string/placeholder"
|
android:contentDescription="@string/placeholder"
|
||||||
android:src="@drawable/ic_add"
|
android:src="@drawable/ic_add"
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/sources_warning"
|
app:layout_constraintBottom_toBottomOf="@+id/sources_warning"
|
||||||
@@ -60,10 +60,10 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="4dp"
|
android:layout_marginStart="4dp"
|
||||||
android:backgroundTint="@color/greySurface"
|
android:backgroundTint="@color/surfaceToolbar"
|
||||||
android:text="@string/btn_cancel"
|
android:text="@string/btn_cancel"
|
||||||
android:textAllCaps="false"
|
android:textAllCaps="false"
|
||||||
android:textColor="@color/themeLight"
|
android:textColor="@color/themeAccent"
|
||||||
app:layout_constraintBaseline_toBaselineOf="@+id/sources_btn_pos"
|
app:layout_constraintBaseline_toBaselineOf="@+id/sources_btn_pos"
|
||||||
app:layout_constraintHorizontal_chainStyle="spread_inside"
|
app:layout_constraintHorizontal_chainStyle="spread_inside"
|
||||||
app:layout_constraintStart_toStartOf="parent" />
|
app:layout_constraintStart_toStartOf="parent" />
|
||||||
@@ -75,10 +75,10 @@
|
|||||||
android:layout_marginTop="4dp"
|
android:layout_marginTop="4dp"
|
||||||
android:layout_marginEnd="4dp"
|
android:layout_marginEnd="4dp"
|
||||||
android:layout_marginBottom="4dp"
|
android:layout_marginBottom="4dp"
|
||||||
android:backgroundTint="@color/greySurface"
|
android:backgroundTint="@color/surfaceToolbar"
|
||||||
android:text="@string/btn_update"
|
android:text="@string/btn_update"
|
||||||
android:textAllCaps="false"
|
android:textAllCaps="false"
|
||||||
android:textColor="@color/themeLight"
|
android:textColor="@color/themeAccent"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/sources_recycler" />
|
app:layout_constraintTop_toBottomOf="@+id/sources_recycler" />
|
||||||
|
|||||||
@@ -4,45 +4,54 @@
|
|||||||
android:id="@+id/entries_root"
|
android:id="@+id/entries_root"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@color/greyCard">
|
android:background="@color/surfaceCard">
|
||||||
|
|
||||||
<androidx.appcompat.widget.Toolbar
|
<androidx.cardview.widget.CardView
|
||||||
android:id="@+id/entries_bar"
|
android:id="@+id/entries_toolbar"
|
||||||
style="@style/Toolbar"
|
style="@style/Toolbar"
|
||||||
android:layout_width="0dp"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<ImageButton
|
||||||
|
android:id="@+id/entries_back"
|
||||||
|
style="@style/ToolbarButton"
|
||||||
|
android:layout_marginStart="4dp"
|
||||||
|
android:src="@drawable/ic_back"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/entries_toolbar"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/entries_toolbar"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/entries_toolbar" />
|
||||||
|
|
||||||
<SearchView
|
<SearchView
|
||||||
android:id="@+id/entries_search_bar"
|
android:id="@+id/entries_search_bar"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="32dp"
|
||||||
android:elevation="16dp"
|
android:elevation="16dp"
|
||||||
android:iconifiedByDefault="false"
|
android:iconifiedByDefault="false"
|
||||||
android:queryHint="@string/entries_search_hint"
|
android:queryHint="@string/entries_search_hint"
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/entries_bar"
|
app:layout_constraintBottom_toBottomOf="@+id/entries_toolbar"
|
||||||
app:layout_constraintEnd_toStartOf="@+id/entries_select_mode"
|
app:layout_constraintEnd_toStartOf="@+id/entries_select_mode"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="@+id/entries_bar" />
|
app:layout_constraintTop_toTopOf="@+id/entries_toolbar" />
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/entries_select_mode"
|
android:id="@+id/entries_select_mode"
|
||||||
android:layout_width="64dp"
|
android:layout_width="64dp"
|
||||||
android:layout_height="48dp"
|
android:layout_height="48dp"
|
||||||
android:elevation="16dp"
|
android:elevation="16dp"
|
||||||
android:backgroundTint="@color/greySurface"
|
android:backgroundTint="@color/surfaceToolbar"
|
||||||
android:contentDescription="@string/placeholder"
|
android:contentDescription="@string/placeholder"
|
||||||
android:src="@drawable/ic_satellite"
|
android:src="@drawable/ic_satellite"
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/entries_bar"
|
app:layout_constraintBottom_toBottomOf="@+id/entries_toolbar"
|
||||||
app:layout_constraintEnd_toStartOf="@+id/entries_select_all"
|
app:layout_constraintEnd_toStartOf="@+id/entries_select_all"
|
||||||
app:layout_constraintTop_toTopOf="@+id/entries_bar" />
|
app:layout_constraintTop_toTopOf="@+id/entries_toolbar" />
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/entries_select_all"
|
android:id="@+id/entries_select_all"
|
||||||
android:layout_width="64dp"
|
android:layout_width="64dp"
|
||||||
android:layout_height="48dp"
|
android:layout_height="48dp"
|
||||||
android:backgroundTint="@color/greySurface"
|
android:backgroundTint="@color/surfaceToolbar"
|
||||||
android:contentDescription="@string/placeholder"
|
android:contentDescription="@string/placeholder"
|
||||||
android:elevation="16dp"
|
android:elevation="16dp"
|
||||||
android:src="@drawable/ic_select_all"
|
android:src="@drawable/ic_select_all"
|
||||||
@@ -57,7 +66,7 @@
|
|||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/entries_bar" />
|
app:layout_constraintTop_toBottomOf="@+id/entries_toolbar" />
|
||||||
|
|
||||||
<ProgressBar
|
<ProgressBar
|
||||||
android:id="@+id/entries_progress"
|
android:id="@+id/entries_progress"
|
||||||
@@ -67,6 +76,6 @@
|
|||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/entries_bar" />
|
app:layout_constraintTop_toBottomOf="@+id/entries_toolbar" />
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -7,16 +7,40 @@
|
|||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:keepScreenOn="true">
|
android:keepScreenOn="true">
|
||||||
|
|
||||||
|
<androidx.cardview.widget.CardView
|
||||||
|
android:id="@+id/map_toolbar"
|
||||||
|
style="@style/Toolbar"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<ImageButton
|
||||||
|
android:id="@+id/map_back"
|
||||||
|
style="@style/ToolbarButton"
|
||||||
|
android:layout_marginStart="4dp"
|
||||||
|
android:src="@drawable/ic_back"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/map_toolbar"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/map_toolbar"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/map_toolbar" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/map_title"
|
||||||
|
style="@style/ToolbarText"
|
||||||
|
android:text="TextView"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/map_toolbar"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/map_toolbar"
|
||||||
|
app:layout_constraintHorizontal_bias="0.32"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/map_toolbar"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/map_toolbar" />
|
||||||
|
|
||||||
<org.osmdroid.views.MapView
|
<org.osmdroid.views.MapView
|
||||||
android:id="@+id/map_view"
|
android:id="@+id/map_view"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="0dp"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent">
|
app:layout_constraintTop_toBottomOf="@+id/map_toolbar" />
|
||||||
|
|
||||||
</org.osmdroid.views.MapView>
|
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:id="@+id/map_data_root"
|
android:id="@+id/map_data_root"
|
||||||
@@ -28,7 +52,7 @@
|
|||||||
android:background="@drawable/map_info_rounded"
|
android:background="@drawable/map_info_rounded"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent">
|
app:layout_constraintTop_toBottomOf="@+id/map_toolbar">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/map_data_lat"
|
android:id="@+id/map_data_lat"
|
||||||
@@ -109,10 +133,9 @@
|
|||||||
android:layout_height="52dp"
|
android:layout_height="52dp"
|
||||||
android:layout_marginStart="48dp"
|
android:layout_marginStart="48dp"
|
||||||
android:layout_marginBottom="48dp"
|
android:layout_marginBottom="48dp"
|
||||||
android:backgroundTint="@color/greySurface"
|
android:backgroundTint="@color/surfaceToolbar"
|
||||||
android:contentDescription="@string/placeholder"
|
|
||||||
android:rotation="180"
|
android:rotation="180"
|
||||||
android:src="@drawable/ic_next"
|
android:src="@drawable/ic_arrow"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
tools:ignore="DuplicateSpeakableTextCheck" />
|
tools:ignore="DuplicateSpeakableTextCheck" />
|
||||||
@@ -123,9 +146,8 @@
|
|||||||
android:layout_height="52dp"
|
android:layout_height="52dp"
|
||||||
android:layout_marginEnd="48dp"
|
android:layout_marginEnd="48dp"
|
||||||
android:layout_marginBottom="48dp"
|
android:layout_marginBottom="48dp"
|
||||||
android:backgroundTint="@color/greySurface"
|
android:backgroundTint="@color/surfaceToolbar"
|
||||||
android:contentDescription="@string/placeholder"
|
android:src="@drawable/ic_arrow"
|
||||||
android:src="@drawable/ic_next"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent" />
|
app:layout_constraintEnd_toEndOf="parent" />
|
||||||
|
|
||||||
@@ -135,7 +157,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:text="@string/map_copyright"
|
android:text="@string/map_copyright"
|
||||||
android:textColor="@color/themeLight"
|
android:textColor="@color/themeAccent"
|
||||||
android:textSize="12sp"
|
android:textSize="12sp"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
|||||||
@@ -5,52 +5,38 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
<androidx.appcompat.widget.Toolbar
|
<androidx.cardview.widget.CardView
|
||||||
android:id="@+id/passes_bar"
|
android:id="@+id/passes_toolbar"
|
||||||
android:layout_width="0dp"
|
|
||||||
style="@style/Toolbar"
|
style="@style/Toolbar"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/passes_timer"
|
|
||||||
style="@style/TimerText"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:elevation="16dp"
|
|
||||||
android:text="@string/timer_zero"
|
|
||||||
android:textSize="40sp"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/passes_bar"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="@id/passes_bar"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/passes_filter"
|
android:id="@+id/passes_filter"
|
||||||
android:layout_width="48dp"
|
style="@style/ToolbarButton"
|
||||||
android:layout_height="48dp"
|
|
||||||
android:layout_marginStart="4dp"
|
android:layout_marginStart="4dp"
|
||||||
android:background="?android:attr/actionBarItemBackground"
|
|
||||||
android:contentDescription="@string/placeholder"
|
|
||||||
android:elevation="16dp"
|
|
||||||
android:src="@drawable/ic_filter"
|
android:src="@drawable/ic_filter"
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/passes_bar"
|
app:layout_constraintBottom_toBottomOf="@+id/passes_toolbar"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="@+id/passes_toolbar"
|
||||||
app:layout_constraintTop_toTopOf="@+id/passes_bar" />
|
app:layout_constraintTop_toTopOf="@+id/passes_toolbar" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/passes_timer"
|
||||||
|
style="@style/ToolbarTimer"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/passes_toolbar"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/passes_toolbar"
|
||||||
|
app:layout_constraintStart_toStartOf="@id/passes_toolbar"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/passes_toolbar" />
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/passes_settings"
|
android:id="@+id/passes_settings"
|
||||||
android:layout_width="48dp"
|
style="@style/ToolbarButton"
|
||||||
android:layout_height="48dp"
|
|
||||||
android:layout_marginEnd="4dp"
|
android:layout_marginEnd="4dp"
|
||||||
android:background="?android:attr/actionBarItemBackground"
|
android:src="@drawable/ic_prefs"
|
||||||
android:contentDescription="@string/placeholder"
|
app:layout_constraintBottom_toBottomOf="@+id/passes_toolbar"
|
||||||
android:elevation="16dp"
|
app:layout_constraintEnd_toEndOf="@+id/passes_toolbar"
|
||||||
android:src="@drawable/ic_nav_prefs"
|
app:layout_constraintTop_toTopOf="@+id/passes_toolbar" />
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/passes_bar"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/passes_bar" />
|
|
||||||
|
|
||||||
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
|
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
|
||||||
android:id="@+id/passes_swipe"
|
android:id="@+id/passes_swipe"
|
||||||
@@ -59,7 +45,7 @@
|
|||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/passes_bar">
|
app:layout_constraintTop_toBottomOf="@+id/passes_toolbar">
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
android:id="@+id/passes_recycler"
|
android:id="@+id/passes_recycler"
|
||||||
@@ -77,7 +63,7 @@
|
|||||||
app:layout_constraintBottom_toBottomOf="@+id/passes_swipe"
|
app:layout_constraintBottom_toBottomOf="@+id/passes_swipe"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/passes_bar" />
|
app:layout_constraintTop_toBottomOf="@+id/passes_toolbar" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/passes_error"
|
android:id="@+id/passes_error"
|
||||||
@@ -89,7 +75,7 @@
|
|||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/passes_bar" />
|
app:layout_constraintTop_toBottomOf="@+id/passes_toolbar" />
|
||||||
|
|
||||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||||
android:id="@+id/passes_fab"
|
android:id="@+id/passes_fab"
|
||||||
@@ -98,7 +84,6 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginEnd="16dp"
|
android:layout_marginEnd="16dp"
|
||||||
android:layout_marginBottom="16dp"
|
android:layout_marginBottom="16dp"
|
||||||
android:contentDescription="@string/placeholder"
|
|
||||||
android:src="@drawable/ic_sputnik_dark"
|
android:src="@drawable/ic_sputnik_dark"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent" />
|
app:layout_constraintEnd_toEndOf="parent" />
|
||||||
|
|||||||
@@ -10,11 +10,38 @@
|
|||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<androidx.cardview.widget.CardView
|
<androidx.cardview.widget.CardView
|
||||||
android:id="@+id/card_prefs_info"
|
android:id="@+id/prefs_toolbar"
|
||||||
style="@style/CardPreferences"
|
style="@style/Toolbar"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent">
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<ImageButton
|
||||||
|
android:id="@+id/prefs_back"
|
||||||
|
style="@style/ToolbarButton"
|
||||||
|
android:layout_marginStart="4dp"
|
||||||
|
android:src="@drawable/ic_back"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/prefs_toolbar"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/prefs_toolbar" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/prefs_title"
|
||||||
|
style="@style/ToolbarText"
|
||||||
|
android:text="TextView"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/prefs_toolbar"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/prefs_toolbar"
|
||||||
|
app:layout_constraintHorizontal_bias="0.32"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/prefs_toolbar"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/prefs_toolbar" />
|
||||||
|
|
||||||
|
<androidx.cardview.widget.CardView
|
||||||
|
android:id="@+id/card_prefs_info"
|
||||||
|
style="@style/CardPreferences"
|
||||||
|
android:layout_marginTop="8dp"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/prefs_toolbar">
|
||||||
|
|
||||||
<include
|
<include
|
||||||
android:id="@+id/prefs_info"
|
android:id="@+id/prefs_info"
|
||||||
|
|||||||
@@ -1,32 +1,43 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:id="@+id/radar_root"
|
android:id="@+id/radar_root"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:keepScreenOn="true">
|
android:keepScreenOn="true">
|
||||||
|
|
||||||
<androidx.appcompat.widget.Toolbar
|
<androidx.cardview.widget.CardView
|
||||||
android:id="@+id/radar_bar"
|
android:id="@+id/radar_toolbar"
|
||||||
style="@style/Toolbar"
|
style="@style/Toolbar"
|
||||||
android:layout_width="0dp"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<ImageButton
|
||||||
|
android:id="@+id/radar_back"
|
||||||
|
style="@style/ToolbarButton"
|
||||||
|
android:layout_marginStart="4dp"
|
||||||
|
android:src="@drawable/ic_back"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/radar_toolbar"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/radar_toolbar"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/radar_toolbar" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/radar_timer"
|
android:id="@+id/radar_timer"
|
||||||
style="@style/TimerText"
|
style="@style/ToolbarTimer"
|
||||||
android:layout_width="wrap_content"
|
app:layout_constraintBottom_toBottomOf="@+id/radar_toolbar"
|
||||||
android:layout_height="wrap_content"
|
app:layout_constraintEnd_toEndOf="@+id/radar_toolbar"
|
||||||
android:elevation="16dp"
|
app:layout_constraintStart_toStartOf="@+id/radar_toolbar"
|
||||||
android:text="@string/timer_zero"
|
app:layout_constraintTop_toTopOf="@+id/radar_toolbar" />
|
||||||
android:textSize="40sp"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/radar_bar"
|
<ImageButton
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
android:id="@+id/radar_map"
|
||||||
app:layout_constraintStart_toStartOf="@id/radar_bar"
|
style="@style/ToolbarButton"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
android:layout_marginEnd="4dp"
|
||||||
|
android:src="@drawable/ic_map"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/radar_toolbar"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/radar_toolbar"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/radar_toolbar" />
|
||||||
|
|
||||||
<FrameLayout
|
<FrameLayout
|
||||||
android:id="@+id/radar_frame"
|
android:id="@+id/radar_frame"
|
||||||
@@ -35,7 +46,7 @@
|
|||||||
app:layout_constraintDimensionRatio="1:1"
|
app:layout_constraintDimensionRatio="1:1"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/radar_bar" />
|
app:layout_constraintTop_toBottomOf="@+id/radar_toolbar" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/radar_az"
|
android:id="@+id/radar_az"
|
||||||
@@ -77,36 +88,6 @@
|
|||||||
app:layout_constraintBottom_toBottomOf="@+id/radar_frame"
|
app:layout_constraintBottom_toBottomOf="@+id/radar_frame"
|
||||||
app:layout_constraintEnd_toEndOf="@+id/radar_frame" />
|
app:layout_constraintEnd_toEndOf="@+id/radar_frame" />
|
||||||
|
|
||||||
<ImageButton
|
|
||||||
android:id="@+id/radar_notify_button"
|
|
||||||
android:layout_width="64dp"
|
|
||||||
android:layout_height="48dp"
|
|
||||||
android:layout_marginStart="4dp"
|
|
||||||
android:backgroundTint="@color/greyDark"
|
|
||||||
android:clickable="false"
|
|
||||||
android:contentDescription="@string/placeholder"
|
|
||||||
android:elevation="4dp"
|
|
||||||
android:src="@drawable/ic_notification"
|
|
||||||
android:visibility="invisible"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/radar_bar"
|
|
||||||
app:layout_constraintStart_toStartOf="@+id/radar_bar"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/radar_bar"
|
|
||||||
tools:ignore="DuplicateSpeakableTextCheck" />
|
|
||||||
|
|
||||||
<ImageButton
|
|
||||||
android:id="@+id/radar_to_map_button"
|
|
||||||
android:layout_width="64dp"
|
|
||||||
android:layout_height="48dp"
|
|
||||||
android:layout_marginEnd="4dp"
|
|
||||||
android:backgroundTint="@color/greyDark"
|
|
||||||
android:contentDescription="@string/placeholder"
|
|
||||||
android:elevation="16dp"
|
|
||||||
android:src="@drawable/ic_nav_map"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/radar_bar"
|
|
||||||
app:layout_constraintEnd_toEndOf="@+id/radar_bar"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/radar_bar"
|
|
||||||
tools:ignore="DuplicateSpeakableTextCheck" />
|
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
android:id="@+id/radar_recycler"
|
android:id="@+id/radar_recycler"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
|
|||||||
@@ -3,9 +3,9 @@
|
|||||||
android:id="@+id/entry_checkbox"
|
android:id="@+id/entry_checkbox"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="36dp"
|
android:layout_height="36dp"
|
||||||
android:background="@color/greyCard"
|
android:background="@color/surfaceCard"
|
||||||
android:ellipsize="end"
|
android:ellipsize="end"
|
||||||
android:lines="1"
|
android:lines="1"
|
||||||
android:text="@string/placeholder"
|
android:text="@string/placeholder"
|
||||||
android:textColor="@color/greyLight"
|
android:textColor="@color/themeLight"
|
||||||
android:textSize="16sp" />
|
android:textSize="16sp" />
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
android:id="@+id/pass_geo_card"
|
android:id="@+id/pass_geo_card"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:backgroundTint="@color/greyCard"
|
android:backgroundTint="@color/surfaceCard"
|
||||||
app:cardCornerRadius="0dp">
|
app:cardCornerRadius="0dp">
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
android:layout_marginStart="6dp"
|
android:layout_marginStart="6dp"
|
||||||
android:layout_marginTop="4dp"
|
android:layout_marginTop="4dp"
|
||||||
android:text="@string/pass_satName"
|
android:text="@string/pass_satName"
|
||||||
android:textColor="@color/themeLight"
|
android:textColor="@color/themeAccent"
|
||||||
app:layout_constraintEnd_toStartOf="@+id/pass_geo_id"
|
app:layout_constraintEnd_toStartOf="@+id/pass_geo_id"
|
||||||
app:layout_constraintHorizontal_chainStyle="spread_inside"
|
app:layout_constraintHorizontal_chainStyle="spread_inside"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginEnd="6dp"
|
android:layout_marginEnd="6dp"
|
||||||
android:text="@string/pass_satId"
|
android:text="@string/pass_satId"
|
||||||
android:textColor="@color/themeLight"
|
android:textColor="@color/themeAccent"
|
||||||
app:layout_constraintBaseline_toBaselineOf="@+id/pass_geo_name"
|
app:layout_constraintBaseline_toBaselineOf="@+id/pass_geo_name"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@+id/pass_geo_name" />
|
app:layout_constraintStart_toEndOf="@+id/pass_geo_name" />
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
android:id="@+id/pass_leo_card"
|
android:id="@+id/pass_leo_card"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:backgroundTint="@color/greyCard"
|
android:backgroundTint="@color/surfaceCard"
|
||||||
app:cardCornerRadius="0dp">
|
app:cardCornerRadius="0dp">
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
android:layout_marginStart="6dp"
|
android:layout_marginStart="6dp"
|
||||||
android:layout_marginTop="6dp"
|
android:layout_marginTop="6dp"
|
||||||
android:text="@string/pass_satName"
|
android:text="@string/pass_satName"
|
||||||
android:textColor="@color/themeLight"
|
android:textColor="@color/themeAccent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
@@ -30,7 +30,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginEnd="6dp"
|
android:layout_marginEnd="6dp"
|
||||||
android:text="@string/pass_satId"
|
android:text="@string/pass_satId"
|
||||||
android:textColor="@color/themeLight"
|
android:textColor="@color/themeAccent"
|
||||||
app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_name"
|
app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_name"
|
||||||
app:layout_constraintEnd_toEndOf="parent" />
|
app:layout_constraintEnd_toEndOf="parent" />
|
||||||
|
|
||||||
|
|||||||
@@ -28,11 +28,9 @@
|
|||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/source_btn"
|
android:id="@+id/source_btn"
|
||||||
android:layout_width="wrap_content"
|
style="@style/ToolbarButton"
|
||||||
android:layout_height="0dp"
|
android:rotation="45"
|
||||||
android:backgroundTint="@color/greyDark"
|
android:src="@drawable/ic_add"
|
||||||
android:contentDescription="@string/placeholder"
|
|
||||||
android:src="@drawable/ic_map_sat"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/source_input"
|
app:layout_constraintBottom_toBottomOf="@+id/source_input"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="@+id/source_input" />
|
app:layout_constraintTop_toTopOf="@+id/source_input" />
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
android:id="@+id/trans_card"
|
android:id="@+id/trans_card"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:cardBackgroundColor="@color/greySurface"
|
app:cardBackgroundColor="@color/surfaceToolbar"
|
||||||
app:cardCornerRadius="0dp">
|
app:cardCornerRadius="0dp">
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
@@ -50,7 +50,7 @@
|
|||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/trans_downlink"
|
android:id="@+id/trans_downlink"
|
||||||
style="@style/TimerText"
|
style="@style/ToolbarTimer"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/trans_link_low"
|
android:text="@string/trans_link_low"
|
||||||
@@ -73,7 +73,7 @@
|
|||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/trans_uplink"
|
android:id="@+id/trans_uplink"
|
||||||
style="@style/TimerText"
|
style="@style/ToolbarTimer"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/trans_link_low"
|
android:text="@string/trans_link_low"
|
||||||
|
|||||||
@@ -8,17 +8,20 @@
|
|||||||
android:id="@+id/nav_entries"
|
android:id="@+id/nav_entries"
|
||||||
android:name="com.rtbishop.look4sat.presentation.entriesScreen.EntriesFragment"
|
android:name="com.rtbishop.look4sat.presentation.entriesScreen.EntriesFragment"
|
||||||
tools:layout="@layout/fragment_entries">
|
tools:layout="@layout/fragment_entries">
|
||||||
<action
|
|
||||||
android:id="@+id/action_entries_to_passes"
|
|
||||||
app:destination="@id/nav_passes" />
|
|
||||||
<action
|
|
||||||
android:id="@+id/action_entries_to_sources"
|
|
||||||
app:destination="@id/nav_sources" />
|
|
||||||
</fragment>
|
</fragment>
|
||||||
<fragment
|
<fragment
|
||||||
android:id="@+id/nav_passes"
|
android:id="@+id/nav_passes"
|
||||||
android:name="com.rtbishop.look4sat.presentation.passesScreen.PassesFragment"
|
android:name="com.rtbishop.look4sat.presentation.passesScreen.PassesFragment"
|
||||||
tools:layout="@layout/fragment_passes">
|
tools:layout="@layout/fragment_passes">
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_passes_to_entries"
|
||||||
|
app:destination="@id/nav_entries" />
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_passes_to_pass_prefs"
|
||||||
|
app:destination="@id/nav_pass_prefs" />
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_passes_to_prefs"
|
||||||
|
app:destination="@id/nav_prefs" />
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_passes_to_radar"
|
android:id="@+id/action_passes_to_radar"
|
||||||
app:destination="@id/nav_radar" />
|
app:destination="@id/nav_radar" />
|
||||||
@@ -27,11 +30,11 @@
|
|||||||
android:id="@+id/nav_radar"
|
android:id="@+id/nav_radar"
|
||||||
android:name="com.rtbishop.look4sat.presentation.radarScreen.RadarFragment"
|
android:name="com.rtbishop.look4sat.presentation.radarScreen.RadarFragment"
|
||||||
tools:layout="@layout/fragment_radar">
|
tools:layout="@layout/fragment_radar">
|
||||||
<action
|
<!-- <action-->
|
||||||
android:id="@+id/action_radar_to_passes"
|
<!-- android:id="@+id/action_radar_to_passes"-->
|
||||||
app:destination="@id/nav_passes"
|
<!-- app:destination="@id/nav_passes"-->
|
||||||
app:popUpTo="@id/nav_passes"
|
<!-- app:popUpTo="@id/nav_passes"-->
|
||||||
app:popUpToInclusive="true" />
|
<!-- app:popUpToInclusive="true" />-->
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_radar_to_map"
|
android:id="@+id/action_radar_to_map"
|
||||||
app:destination="@id/nav_map" />
|
app:destination="@id/nav_map" />
|
||||||
|
|||||||
@@ -1,16 +1,14 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<color name="themeLight">#FFE082</color>
|
<color name="themeAccent">#FFE082</color>
|
||||||
<color name="themeDark">#FFCA28</color>
|
<color name="themeIcon">#FFFFFF</color>
|
||||||
|
<color name="themeLight">#D0D0D0</color>
|
||||||
<color name="greyLight">#D0D0D0</color>
|
<color name="surfaceButton">#242424</color>
|
||||||
<color name="greyDivider">#808080</color>
|
<color name="surfaceStatusbar">#1A1A1A</color>
|
||||||
<color name="greyButton">#242424</color>
|
<color name="surfaceToolbar">#202020</color>
|
||||||
<color name="greySurface">#1E1E1E</color>
|
<color name="surfaceCard">#181818</color>
|
||||||
<color name="greyCard">#181818</color>
|
<color name="surfaceBg">#121212</color>
|
||||||
<color name="greyDark">#121212</color>
|
|
||||||
<color name="mapInfoLayout">#99000000</color>
|
<color name="mapInfoLayout">#99000000</color>
|
||||||
|
<color name="mtrl_textinput_disabled_color">@color/surfaceButton</color>
|
||||||
<color name="mtrl_textinput_disabled_color">@color/greyButton</color>
|
<color name="mtrl_textinput_default_box_stroke_color">@color/themeLight</color>
|
||||||
<color name="mtrl_textinput_default_box_stroke_color">@color/greyLight</color>
|
|
||||||
</resources>
|
</resources>
|
||||||
@@ -1,42 +1,71 @@
|
|||||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||||
|
|
||||||
<style name="Theme.Look4Sat.SplashScreen" parent="Theme.SplashScreen">
|
<style name="Theme.Look4Sat.SplashScreen" parent="Theme.SplashScreen">
|
||||||
<item name="windowSplashScreenBackground">@color/greyDark</item>
|
<item name="windowSplashScreenBackground">@color/surfaceBg</item>
|
||||||
<item name="windowSplashScreenAnimatedIcon">@drawable/ic_splash_drawable</item>
|
<item name="windowSplashScreenAnimatedIcon">@drawable/ic_splash_drawable</item>
|
||||||
<item name="postSplashScreenTheme">@style/Theme.Look4Sat.Main</item>
|
<item name="postSplashScreenTheme">@style/Theme.Look4Sat.Main</item>
|
||||||
<item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
|
<item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Theme.Look4Sat.Main" parent="Theme.AppCompat.NoActionBar">
|
<style name="Theme.Look4Sat.Main" parent="Theme.AppCompat.NoActionBar">
|
||||||
<item name="colorPrimary">@color/themeLight</item>
|
<item name="colorPrimary">@color/themeAccent</item>
|
||||||
<item name="colorSecondary">@color/themeLight</item>
|
<item name="colorSecondary">@color/themeAccent</item>
|
||||||
<item name="colorAccent">@color/themeLight</item>
|
<item name="colorAccent">@color/themeAccent</item>
|
||||||
<item name="android:textColorPrimary">@color/greyLight</item>
|
<item name="android:textColorPrimary">@color/themeLight</item>
|
||||||
<item name="android:statusBarColor">@color/greyCard</item>
|
<item name="android:statusBarColor">@color/surfaceStatusbar</item>
|
||||||
<item name="android:windowBackground">@color/greyDark</item>
|
<item name="android:windowBackground">@color/surfaceBg</item>
|
||||||
<item name="android:navigationBarColor">@color/greySurface</item>
|
<item name="android:navigationBarColor">@color/surfaceToolbar</item>
|
||||||
<item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
|
<item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Toolbar">
|
<style name="Toolbar">
|
||||||
<item name="android:layout_height">?android:attr/actionBarSize</item>
|
<item name="android:layout_width">match_parent</item>
|
||||||
<item name="android:background">@color/greySurface</item>
|
<item name="android:layout_height">?actionBarSize</item>
|
||||||
<item name="android:elevation">8dp</item>
|
<item name="android:elevation">8dp</item>
|
||||||
|
<item name="cardBackgroundColor">@color/surfaceToolbar</item>
|
||||||
|
<item name="cardCornerRadius">0dp</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="ToolbarButton">
|
||||||
|
<item name="android:layout_width">48dp</item>
|
||||||
|
<item name="android:layout_height">48dp</item>
|
||||||
|
<item name="android:background">?actionBarItemBackground</item>
|
||||||
|
<item name="android:elevation">8dp</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="ToolbarText">
|
||||||
|
<item name="android:layout_width">wrap_content</item>
|
||||||
|
<item name="android:layout_height">wrap_content</item>
|
||||||
|
<item name="android:elevation">8dp</item>
|
||||||
|
<item name="android:includeFontPadding">false</item>
|
||||||
|
<item name="android:textColor">@color/themeAccent</item>
|
||||||
|
<item name="android:textSize">21sp</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="ToolbarTimer">
|
||||||
|
<item name="android:layout_width">wrap_content</item>
|
||||||
|
<item name="android:layout_height">wrap_content</item>
|
||||||
|
<item name="android:elevation">8dp</item>
|
||||||
|
<item name="android:includeFontPadding">false</item>
|
||||||
|
<item name="android:text">@string/timer_zero</item>
|
||||||
|
<item name="android:textColor">@color/themeAccent</item>
|
||||||
|
<item name="android:textSize">40sp</item>
|
||||||
|
<item name="android:textStyle">bold</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="DialogText">
|
<style name="DialogText">
|
||||||
<item name="android:layout_width">wrap_content</item>
|
<item name="android:layout_width">wrap_content</item>
|
||||||
<item name="android:layout_height">wrap_content</item>
|
<item name="android:layout_height">wrap_content</item>
|
||||||
<item name="android:textColor">@color/themeLight</item>
|
<item name="android:textColor">@color/themeAccent</item>
|
||||||
<item name="android:textSize">17sp</item>
|
<item name="android:textSize">17sp</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="InfoButton">
|
<style name="InfoButton">
|
||||||
<item name="android:backgroundTint">@color/greyButton</item>
|
<item name="android:backgroundTint">@color/surfaceButton</item>
|
||||||
<item name="android:textColor">@color/themeLight</item>
|
<item name="android:textColor">@color/themeAccent</item>
|
||||||
<item name="android:textSize">15sp</item>
|
<item name="android:textSize">15sp</item>
|
||||||
<item name="android:drawablePadding">4dp</item>
|
<item name="android:drawablePadding">4dp</item>
|
||||||
<item name="iconTint">@color/themeLight</item>
|
<item name="iconTint">@color/themeAccent</item>
|
||||||
<item name="textAllCaps">false</item>
|
<item name="textAllCaps">false</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
@@ -46,21 +75,13 @@
|
|||||||
<item name="android:layout_marginStart">8dp</item>
|
<item name="android:layout_marginStart">8dp</item>
|
||||||
<item name="android:layout_marginTop">8dp</item>
|
<item name="android:layout_marginTop">8dp</item>
|
||||||
<item name="android:layout_marginEnd">8dp</item>
|
<item name="android:layout_marginEnd">8dp</item>
|
||||||
<item name="cardBackgroundColor">@color/greyCard</item>
|
<item name="cardBackgroundColor">@color/surfaceCard</item>
|
||||||
<item name="cardCornerRadius">8dp</item>
|
<item name="cardCornerRadius">8dp</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="TimerText">
|
|
||||||
<item name="android:textColor">@color/themeLight</item>
|
|
||||||
<item name="android:textStyle">bold</item>
|
|
||||||
<item name="android:clickable">false</item>
|
|
||||||
<item name="android:focusable">false</item>
|
|
||||||
<item name="android:includeFontPadding">false</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="MapInfoText">
|
<style name="MapInfoText">
|
||||||
<item name="android:textSize">15sp</item>
|
<item name="android:textSize">15sp</item>
|
||||||
<item name="android:textColor">@color/themeLight</item>
|
<item name="android:textColor">@color/themeAccent</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
@@ -21,10 +21,10 @@ interface PreferencesHandler {
|
|||||||
|
|
||||||
val defaultSources: List<String>
|
val defaultSources: List<String>
|
||||||
get() = listOf(
|
get() = listOf(
|
||||||
"https://celestrak.com/NORAD/elements/gp.php?GROUP=active&FORMAT=csv",
|
"https://prismnet.com/~mmccants/tles/inttles.zip",
|
||||||
"https://amsat.org/tle/current/nasabare.txt",
|
|
||||||
"https://prismnet.com/~mmccants/tles/classfd.zip",
|
"https://prismnet.com/~mmccants/tles/classfd.zip",
|
||||||
"https://prismnet.com/~mmccants/tles/inttles.zip"
|
"https://celestrak.com/NORAD/elements/gp.php?GROUP=active&FORMAT=csv",
|
||||||
|
"https://amsat.org/tle/current/nasabare.txt"
|
||||||
)
|
)
|
||||||
val transmittersSource: String
|
val transmittersSource: String
|
||||||
get() = "https://db.satnogs.org/api/transmitters/?format=json"
|
get() = "https://db.satnogs.org/api/transmitters/?format=json"
|
||||||
|
|||||||
Reference in new issue
Block a user