From ad3bdff823817adace7e19cba8c35367453778f5 Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Sat, 1 Jan 2022 17:46:02 +0000 Subject: [PATCH] Further changes to fragments and layouts --- .../look4sat/framework/PreferencesSource.kt | 7 +- .../look4sat/framework/local/SourcesDao.kt | 40 ----------- .../presentation/mapScreen/MapFragment.kt | 2 +- .../presentation/mapScreen/MapViewModel.kt | 12 ++-- .../passesScreen/PassesFragment.kt | 4 +- .../presentation/radarScreen/RadarFragment.kt | 32 ++------- .../presentation/radarScreen/RadarView.kt | 8 +-- app/src/main/res/drawable/ic_add.xml | 2 +- app/src/main/res/drawable/ic_arrow.xml | 2 +- .../res/drawable/{ic_next.xml => ic_back.xml} | 6 +- app/src/main/res/drawable/ic_bmc.xml | 2 +- app/src/main/res/drawable/ic_fdroid.xml | 4 +- app/src/main/res/drawable/ic_github.xml | 2 +- app/src/main/res/drawable/ic_gps.xml | 9 --- .../res/drawable/ic_launcher_background.xml | 4 +- .../res/drawable/ic_launcher_foreground.xml | 4 +- .../drawable/{ic_nav_map.xml => ic_map.xml} | 2 +- app/src/main/res/drawable/ic_map_sat.xml | 9 --- app/src/main/res/drawable/ic_nav_passes.xml | 9 --- app/src/main/res/drawable/ic_notification.xml | 9 --- .../drawable/{ic_map_pos.xml => ic_pos.xml} | 2 +- .../{ic_nav_prefs.xml => ic_prefs.xml} | 0 app/src/main/res/drawable/ic_qth.xml | 2 +- app/src/main/res/drawable/ic_satellite.xml | 10 +-- app/src/main/res/drawable/ic_select_all.xml | 2 +- .../main/res/drawable/ic_splash_drawable.xml | 2 +- .../{ic_nav_entries.xml => ic_sputnik.xml} | 4 +- app/src/main/res/drawable/ic_sputnik_dark.xml | 4 +- app/src/main/res/drawable/ic_update_file.xml | 2 +- app/src/main/res/drawable/ic_update_web.xml | 2 +- .../main/res/drawable/rec_divider_dark.xml | 2 +- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/card_prefs_about.xml | 11 ++- .../main/res/layout/card_prefs_location.xml | 4 +- app/src/main/res/layout/card_prefs_other.xml | 8 +-- .../main/res/layout/card_prefs_tracking.xml | 4 +- app/src/main/res/layout/card_prefs_update.xml | 24 +++---- .../main/res/layout/card_prefs_warranty.xml | 6 +- app/src/main/res/layout/dialog_passes.xml | 10 +-- app/src/main/res/layout/dialog_sources.xml | 12 ++-- app/src/main/res/layout/fragment_entries.xml | 33 +++++---- app/src/main/res/layout/fragment_map.xml | 48 +++++++++---- app/src/main/res/layout/fragment_passes.xml | 59 ++++++--------- app/src/main/res/layout/fragment_prefs.xml | 33 ++++++++- app/src/main/res/layout/fragment_radar.xml | 71 +++++++------------ app/src/main/res/layout/item_entry.xml | 4 +- app/src/main/res/layout/item_pass_geo.xml | 6 +- app/src/main/res/layout/item_pass_leo.xml | 6 +- app/src/main/res/layout/item_source.xml | 8 +-- app/src/main/res/layout/item_trans.xml | 6 +- app/src/main/res/navigation/nav_graph.xml | 25 ++++--- app/src/main/res/values/colors.xml | 22 +++--- app/src/main/res/values/styles.xml | 69 +++++++++++------- .../look4sat/data/PreferencesHandler.kt | 6 +- 54 files changed, 306 insertions(+), 372 deletions(-) delete mode 100644 app/src/main/java/com/rtbishop/look4sat/framework/local/SourcesDao.kt rename app/src/main/res/drawable/{ic_next.xml => ic_back.xml} (56%) delete mode 100644 app/src/main/res/drawable/ic_gps.xml rename app/src/main/res/drawable/{ic_nav_map.xml => ic_map.xml} (92%) delete mode 100644 app/src/main/res/drawable/ic_map_sat.xml delete mode 100644 app/src/main/res/drawable/ic_nav_passes.xml delete mode 100644 app/src/main/res/drawable/ic_notification.xml rename app/src/main/res/drawable/{ic_map_pos.xml => ic_pos.xml} (89%) rename app/src/main/res/drawable/{ic_nav_prefs.xml => ic_prefs.xml} (100%) rename app/src/main/res/drawable/{ic_nav_entries.xml => ic_sputnik.xml} (93%) diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/PreferencesSource.kt b/app/src/main/java/com/rtbishop/look4sat/framework/PreferencesSource.kt index 88fb1bc0..2737a8db 100644 --- a/app/src/main/java/com/rtbishop/look4sat/framework/PreferencesSource.kt +++ b/app/src/main/java/com/rtbishop/look4sat/framework/PreferencesSource.kt @@ -42,7 +42,6 @@ class PreferencesSource @Inject constructor( const val keyModes = "satModes" const val keyCompass = "compass" const val keyRadarSweep = "radarSweep" - const val keyTextLabels = "shouldUseTextLabels" const val keyTimeUTC = "timeUTC" const val keyHoursAhead = "hoursAhead" const val keyMinElevation = "minElevation" @@ -107,10 +106,6 @@ class PreferencesSource @Inject constructor( return preferences.getInt(keyMinElevation, 16).toDouble() } - fun shouldUseTextLabels(): Boolean { - return preferences.getBoolean(keyTextLabels, false) - } - fun getUseUTC(): Boolean { return preferences.getBoolean(keyTimeUTC, false) } @@ -189,7 +184,7 @@ class PreferencesSource @Inject constructor( override fun loadDataSources(): List { 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) { diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/local/SourcesDao.kt b/app/src/main/java/com/rtbishop/look4sat/framework/local/SourcesDao.kt deleted file mode 100644 index d4871dd8..00000000 --- a/app/src/main/java/com/rtbishop/look4sat/framework/local/SourcesDao.kt +++ /dev/null @@ -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 . - */ -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 - - @Transaction - suspend fun updateSources(sources: List) { - deleteSources() - insertSources(sources) - } - - @Query("DELETE from sources") - suspend fun deleteSources() - - @Insert(onConflict = OnConflictStrategy.REPLACE) - suspend fun insertSources(sources: List) -} diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt index 3fb24ec2..668d6157 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt @@ -101,7 +101,7 @@ class MapFragment : Fragment(R.layout.fragment_map) { Marker(mapView).apply { setInfoWindow(null) 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) mapView.overlays[0] = this mapView.invalidate() diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapViewModel.kt index 72d89e7b..2bf6e576 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapViewModel.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapViewModel.kt @@ -18,12 +18,12 @@ package com.rtbishop.look4sat.presentation.mapScreen import androidx.lifecycle.* -import com.rtbishop.look4sat.domain.predict.Predictor 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.predict.GeoPos +import com.rtbishop.look4sat.domain.predict.Predictor import com.rtbishop.look4sat.domain.predict.Satellite +import com.rtbishop.look4sat.framework.PreferencesSource import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.* import java.util.* @@ -35,7 +35,7 @@ import kotlin.math.min class MapViewModel @Inject constructor( private val dataRepository: DataRepository, private val predictor: Predictor, - private val preferences: PreferencesSource, + preferences: PreferencesSource, ) : ViewModel() { private val stationPos = preferences.loadStationPosition() @@ -61,10 +61,6 @@ class MapViewModel @Inject constructor( private val _satPositions = MutableLiveData>() val satPositions: LiveData> = _satPositions - fun shouldUseTextLabels(): Boolean { - return preferences.shouldUseTextLabels() - } - fun scrollSelection(decrement: Boolean) { if (allSatList.isNotEmpty()) { val index = allSatList.indexOf(selectedSat) diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt index e80d3ad4..9e149e8f 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt @@ -76,8 +76,8 @@ class PassesFragment : Fragment(R.layout.fragment_passes), PassesAdapter.PassesC }) } passesSwipe.apply { - setColorSchemeResources(R.color.greySurface) - setProgressBackgroundColorSchemeResource(R.color.themeLight) + setColorSchemeResources(R.color.surfaceToolbar) + setProgressBackgroundColorSchemeResource(R.color.themeAccent) setOnRefreshListener { passesViewModel.forceCalculation() } } passesFilter.setOnClickListener { findNavController().navigate(R.id.nav_pass_prefs) } diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt index 1b571911..157592ae 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt @@ -27,9 +27,9 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.SimpleItemAnimator import com.rtbishop.look4sat.R 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.SatPos +import com.rtbishop.look4sat.framework.PreferencesSource import com.rtbishop.look4sat.presentation.ItemDivider import com.rtbishop.look4sat.presentation.navigateSafe import com.rtbishop.look4sat.presentation.toTimerString @@ -105,35 +105,11 @@ class RadarFragment : Fragment(R.layout.fragment_radar) { orientation.third ) }) - binding.radarToMapButton.setOnClickListener { + binding.radarMap.setOnClickListener { val bundle = bundleOf("catNum" to pass.catNum) 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) { @@ -157,7 +133,9 @@ class RadarFragment : Fragment(R.layout.fragment_radar) { binding.radarTimer.text = millisBeforeEnd.toTimerString() if (timeNow > satPass.losTime) { 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 { diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarView.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarView.kt index 191cae5c..e2ee9f2c 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarView.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarView.kt @@ -29,7 +29,7 @@ import kotlin.math.sin 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 radarWidth = resources.displayMetrics.widthPixels private val radarRadius = radarWidth * 0.48f @@ -38,7 +38,7 @@ class RadarView(context: Context) : View(context) { private var position: SatPos? = null private var positions: List = 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 radarPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = radarColor @@ -79,7 +79,7 @@ class RadarView(context: Context) : View(context) { private val arrowPath = Path() 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 strokeWidth = strokeSize } @@ -135,7 +135,7 @@ class RadarView(context: Context) : View(context) { isTrackCreated = true } - canvas.drawColor(ContextCompat.getColor(context, R.color.greyDark)) + canvas.drawColor(ContextCompat.getColor(context, R.color.surfaceBg)) drawRadarCircle(canvas, cx, cy, radarRadius) drawRadarCross(canvas, cx, cy, radarRadius) drawRadarText(canvas, cx, radarRadius) diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml index 3183f67d..185e6535 100644 --- a/app/src/main/res/drawable/ic_add.xml +++ b/app/src/main/res/drawable/ic_add.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_arrow.xml b/app/src/main/res/drawable/ic_arrow.xml index ec6928c6..c44987f0 100644 --- a/app/src/main/res/drawable/ic_arrow.xml +++ b/app/src/main/res/drawable/ic_arrow.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_next.xml b/app/src/main/res/drawable/ic_back.xml similarity index 56% rename from app/src/main/res/drawable/ic_next.xml rename to app/src/main/res/drawable/ic_back.xml index 7e6b405c..d4acd0a8 100644 --- a/app/src/main/res/drawable/ic_next.xml +++ b/app/src/main/res/drawable/ic_back.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_bmc.xml b/app/src/main/res/drawable/ic_bmc.xml index f4988fe2..d7820ca1 100644 --- a/app/src/main/res/drawable/ic_bmc.xml +++ b/app/src/main/res/drawable/ic_bmc.xml @@ -6,6 +6,6 @@ android:viewportHeight="338.40268"> diff --git a/app/src/main/res/drawable/ic_fdroid.xml b/app/src/main/res/drawable/ic_fdroid.xml index 98f48512..3a910813 100644 --- a/app/src/main/res/drawable/ic_fdroid.xml +++ b/app/src/main/res/drawable/ic_fdroid.xml @@ -5,7 +5,7 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/app/src/main/res/drawable/ic_gps.xml b/app/src/main/res/drawable/ic_gps.xml deleted file mode 100644 index 83dde279..00000000 --- a/app/src/main/res/drawable/ic_gps.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index bd2e2045..52f9c9aa 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,6 +1,6 @@ + android:endColor="@color/surfaceBg" + android:startColor="@color/surfaceBg" /> diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 2d3345be..87614cfd 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -11,10 +11,10 @@ android:translateX="70.26573" android:translateY="70.26573"> diff --git a/app/src/main/res/drawable/ic_nav_map.xml b/app/src/main/res/drawable/ic_map.xml similarity index 92% rename from app/src/main/res/drawable/ic_nav_map.xml rename to app/src/main/res/drawable/ic_map.xml index e5ce2807..7a1ab400 100644 --- a/app/src/main/res/drawable/ic_nav_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_map_sat.xml b/app/src/main/res/drawable/ic_map_sat.xml deleted file mode 100644 index dc884469..00000000 --- a/app/src/main/res/drawable/ic_map_sat.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_nav_passes.xml b/app/src/main/res/drawable/ic_nav_passes.xml deleted file mode 100644 index 4d11d334..00000000 --- a/app/src/main/res/drawable/ic_nav_passes.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml deleted file mode 100644 index 3a49fa67..00000000 --- a/app/src/main/res/drawable/ic_notification.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_map_pos.xml b/app/src/main/res/drawable/ic_pos.xml similarity index 89% rename from app/src/main/res/drawable/ic_map_pos.xml rename to app/src/main/res/drawable/ic_pos.xml index 1e05f62c..23dfe20f 100644 --- a/app/src/main/res/drawable/ic_map_pos.xml +++ b/app/src/main/res/drawable/ic_pos.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_nav_prefs.xml b/app/src/main/res/drawable/ic_prefs.xml similarity index 100% rename from app/src/main/res/drawable/ic_nav_prefs.xml rename to app/src/main/res/drawable/ic_prefs.xml diff --git a/app/src/main/res/drawable/ic_qth.xml b/app/src/main/res/drawable/ic_qth.xml index debc95e7..688fd42b 100644 --- a/app/src/main/res/drawable/ic_qth.xml +++ b/app/src/main/res/drawable/ic_qth.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_satellite.xml b/app/src/main/res/drawable/ic_satellite.xml index dc199a4b..6e600a38 100644 --- a/app/src/main/res/drawable/ic_satellite.xml +++ b/app/src/main/res/drawable/ic_satellite.xml @@ -5,19 +5,19 @@ android:viewportWidth="128" android:viewportHeight="128"> diff --git a/app/src/main/res/drawable/ic_select_all.xml b/app/src/main/res/drawable/ic_select_all.xml index b34ab2e7..01948a0e 100644 --- a/app/src/main/res/drawable/ic_select_all.xml +++ b/app/src/main/res/drawable/ic_select_all.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_splash_drawable.xml b/app/src/main/res/drawable/ic_splash_drawable.xml index b32aa96b..7551c255 100644 --- a/app/src/main/res/drawable/ic_splash_drawable.xml +++ b/app/src/main/res/drawable/ic_splash_drawable.xml @@ -5,7 +5,7 @@ android:viewportWidth="105.83323" android:viewportHeight="114.01299"> diff --git a/app/src/main/res/drawable/ic_nav_entries.xml b/app/src/main/res/drawable/ic_sputnik.xml similarity index 93% rename from app/src/main/res/drawable/ic_nav_entries.xml rename to app/src/main/res/drawable/ic_sputnik.xml index f4153d46..66d61d98 100644 --- a/app/src/main/res/drawable/ic_nav_entries.xml +++ b/app/src/main/res/drawable/ic_sputnik.xml @@ -5,10 +5,10 @@ android:viewportWidth="128" android:viewportHeight="128"> diff --git a/app/src/main/res/drawable/ic_sputnik_dark.xml b/app/src/main/res/drawable/ic_sputnik_dark.xml index 39ce3290..d06a6cd8 100644 --- a/app/src/main/res/drawable/ic_sputnik_dark.xml +++ b/app/src/main/res/drawable/ic_sputnik_dark.xml @@ -5,10 +5,10 @@ android:viewportWidth="128" android:viewportHeight="128"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_update_file.xml b/app/src/main/res/drawable/ic_update_file.xml index acbb87a2..8bf804a7 100644 --- a/app/src/main/res/drawable/ic_update_file.xml +++ b/app/src/main/res/drawable/ic_update_file.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_update_web.xml b/app/src/main/res/drawable/ic_update_web.xml index 4788f844..95e5be7c 100644 --- a/app/src/main/res/drawable/ic_update_web.xml +++ b/app/src/main/res/drawable/ic_update_web.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/rec_divider_dark.xml b/app/src/main/res/drawable/rec_divider_dark.xml index 2beb01ac..78210dfc 100644 --- a/app/src/main/res/drawable/rec_divider_dark.xml +++ b/app/src/main/res/drawable/rec_divider_dark.xml @@ -5,7 +5,7 @@ - + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 8b97bd9c..0274daed 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,7 +1,7 @@ @@ -48,6 +47,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/about_subtitle" + android:textColor="@color/themeLight" android:textSize="20sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -65,7 +65,6 @@ android:text="@string/about_github" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/about_btn_donate" - app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/about_subtitle" /> @@ -79,7 +78,6 @@ android:text="@string/about_support" app:layout_constraintBaseline_toBaselineOf="@+id/about_btn_github" app:layout_constraintEnd_toStartOf="@+id/about_btn_fdroid" - app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/about_btn_github" />