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

Fixed the drawer menu layout issues

Browse Source
This commit is contained in:
Arty Bishop committed 2020-01-29 09:31:53 +00:00
1 parent ce823f402f
commit 4c1badacb3
10 files changed
+157 -137
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/MainActivity.kt
+24 -24
View File
@@ -26,7 +26,7 @@ import android.content.pm.PackageManager
import android.net.Uri
import android.os.Bundle
import android.view.View
import android.widget.ImageButton
import android.widget.Button
import android.widget.TextView
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
@@ -58,11 +58,11 @@ class MainActivity : AppCompatActivity() {
private lateinit var drawerLayout: DrawerLayout
private lateinit var drawerLat: TextView
private lateinit var drawerLon: TextView
private lateinit var drawerBtnLoc: ImageButton
private lateinit var drawerBtnTle: ImageButton
private lateinit var drawerBtnTrans: ImageButton
private lateinit var drawerBtnGithub: ImageButton
private lateinit var drawerBtnExit: ImageButton
private lateinit var drawerBtnLoc: Button
private lateinit var drawerBtnTle: Button
private lateinit var drawerBtnTrans: Button
private lateinit var drawerBtnGithub: Button
private lateinit var drawerBtnExit: Button
private lateinit var appBarConfig: AppBarConfiguration
override fun onCreate(savedInstanceState: Bundle?) {
@@ -124,12 +124,12 @@ class MainActivity : AppCompatActivity() {
viewModel.debugMessage.observe(this, Observer { message ->
Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
when (message) {
getString(R.string.update_loc_success) -> drawerBtnLoc.enable()
getString(R.string.update_tle_success) -> drawerBtnTle.enable()
getString(R.string.update_trans_success) -> drawerBtnTrans.enable()
getString(R.string.update_loc_success) -> drawerBtnLoc.isEnabled = true
getString(R.string.update_tle_success) -> drawerBtnTle.isEnabled = true
getString(R.string.update_trans_success) -> drawerBtnTrans.isEnabled = true
getString(R.string.update_failure) -> {
drawerBtnTle.enable()
drawerBtnTrans.enable()
drawerBtnTle.isEnabled = true
drawerBtnTrans.isEnabled = true
}
}
})
@@ -142,15 +142,15 @@ class MainActivity : AppCompatActivity() {
private fun setupDrawer() {
drawerBtnLoc.setOnClickListener {
drawerBtnLoc.disable()
it.isEnabled = false
requestLocationUpdate()
}
drawerBtnTle.setOnClickListener {
drawerBtnTle.disable()
it.isEnabled = false
viewModel.updateAndSaveTleFile()
}
drawerBtnTrans.setOnClickListener {
drawerBtnTrans.disable()
it.isEnabled = false
viewModel.updateTransmittersDatabase()
}
drawerBtnGithub.setOnClickListener {
@@ -187,14 +187,14 @@ class MainActivity : AppCompatActivity() {
val navController = findNavController(R.id.nav_host)
return navController.navigateUp(appBarConfig) || super.onSupportNavigateUp()
}
private fun ImageButton.enable() {
this.isEnabled = true
this.alpha = 1.0f
}
private fun ImageButton.disable() {
this.isEnabled = false
this.alpha = 0.25f
}
//
// private fun ImageButton.enable() {
// this.isEnabled = true
// this.alpha = 1.0f
// }
//
// private fun ImageButton.disable() {
// this.isEnabled = false
// this.alpha = 0.25f
// }
}
app/src/main/res/drawable/ic_exit_app.xml
+1 -1
View File
@@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="@color/themeIcon"
android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z" />
</vector>
app/src/main/res/drawable/ic_goto_github.xml
+1 -1
View File
@@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillColor="@color/themeIcon"
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" />
</vector>
app/src/main/res/drawable/ic_update_loc.xml
+1 -1
View File
@@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="@color/themeIcon"
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>
app/src/main/res/drawable/ic_update_tle.xml
+1 -1
View File
@@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="@color/themeIcon"
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>
app/src/main/res/drawable/ic_update_trans.xml
+3 -3
View File
@@ -1,9 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="34dp"
android:height="34dp"
android:width="32dp"
android:height="32dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="@color/themeIcon"
android:pathData="M12,11c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,13c0,-3.31 -2.69,-6 -6,-6s-6,2.69 -6,6c0,2.22 1.21,4.15 3,5.19l1,-1.74c-1.19,-0.7 -2,-1.97 -2,-3.45 0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,1.48 -0.81,2.75 -2,3.45l1,1.74c1.79,-1.04 3,-2.97 3,-5.19zM12,3C6.48,3 2,7.48 2,13c0,3.7 2.01,6.92 4.99,8.65l1,-1.73C5.61,18.53 4,15.96 4,13c0,-4.42 3.58,-8 8,-8s8,3.58 8,8c0,2.96 -1.61,5.53 -4,6.92l1,1.73c2.99,-1.73 5,-4.95 5,-8.65 0,-5.52 -4.48,-10 -10,-10z" />
</vector>
app/src/main/res/layout/drawer_header.xml
+115 -94
View File
@@ -1,155 +1,176 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ic_launcher_background"
android:gravity="bottom"
android:theme="@style/ThemeOverlay.AppCompat.Dark">
<ImageView
android:id="@+id/drawer_sat_img"
android:layout_width="104dp"
android:layout_height="104dp"
android:layout_marginStart="8dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="16dp"
android:contentDescription="@string/app_name"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/drawer_title"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_sat_desc_left" />
<TextView
android:id="@+id/drawer_title"
style="@style/DrawerHeader.Title"
android:layout_marginStart="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="@string/drawer_title"
app:layout_constraintBottom_toBottomOf="@+id/drawer_sat_img"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/drawer_sat_img" />
app:layout_constraintEnd_toStartOf="@+id/drawer_sat_img"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
app:layout_constraintTop_toTopOf="@+id/guidelineTop" />
<ImageView
android:id="@+id/drawer_sat_img"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginEnd="4dp"
android:contentDescription="@string/app_name"
app:layout_constraintBottom_toBottomOf="@+id/drawer_title"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/drawer_title"
app:layout_constraintTop_toTopOf="@+id/drawer_title"
app:srcCompat="@drawable/ic_sat_desc_left" />
<TextView
android:id="@+id/drawer_lat"
style="@style/DrawerHeader.Item"
android:layout_marginStart="4dp"
android:text="@string/drawer_lat_text"
app:layout_constraintBaseline_toBaselineOf="@+id/drawer_lat_value"
app:layout_constraintStart_toStartOf="@+id/drawer_title" />
app:layout_constraintStart_toStartOf="@+id/guidelineLeft" />
<TextView
android:id="@+id/drawer_lat_value"
style="@style/DrawerHeader.ItemValue"
android:layout_marginStart="8dp"
android:layout_width="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/pat_location"
app:layout_constraintStart_toEndOf="@+id/drawer_lat"
app:layout_constraintTop_toBottomOf="@+id/drawer_sat_img" />
app:layout_constraintEnd_toEndOf="@+id/drawer_lon_value"
app:layout_constraintStart_toStartOf="@+id/drawer_lon_value"
app:layout_constraintTop_toBottomOf="@+id/drawer_title" />
<TextView
android:id="@+id/drawer_lon"
style="@style/DrawerHeader.Item"
android:layout_marginStart="4dp"
android:text="@string/drawer_lon_text"
app:layout_constraintStart_toStartOf="@+id/drawer_lat"
app:layout_constraintTop_toBottomOf="@+id/drawer_lat" />
app:layout_constraintBaseline_toBaselineOf="@+id/drawer_lon_value"
app:layout_constraintStart_toStartOf="@+id/guidelineLeft" />
<TextView
android:id="@+id/drawer_lon_value"
style="@style/DrawerHeader.ItemValue"
android:layout_width="wrap_content"
android:layout_marginStart="8dp"
android:text="@string/pat_location"
app:layout_constraintBaseline_toBaselineOf="@+id/drawer_lon"
app:layout_constraintStart_toEndOf="@+id/drawer_lon" />
app:layout_constraintStart_toEndOf="@+id/barrier"
app:layout_constraintTop_toBottomOf="@+id/drawer_lat_value" />
<ImageButton
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/drawer_btn_loc"
style="@style/DrawerHeader.Button"
android:layout_marginStart="8dp"
android:layout_width="0dp"
android:layout_marginTop="4dp"
android:contentDescription="@string/placeholder"
android:src="@drawable/ic_update_loc"
android:drawableEnd="@drawable/ic_update_loc"
android:text="@string/update_loc"
app:layout_constraintBottom_toTopOf="@+id/drawer_btn_tle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
app:layout_constraintTop_toBottomOf="@+id/drawer_lon_value" />
<TextView
android:id="@+id/drawer_tv_loc"
style="@style/DrawerHeader.ButtonText"
android:layout_marginStart="8dp"
android:text="@string/update_loc"
app:layout_constraintBottom_toBottomOf="@+id/drawer_btn_loc"
app:layout_constraintStart_toEndOf="@+id/drawer_btn_loc"
app:layout_constraintTop_toTopOf="@+id/drawer_btn_loc" />
<ImageButton
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/drawer_btn_tle"
style="@style/DrawerHeader.Button"
android:contentDescription="@string/placeholder"
android:src="@drawable/ic_update_tle"
app:layout_constraintBottom_toTopOf="@+id/drawer_btn_trans"
app:layout_constraintStart_toStartOf="@+id/drawer_btn_loc"
app:layout_constraintTop_toBottomOf="@+id/drawer_btn_loc" />
<TextView
android:id="@+id/drawer_tv_tle"
style="@style/DrawerHeader.ButtonText"
android:layout_width="0dp"
android:drawableEnd="@drawable/ic_update_tle"
android:text="@string/update_tle"
app:layout_constraintBottom_toBottomOf="@+id/drawer_btn_tle"
app:layout_constraintStart_toStartOf="@+id/drawer_tv_loc"
app:layout_constraintBottom_toTopOf="@+id/drawer_btn_trans"
app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
app:layout_constraintTop_toBottomOf="@+id/drawer_btn_loc" />
<ImageButton
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/drawer_btn_trans"
style="@style/DrawerHeader.Button"
android:contentDescription="@string/placeholder"
android:src="@drawable/ic_update_trans"
app:layout_constraintBottom_toTopOf="@+id/drawer_btn_github"
app:layout_constraintStart_toStartOf="@+id/drawer_btn_tle"
app:layout_constraintTop_toBottomOf="@+id/drawer_btn_tle" />
<TextView
android:id="@+id/drawer_tv_trans"
style="@style/DrawerHeader.ButtonText"
android:layout_width="0dp"
android:drawableEnd="@drawable/ic_update_trans"
android:text="@string/update_trans"
app:layout_constraintBottom_toBottomOf="@+id/drawer_btn_trans"
app:layout_constraintStart_toStartOf="@+id/drawer_tv_tle"
app:layout_constraintBottom_toTopOf="@+id/drawer_btn_github"
app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
app:layout_constraintTop_toBottomOf="@+id/drawer_btn_tle" />
<ImageButton
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/drawer_btn_github"
style="@style/DrawerHeader.Button"
android:layout_marginBottom="8dp"
android:contentDescription="@string/placeholder"
android:src="@drawable/ic_goto_github"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/drawer_btn_trans"
app:layout_constraintTop_toBottomOf="@+id/drawer_btn_trans" />
<TextView
android:id="@+id/drawer_tv_github"
style="@style/DrawerHeader.ButtonText"
android:layout_width="0dp"
android:layout_marginEnd="1dp"
android:drawableEnd="@drawable/ic_goto_github"
android:text="@string/goto_github"
app:layout_constraintBottom_toBottomOf="@+id/drawer_btn_github"
app:layout_constraintStart_toStartOf="@+id/drawer_tv_trans"
app:layout_constraintBottom_toTopOf="@+id/guidelineBottom"
app:layout_constraintEnd_toStartOf="@+id/guideline_center"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
app:layout_constraintTop_toBottomOf="@+id/drawer_btn_trans" />
<ImageButton
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/drawer_btn_exit"
style="@style/DrawerHeader.Button"
android:layout_marginStart="8dp"
android:contentDescription="@string/placeholder"
android:src="@drawable/ic_exit_app"
app:layout_constraintBottom_toBottomOf="@+id/drawer_btn_github"
app:layout_constraintStart_toEndOf="@+id/drawer_tv_github"
app:layout_constraintTop_toTopOf="@+id/drawer_btn_github" />
<TextView
android:id="@+id/drawer_tv_exit"
style="@style/DrawerHeader.ButtonText"
android:layout_marginStart="8dp"
android:layout_width="0dp"
android:layout_marginStart="1dp"
android:drawableEnd="@drawable/ic_exit_app"
android:text="@string/exit_app"
app:layout_constraintBottom_toBottomOf="@+id/drawer_btn_exit"
app:layout_constraintStart_toEndOf="@+id/drawer_btn_exit"
app:layout_constraintTop_toTopOf="@+id/drawer_btn_exit" />
app:layout_constraintBaseline_toBaselineOf="@+id/drawer_btn_github"
app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="@+id/guideline_center" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="end"
app:constraint_referenced_ids="drawer_lat,drawer_lon"
tools:layout_editor_absoluteX="101dp"
tools:layout_editor_absoluteY="8dp" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guidelineTop"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_begin="24dp" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guidelineLeft"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_begin="6dp" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guidelineRight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_end="6dp" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guidelineBottom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_end="6dp" />
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/values/colors.xml
+2
View File
@@ -3,6 +3,8 @@
<color name="themeAccent">#FFE082</color>
<color name="themeLight">#C0C0C0</color>
<color name="themeDark">#191919</color>
<color name="themeIcon">#FFE082</color>
<color name="themeButton">#242424</color>
<color name="backgroundDark">#080808</color>
<color name="backgroundMapText">#CC000000</color>
<color name="satTrack">#D50000</color>
app/src/main/res/values/strings.xml
+3 -3
View File
@@ -21,7 +21,7 @@
<string name="app_name">Look4Sat</string>
<string name="app_version">Version: %s</string>
<string name="drawer_title" translatable="false">L∞king \n4Sat…</string>
<string name="drawer_title" translatable="false">L∞k \n4Sat</string>
<string name="drawer_lat_text">Latitude: </string>
<string name="drawer_lon_text">Longitude: </string>
@@ -29,8 +29,8 @@
<string name="update_loc_success">Location was updated</string>
<string name="update_tle">Update TLE file</string>
<string name="update_tle_success">TLE file was updated</string>
<string name="update_trans">Update transceiver DB</string>
<string name="update_trans_success">Transceiver database was updated</string>
<string name="update_trans">Update transceivers</string>
<string name="update_trans_success">Transceivers database was updated</string>
<string name="update_failure">Check your internet connection</string>
<string name="goto_github" translatable="false">GitHub</string>
<string name="exit_app">Exit</string>
app/src/main/res/values/styles.xml
+6 -9
View File
@@ -49,24 +49,21 @@
</style>
<style name="DrawerHeader.Item">
<item name="android:textSize">24sp</item>
<item name="android:textSize">21sp</item>
<item name="android:fontFamily">serif</item>
</style>
<style name="DrawerHeader.ItemValue">
<item name="android:textSize">28sp</item>
<item name="android:textSize">25sp</item>
<item name="android:textStyle">bold</item>
</style>
<style name="DrawerHeader.Button">
<item name="android:layout_width">48dp</item>
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">48dp</item>
<item name="android:backgroundTint">@color/themeAccent</item>
</style>
<style name="DrawerHeader.ButtonText">
<item name="android:textSize">17sp</item>
<item name="android:fontFamily">serif</item>
<item name="android:gravity">start|center_vertical</item>
<item name="android:textColor">@color/themeAccent</item>
<item name="android:backgroundTint">@color/themeButton</item>
</style>
<style name="ToolbarText">