mckero/Look4Sat-rt-bishop
1
0 Fork 0
mirror of https://github.com/rt-bishop/Look4Sat.git synced 2026-10-02 03:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes to the satPass cardView appearance and the worldMap background. Additional textView for the catNum ID and a progressBar for the pass progress.

Browse Source
This commit is contained in:
Arty Bishop committed 2019-12-28 15:04:16 +00:00
1 parent 5e53bb9db9
commit 3f125602cf
10 files changed
+99 -141
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/rtbishop/look4sat/ui/SatPassAdapter.kt
+11 -7
View File
@@ -22,6 +22,7 @@ package com.rtbishop.look4sat.ui
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ProgressBar
import android.widget.TextView
import androidx.core.os.bundleOf
import androidx.navigation.findNavController
@@ -48,25 +49,28 @@ class SatPassAdapter : RecyclerView.Adapter<SatPassAdapter.PassHolder>() {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PassHolder {
val itemView = LayoutInflater
.from(parent.context)
.inflate(R.layout.sat_pass_card, parent, false)
.inflate(R.layout.card_pass, parent, false)
return PassHolder(itemView)
}
override fun onBindViewHolder(holder: PassHolder, position: Int) {
val satPass = satPassList[position]
val satName = holder.itemView.findViewById<TextView>(R.id.card_sat_name)
val maxEl = holder.itemView.findViewById<TextView>(R.id.card_max_el)
val passVector = holder.itemView.findViewById<TextView>(R.id.card_pass_vector)
val passStart = holder.itemView.findViewById<TextView>(R.id.card_pass_start)
val passEnd = holder.itemView.findViewById<TextView>(R.id.card_pass_end)
val satName = holder.itemView.findViewById<TextView>(R.id.pass_satName)
val satId = holder.itemView.findViewById<TextView>(R.id.pass_satId)
val maxEl = holder.itemView.findViewById<TextView>(R.id.pass_maxEl)
val passVector = holder.itemView.findViewById<TextView>(R.id.pass_azVector)
val passStart = holder.itemView.findViewById<TextView>(R.id.pass_aosTime)
val passEnd = holder.itemView.findViewById<TextView>(R.id.pass_losTime)
val progressBar = holder.itemView.findViewById<ProgressBar>(R.id.pass_progress)
val aosTime =
SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(satPass.pass.startTime)
val losTime =
SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(satPass.pass.endTime)
satName.text = satPass.tle.name
maxEl.text = String.format("%.1f°", satPass.pass.maxEl)
satId.text = String.format("Id: %d", satPass.tle.catnum)
maxEl.text = String.format("MaxEl: %.1f°", satPass.pass.maxEl)
passVector.text =
String.format("Az: %2d° -> %2d°", satPass.pass.aosAzimuth, satPass.pass.losAzimuth)
passStart.text = String.format("AOS - %s", aosTime)
app/src/main/res/drawable/card_pass_background.webp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

app/src/main/res/drawable/ic_drawing.xml
-45
View File
@@ -1,45 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="180dp"
android:height="52dp"
android:viewportWidth="180"
android:viewportHeight="52">
<path
android:fillAlpha="1"
android:fillColor="#00000000"
android:fillType="evenOdd"
android:pathData="M90.228,25.867m-18.678,0a18.678,18.678 0,1 1,37.356 0a18.678,18.678 0,1 1,-37.356 0"
android:strokeWidth="1.2"
android:strokeColor="#C0C0C0" />
<path
android:fillColor="#00000000"
android:pathData="m179.999,0.23c-25.023,0.051 -50.046,0.102 -63.817,1.503 -13.771,1.402 -16.29,4.154 -18.809,6.906"
android:strokeWidth="0.8"
android:strokeAlpha="1"
android:strokeColor="#C0C0C0"
android:strokeLineCap="butt"
android:strokeLineJoin="miter" />
<path
android:fillColor="#00000000"
android:pathData="m179.999,51.77c-25.023,-0.051 -50.046,-0.102 -63.817,-1.503 -13.771,-1.402 -16.29,-4.154 -18.809,-6.906"
android:strokeWidth="0.8"
android:strokeAlpha="1"
android:strokeColor="#C0C0C0"
android:strokeLineCap="butt"
android:strokeLineJoin="miter" />
<path
android:fillColor="#00000000"
android:pathData="m0.001,51.77c25.023,-0.051 50.046,-0.102 63.817,-1.503 13.771,-1.402 16.29,-4.154 18.809,-6.906"
android:strokeWidth="0.8"
android:strokeAlpha="1"
android:strokeColor="#C0C0C0"
android:strokeLineCap="butt"
android:strokeLineJoin="miter" />
<path
android:fillColor="#00000000"
android:pathData="m0.001,0.23c25.023,0.051 50.046,0.102 63.817,1.503 13.771,1.402 16.29,4.154 18.809,6.906"
android:strokeWidth="0.8"
android:strokeAlpha="1"
android:strokeColor="#C0C0C0"
android:strokeLineCap="butt"
android:strokeLineJoin="miter" />
</vector>
app/src/main/res/drawable/map_nasa.webp → app/src/main/res/drawable/worldmap_day.webp
View File
File renamed without changes.
app/src/main/res/drawable/worldmap_night.webp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 162 KiB

app/src/main/res/layout/card_pass.xml
+76
View File
@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/card_pass"
style="@style/CardPass"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
app:cardElevation="4dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/card_pass_background">
<TextView
android:id="@+id/pass_satName"
style="@style/CardPass.SatName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
android:text="@string/pass_satName"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/pass_satId"
style="@style/CardPass.SideText"
android:layout_marginEnd="8dp"
android:text="@string/pass_satId"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_satName"
app:layout_constraintEnd_toEndOf="parent" />
<TextView
android:id="@+id/pass_azVector"
style="@style/CardPass.SideText"
android:layout_width="wrap_content"
android:text="@string/pass_azVector"
app:layout_constraintStart_toStartOf="@+id/pass_satName"
app:layout_constraintTop_toBottomOf="@+id/pass_satName" />
<TextView
android:id="@+id/pass_maxEl"
style="@style/CardPass.SideText"
android:text="@string/pass_maxEl"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_azVector"
app:layout_constraintEnd_toEndOf="@+id/pass_satId" />
<TextView
android:id="@+id/pass_aosTime"
style="@style/CardPass.SideText"
android:layout_marginBottom="4dp"
android:text="@string/pass_aosTime"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/pass_progress"
app:layout_constraintTop_toBottomOf="@+id/pass_progress" />
<TextView
android:id="@+id/pass_losTime"
style="@style/CardPass.SideText"
android:text="@string/pass_losTime"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_aosTime"
app:layout_constraintEnd_toEndOf="@+id/pass_progress" />
<ProgressBar
android:id="@+id/pass_progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="@+id/pass_maxEl"
app:layout_constraintStart_toStartOf="@+id/pass_azVector"
app:layout_constraintTop_toBottomOf="@+id/pass_azVector" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
app/src/main/res/layout/fragment_worldmap.xml
+1 -1
View File
@@ -10,7 +10,7 @@
android:id="@+id/worldmap_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/map_nasa"
android:background="@drawable/worldmap_night"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app/src/main/res/layout/sat_pass_card.xml
-77
View File
@@ -1,77 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/card_view"
style="@style/CardSatPass"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
app:cardElevation="4dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/imageView"
android:layout_width="0dp"
android:layout_height="0dp"
android:contentDescription="@string/placeholder"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_drawing" />
<TextView
android:id="@+id/card_sat_name"
style="@style/CardSatPass.SideText"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="4dp"
android:text="@string/card_sat_name"
app:layout_constraintBottom_toTopOf="@+id/card_pass_vector"
app:layout_constraintEnd_toStartOf="@+id/card_max_el"
app:layout_constraintStart_toStartOf="@+id/card_pass_vector"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/card_pass_vector"
style="@style/CardSatPass.SideText"
android:layout_width="0dp"
android:layout_marginStart="4dp"
android:layout_marginBottom="4dp"
android:text="@string/card_pass_vector"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/card_max_el"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/card_max_el"
style="@style/CardSatPass.MaxEl"
android:text="@string/card_max_el"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/card_pass_start"
style="@style/CardSatPass.SideText"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
android:text="@string/card_pass_aos_time"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/imageView" />
<TextView
android:id="@+id/card_pass_end"
style="@style/CardSatPass.SideText"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
android:text="@string/card_pass_los_time"
app:layout_constraintBottom_toBottomOf="@+id/imageView"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
app/src/main/res/values/strings.xml
+6 -5
View File
@@ -21,11 +21,12 @@
<string name="menu_credits">Credits</string>
<string name="menu_about">About the App</string>
<string name="card_sat_name">Meteor M2–2</string>
<string name="card_pass_vector">Az: 180° -> 360°</string>
<string name="card_max_el">75.5°</string>
<string name="card_pass_aos_time">AOS - 13:14:15</string>
<string name="card_pass_los_time">LOS - 16:17:18</string>
<string name="pass_satName">Meteor M2–2</string>
<string name="pass_satId">ID: 48680</string>
<string name="pass_azVector">Az: 180° -> 360°</string>
<string name="pass_maxEl">MaxEl: 75.5°</string>
<string name="pass_aosTime">AOS - 13:14:15</string>
<string name="pass_losTime">LOS - 16:17:18</string>
<string name="radar_azimuth">Azimuth: 180.00°</string>
<string name="radar_elevation">Elevation: 75.50°</string>
app/src/main/res/values/styles.xml
+5 -6
View File
@@ -68,23 +68,22 @@
<item name="android:backgroundTint">@color/toolbarButton</item>
</style>
<style name="CardSatPass">
<style name="CardPass">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">104dp</item>
<item name="android:layout_height">wrap_content</item>
</style>
<style name="CardSatPass.SideText">
<style name="CardPass.SideText">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">18sp</item>
</style>
<style name="CardSatPass.MaxEl">
<style name="CardPass.SatName">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">24sp</item>
<item name="android:textSize">21sp</item>
<item name="android:textColor">@color/themeAccent</item>
<item name="android:textStyle">bold</item>
</style>
<style name="RadarText">