Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Info layout fixes, text input outline color fix
Arty Bishopf694eb4f4da1
diff --git a/app/src/main/res/layout/fragment_entries.xml b/app/src/main/res/layout/fragment_entries.xmlindex 244fe85b..1fb95f8c 100644--- a/app/src/main/res/layout/fragment_entries.xml+++ b/app/src/main/res/layout/fragment_entries.xml@@ -6,7 +6,7 @@android:layout_width="match_parent"android:layout_height="match_parent">- <com.google.android.material.card.MaterialCardView+ <androidx.cardview.widget.CardViewandroid:id="@+id/entries_bar"style="@style/TopBar"app:layout_constraintEnd_toEndOf="parent"diff --git a/app/src/main/res/layout/fragment_info.xml b/app/src/main/res/layout/fragment_info.xmlindex cef5b613..9110b058 100644--- a/app/src/main/res/layout/fragment_info.xml+++ b/app/src/main/res/layout/fragment_info.xml@@ -14,12 +14,13 @@<ImageViewandroid:id="@+id/info_title_img"- android:layout_width="48dp"- android:layout_height="48dp"- android:layout_marginEnd="8dp"+ android:layout_width="0dp"+ android:layout_height="0dp"+ android:layout_marginTop="8dp"android:contentDescription="@string/placeholder"android:src="@drawable/ic_nav_entries"- app:layout_constraintBottom_toBottomOf="@+id/info_title"+ app:layout_constraintBottom_toBottomOf="@+id/info_version"+ app:layout_constraintDimensionRatio="h,1:1"app:layout_constraintEnd_toStartOf="@+id/info_title"app:layout_constraintHorizontal_chainStyle="packed"app:layout_constraintStart_toStartOf="parent"@@ -29,7 +30,8 @@android:id="@+id/info_title"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:layout_marginTop="12dp"+ android:layout_marginStart="8dp"+ android:layout_marginTop="16dp"android:text="@string/app_name"android:textColor="@color/themeLight"android:textSize="48sp"@@ -41,12 +43,10 @@android:id="@+id/info_version"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:layout_marginTop="4dp"android:text="@string/info_version"- android:textColor="@color/themeLight"- android:textSize="18sp"- app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintStart_toStartOf="parent"+ android:textColor="@color/greyLight"+ android:textSize="22sp"+ app:layout_constraintStart_toStartOf="@+id/info_title"app:layout_constraintTop_toBottomOf="@+id/info_title" /><TextView@@ -55,9 +55,9 @@android:layout_height="wrap_content"android:layout_marginTop="8dp"android:text="@string/info_subtitle"- android:textSize="18sp"- app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintStart_toStartOf="parent"+ android:textSize="20sp"+ app:layout_constraintEnd_toEndOf="@+id/info_title"+ app:layout_constraintStart_toStartOf="@+id/info_title_img"app:layout_constraintTop_toBottomOf="@+id/info_version" /><Button@@ -65,10 +65,13 @@style="@style/InfoButton"android:layout_width="wrap_content"android:layout_height="wrap_content"+ android:layout_marginStart="16dp"android:layout_marginTop="8dp"android:drawableStart="@drawable/ic_github"android:text="@string/info_github"- app:layout_constraintEnd_toStartOf="@+id/info_btn_fdroid"+ app:layout_constraintEnd_toStartOf="@+id/info_btn_donate"+ app:layout_constraintHorizontal_bias="0.5"+ app:layout_constraintHorizontal_chainStyle="spread"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toBottomOf="@+id/info_subtitle" />@@ -77,31 +80,33 @@style="@style/InfoButton"android:layout_width="wrap_content"android:layout_height="wrap_content"+ android:layout_marginEnd="16dp"android:drawableStart="@drawable/ic_fdroid"android:text="@string/info_fdroid"- app:layout_constraintBaseline_toBaselineOf="@+id/info_btn_github"+ app:layout_constraintBaseline_toBaselineOf="@+id/info_btn_donate"app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintStart_toEndOf="@+id/info_btn_github" />+ app:layout_constraintHorizontal_bias="0.5"+ app:layout_constraintStart_toEndOf="@+id/info_btn_donate" /><Buttonandroid:id="@+id/info_btn_donate"style="@style/InfoButton"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:layout_marginTop="8dp"android:drawableStart="@drawable/ic_bmc"- android:text="@string/info_bmc"- app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/info_btn_github" />+ android:text="@string/info_support"+ app:layout_constraintBaseline_toBaselineOf="@+id/info_btn_github"+ app:layout_constraintEnd_toStartOf="@+id/info_btn_fdroid"+ app:layout_constraintHorizontal_bias="0.5"+ app:layout_constraintStart_toEndOf="@+id/info_btn_github" /><TextViewandroid:id="@+id/info_thanks"android:layout_width="0dp"android:layout_height="wrap_content"- android:layout_marginStart="8dp"+ android:layout_marginStart="16dp"android:layout_marginTop="8dp"- android:layout_marginEnd="8dp"+ android:layout_marginEnd="16dp"android:gravity="center"android:text="@string/info_thanks"android:textSize="16sp"diff --git a/app/src/main/res/layout/fragment_passes.xml b/app/src/main/res/layout/fragment_passes.xmlindex 3d7add0b..3dad8cc4 100644--- a/app/src/main/res/layout/fragment_passes.xml+++ b/app/src/main/res/layout/fragment_passes.xml@@ -5,7 +5,7 @@android:layout_width="match_parent"android:layout_height="match_parent">- <com.google.android.material.card.MaterialCardView+ <androidx.cardview.widget.CardViewandroid:id="@+id/passes_bar"style="@style/TopBar"app:layout_constraintEnd_toEndOf="parent"diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xmlindex 4bcc92e4..53a56c72 100644--- a/app/src/main/res/values-ru/strings.xml+++ b/app/src/main/res/values-ru/strings.xml@@ -71,7 +71,7 @@<string name="info_version">Версия: %s</string><string name="info_subtitle">Трекер спутников для Android</string>- <string name="info_bmc">Поддержать разработчика</string>+ <string name="info_support">Поддержать</string><string name="info_thanks">Огромное спасибо:\n\nВам за использование этого приложения! \nЖелаю всегда чистого неба над головой!\n\n<a href="https://github.com/g4dpz">David A. B. Johnson</a> иdiff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xmlindex 47d1de00..522b86af 100644--- a/app/src/main/res/values/colors.xml+++ b/app/src/main/res/values/colors.xml@@ -7,4 +7,5 @@<color name="greyDivider">#808080</color><color name="greySurface">#1e1e1e</color><color name="mapInfoLayout">#99000000</color>+ <color name="mtrl_textinput_default_box_stroke_color">@color/greyLight</color></resources>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex dd535d4f..d1e8482b 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -95,7 +95,7 @@<string name="info_subtitle">Satellite tracker and pass predictor</string><string name="info_github" translatable="false">GitHub</string><string name="info_fdroid" translatable="false">F-Droid</string>- <string name="info_bmc">Support the developer</string>+ <string name="info_support">Support</string><string name="info_thanks">Huge thanks to:\n\nYou for downloading and using Look4Sat! \nMay your sky always be clear!\n\n<a href="https://github.com/g4dpz">David A. B. Johnson</a>