Moved to viewBinding instead of findViewById

This commit is contained in:
Arty Bishop committed 2020-02-29 23:39:02 +00:00
1 parent 7c19bb5b52
commit 38b9feb829
22 files changed
+292 -349

No files matched your search

@@ -27,6 +27,7 @@
tools:openDrawer="start">
<include
android:id="@+id/include_app_bar"
layout="@layout/app_bar_main"
android:layout_width="match_parent"
android:layout_height="match_parent" />
+3 -1
View File
@@ -64,6 +64,8 @@
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_main" />
<include
android:id="@+id/include_main_content"
layout="@layout/content_main" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
+7 -6
View File
@@ -20,6 +20,7 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ic_launcher_background"
@@ -86,7 +87,7 @@
android:text="@string/pat_location"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.1"
app:layout_constraintStart_toEndOf="@+id/barrier"
app:layout_constraintStart_toEndOf="@+id/mainBarrier"
app:layout_constraintTop_toBottomOf="@+id/drawer_lat_value" />
<androidx.appcompat.widget.AppCompatButton
@@ -131,14 +132,14 @@
android:drawableEnd="@drawable/ic_goto_github"
android:text="@string/goto_github"
app:layout_constraintBottom_toTopOf="@+id/guidelineBottom"
app:layout_constraintEnd_toStartOf="@+id/guideline_center"
app:layout_constraintEnd_toStartOf="@+id/guidelineCenter"
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" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/drawer_btn_exit"
android:id="@+id/drawerBtnExit"
style="@style/DrawerHeader.Button"
android:layout_width="0dp"
android:layout_marginStart="1dp"
@@ -147,17 +148,17 @@
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" />
app:layout_constraintStart_toStartOf="@+id/guidelineCenter" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_center"
android:id="@+id/guidelineCenter"
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:id="@+id/mainBarrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="end"
+16 -16
View File
@@ -29,19 +29,19 @@
android:layout_height="wrap_content">
<TextView
android:id="@+id/about_title"
android:id="@+id/tv_about_title"
style="@style/AboutTitle"
android:layout_marginStart="4dp"
android:layout_marginEnd="16dp"
android:text="@string/app_name"
app:layout_constraintBottom_toBottomOf="@+id/about_title_img"
app:layout_constraintBottom_toBottomOf="@+id/img_about"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/about_title_img"
app:layout_constraintTop_toTopOf="@+id/about_title_img" />
app:layout_constraintStart_toEndOf="@+id/img_about"
app:layout_constraintTop_toTopOf="@+id/img_about" />
<ImageView
android:id="@+id/about_title_img"
android:id="@+id/img_about"
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_marginStart="16dp"
@@ -49,14 +49,14 @@
android:layout_marginEnd="4dp"
android:contentDescription="@string/placeholder"
android:src="@drawable/ic_sputnik"
app:layout_constraintEnd_toStartOf="@+id/about_title"
app:layout_constraintEnd_toStartOf="@+id/tv_about_title"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/about_title_version"
android:id="@+id/tv_about_version"
style="@style/AboutSubtitle"
android:layout_marginStart="32dp"
android:layout_marginTop="8dp"
@@ -64,10 +64,10 @@
android:text="@string/app_version"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/about_title" />
app:layout_constraintTop_toBottomOf="@+id/tv_about_title" />
<TextView
android:id="@+id/about_subtitle"
android:id="@+id/tv_about_subtitle"
style="@style/AboutSubtitle"
android:layout_marginStart="32dp"
android:layout_marginTop="8dp"
@@ -75,19 +75,19 @@
android:text="@string/about_subtitle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/about_title_version" />
app:layout_constraintTop_toBottomOf="@+id/tv_about_version" />
<TextView
android:id="@+id/about_thanks"
android:id="@+id/tv_about_thanks"
style="@style/AboutSubtitle"
android:layout_marginTop="16dp"
android:text="@string/about_thanks_to"
app:layout_constraintEnd_toEndOf="@+id/about_subtitle"
app:layout_constraintStart_toStartOf="@+id/about_subtitle"
app:layout_constraintTop_toBottomOf="@+id/about_subtitle" />
app:layout_constraintEnd_toEndOf="@+id/tv_about_subtitle"
app:layout_constraintStart_toStartOf="@+id/tv_about_subtitle"
app:layout_constraintTop_toBottomOf="@+id/tv_about_subtitle" />
<TextView
android:id="@+id/about_thanks_to"
android:id="@+id/tv_about_message"
style="@style/AboutRegular"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
@@ -97,7 +97,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/about_thanks" />
app:layout_constraintTop_toBottomOf="@+id/tv_about_thanks" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
@@ -25,7 +25,7 @@
tools:context=".ui.MapViewFragment">
<FrameLayout
android:id="@+id/map_frame"
android:id="@+id/frameMap"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/worldmap_bg_dark"
@@ -35,7 +35,7 @@
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/map_fab"
android:id="@+id/fabMap"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|start"
@@ -46,7 +46,7 @@
app:srcCompat="@drawable/ic_sat_asc_right" />
<TextView
android:id="@+id/map_lat"
android:id="@+id/tvMapLat"
style="@style/MapText"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
@@ -55,7 +55,7 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/map_lon"
android:id="@+id/tvMapLon"
style="@style/MapText"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
@@ -64,7 +64,7 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/map_rng"
android:id="@+id/tvMapRng"
style="@style/MapText"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
+13 -13
View File
@@ -19,7 +19,7 @@
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/pass_list_refresh"
android:id="@+id/refLayoutPassList"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -28,7 +28,7 @@
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/pass_list_recycler"
android:id="@+id/recPassList"
android:layout_width="0dp"
android:layout_height="0dp"
android:paddingBottom="4dp"
@@ -41,7 +41,7 @@
</androidx.recyclerview.widget.RecyclerView>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/pass_info_layout"
android:id="@+id/layoutInfo"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="visible"
@@ -51,7 +51,7 @@
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/info_swipe_img"
android:id="@+id/imgInfoSwipe"
android:layout_width="36dp"
android:layout_height="36dp"
android:contentDescription="@string/placeholder"
@@ -61,7 +61,7 @@
app:srcCompat="@drawable/ic_arrow_swipe" />
<TextView
android:id="@+id/info_swipe_text"
android:id="@+id/tvInfoSwipe"
style="@style/PassInfoText"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -70,10 +70,10 @@
android:text="@string/info_swipe_text"
app:layout_constraintEnd_toStartOf="@+id/guideRight"
app:layout_constraintStart_toStartOf="@+id/guideLeft"
app:layout_constraintTop_toBottomOf="@+id/info_swipe_img" />
app:layout_constraintTop_toBottomOf="@+id/imgInfoSwipe" />
<ImageView
android:id="@+id/info_img_sputnik"
android:id="@+id/imgInfoSputnik"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="16dp"
@@ -81,22 +81,22 @@
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:contentDescription="@string/placeholder"
app:layout_constraintBottom_toTopOf="@+id/info_main_text"
app:layout_constraintBottom_toTopOf="@+id/tvInfoMain"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toStartOf="@+id/guideRight"
app:layout_constraintStart_toStartOf="@+id/guideLeft"
app:layout_constraintTop_toBottomOf="@+id/info_swipe_text"
app:layout_constraintTop_toBottomOf="@+id/tvInfoSwipe"
app:layout_constraintVertical_chainStyle="packed"
app:srcCompat="@drawable/ic_sputnik" />
<TextView
android:id="@+id/info_main_text"
android:id="@+id/tvInfoMain"
style="@style/PassInfoText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/info_main_text"
app:layout_constraintBottom_toTopOf="@+id/info_select_text"
app:layout_constraintBottom_toTopOf="@+id/tvSatSelect"
app:layout_constraintEnd_toStartOf="@+id/guideRight"
app:layout_constraintStart_toStartOf="@+id/guideLeft"
app:layout_constraintTop_toTopOf="@+id/guideCenter"
@@ -104,7 +104,7 @@
app:layout_constraintVertical_chainStyle="spread" />
<TextView
android:id="@+id/info_select_text"
android:id="@+id/tvSatSelect"
style="@style/PassInfoText"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -152,7 +152,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/pass_list_fab"
android:id="@+id/fabSatSelect"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
+17 -17
View File
@@ -25,7 +25,7 @@
tools:context=".ui.PolarViewFragment">
<FrameLayout
android:id="@+id/polar_view_frame"
android:id="@+id/frame_polar"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintDimensionRatio="1:1"
@@ -34,49 +34,49 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/polar_azimuth"
android:id="@+id/tv_polar_az"
style="@style/PolarViewText"
android:layout_marginStart="4dp"
android:text="@string/pat_azimuth"
app:layout_constraintStart_toStartOf="@+id/polar_view_frame"
app:layout_constraintTop_toTopOf="@+id/polar_view_frame" />
app:layout_constraintStart_toStartOf="@+id/frame_polar"
app:layout_constraintTop_toTopOf="@+id/frame_polar" />
<TextView
android:id="@+id/polar_elevation"
android:id="@+id/tv_polar_el"
style="@style/PolarViewText"
android:layout_marginEnd="4dp"
android:text="@string/pat_elevation"
app:layout_constraintEnd_toEndOf="@+id/polar_view_frame"
app:layout_constraintTop_toTopOf="@+id/polar_view_frame" />
app:layout_constraintEnd_toEndOf="@+id/frame_polar"
app:layout_constraintTop_toTopOf="@+id/frame_polar" />
<TextView
android:id="@+id/polar_altitude"
android:id="@+id/tv_polar_alt"
style="@style/PolarViewText"
android:layout_marginStart="4dp"
android:text="@string/pat_altitude"
app:layout_constraintBottom_toBottomOf="@+id/polar_view_frame"
app:layout_constraintStart_toStartOf="@+id/polar_view_frame" />
app:layout_constraintBottom_toBottomOf="@+id/frame_polar"
app:layout_constraintStart_toStartOf="@+id/frame_polar" />
<TextView
android:id="@+id/polar_range"
android:id="@+id/tv_polar_rng"
style="@style/PolarViewText"
android:layout_marginEnd="4dp"
android:text="@string/pat_range"
app:layout_constraintBottom_toBottomOf="@+id/polar_view_frame"
app:layout_constraintEnd_toEndOf="@+id/polar_view_frame" />
app:layout_constraintBottom_toBottomOf="@+id/frame_polar"
app:layout_constraintEnd_toEndOf="@+id/frame_polar" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/polar_recycler"
android:id="@+id/rec_polar"
android:layout_width="0dp"
android:layout_height="0dp"
android:paddingBottom="4dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/polar_view_frame" />
app:layout_constraintTop_toBottomOf="@+id/frame_polar" />
<TextView
android:id="@+id/polar_no_trans"
android:id="@+id/tv_polar_noTrans"
style="@style/PolarViewText"
android:layout_width="0dp"
android:layout_marginTop="8dp"
@@ -86,5 +86,5 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/polar_view_frame" />
app:layout_constraintTop_toBottomOf="@+id/frame_polar" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -19,7 +19,7 @@
<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_geo"
android:id="@+id/pass_geo_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
@@ -32,7 +32,7 @@
android:layout_height="match_parent">
<ImageView
android:id="@+id/pass_geo_background"
android:id="@+id/pass_geo_bg"
android:layout_width="0dp"
android:layout_height="0dp"
android:contentDescription="@string/placeholder"
@@ -19,7 +19,7 @@
<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"
android:id="@+id/pass_leo_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
@@ -32,7 +32,7 @@
android:layout_height="wrap_content">
<ImageView
android:id="@+id/pass_background"
android:id="@+id/pass_leo_bg"
android:layout_width="0dp"
android:layout_height="0dp"
android:contentDescription="@string/placeholder"
@@ -44,86 +44,86 @@
app:srcCompat="@drawable/card_pass_bg" />
<TextView
android:id="@+id/pass_losAz"
android:id="@+id/pass_leo_losAz"
style="@style/CardPassText"
android:text="@string/pass_los_az"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_maxEl"
app:layout_constraintEnd_toEndOf="@+id/pass_progress"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_maxEl"
app:layout_constraintEnd_toEndOf="@+id/pass_leo_progress"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/pass_maxEl" />
app:layout_constraintStart_toEndOf="@+id/pass_leo_maxEl" />
<TextView
android:id="@+id/pass_satId"
android:id="@+id/pass_leo_satId"
style="@style/CardPassName"
android:layout_marginTop="4dp"
android:text="@string/pass_satId"
app:layout_constraintEnd_toEndOf="@+id/pass_progress"
app:layout_constraintEnd_toEndOf="@+id/pass_leo_progress"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/pass_maxEl"
android:id="@+id/pass_leo_maxEl"
style="@style/CardPassText"
android:layout_marginTop="2dp"
android:text="@string/pass_maxEl"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pass_satId" />
app:layout_constraintTop_toBottomOf="@+id/pass_leo_satId" />
<ImageView
android:id="@+id/pass_img"
android:id="@+id/pass_leo_img"
android:layout_width="20dp"
android:layout_height="20dp"
android:contentDescription="@string/placeholder"
app:layout_constraintBottom_toBottomOf="@+id/pass_satName"
app:layout_constraintStart_toStartOf="@+id/pass_progress"
app:layout_constraintTop_toTopOf="@+id/pass_satName"
app:layout_constraintBottom_toBottomOf="@+id/pass_leo_satName"
app:layout_constraintStart_toStartOf="@+id/pass_leo_progress"
app:layout_constraintTop_toTopOf="@+id/pass_leo_satName"
app:srcCompat="@drawable/ic_pass_inactive" />
<TextView
android:id="@+id/pass_satName"
android:id="@+id/pass_leo_satName"
style="@style/CardPassName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pass_satName"
app:layout_constraintBottom_toBottomOf="@+id/pass_satId"
app:layout_constraintEnd_toStartOf="@+id/pass_satId"
app:layout_constraintBottom_toBottomOf="@+id/pass_leo_satId"
app:layout_constraintEnd_toStartOf="@+id/pass_leo_satId"
app:layout_constraintHorizontal_bias="0.02"
app:layout_constraintStart_toEndOf="@+id/pass_img"
app:layout_constraintTop_toTopOf="@+id/pass_satId" />
app:layout_constraintStart_toEndOf="@+id/pass_leo_img"
app:layout_constraintTop_toTopOf="@+id/pass_leo_satId" />
<TextView
android:id="@+id/pass_aosAz"
android:id="@+id/pass_leo_aosAz"
style="@style/CardPassText"
android:text="@string/pass_aos_az"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_maxEl"
app:layout_constraintEnd_toStartOf="@+id/pass_maxEl"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_maxEl"
app:layout_constraintEnd_toStartOf="@+id/pass_leo_maxEl"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/pass_progress" />
app:layout_constraintStart_toStartOf="@+id/pass_leo_progress" />
<TextView
android:id="@+id/pass_aosTime"
android:id="@+id/pass_leo_aosTime"
style="@style/CardPassText"
android:text="@string/pass_dateTime"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_losTime"
app:layout_constraintEnd_toStartOf="@+id/pass_losTime"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_losTime"
app:layout_constraintEnd_toStartOf="@+id/pass_leo_losTime"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toStartOf="@+id/pass_progress" />
app:layout_constraintStart_toStartOf="@+id/pass_leo_progress" />
<TextView
android:id="@+id/pass_losTime"
android:id="@+id/pass_leo_losTime"
style="@style/CardPassText"
android:layout_marginBottom="4dp"
android:text="@string/pass_dateTime"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/pass_progress"
app:layout_constraintEnd_toEndOf="@+id/pass_leo_progress"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/pass_aosTime"
app:layout_constraintTop_toBottomOf="@+id/pass_progress" />
app:layout_constraintStart_toEndOf="@+id/pass_leo_aosTime"
app:layout_constraintTop_toBottomOf="@+id/pass_leo_progress" />
<ProgressBar
android:id="@+id/pass_progress"
android:id="@+id/pass_leo_progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp"
android:layout_height="14dp"
@@ -131,7 +131,7 @@
android:layout_marginEnd="6dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pass_maxEl" />
app:layout_constraintTop_toBottomOf="@+id/pass_leo_maxEl" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
@@ -18,7 +18,7 @@
-->
<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/sat_entry_item"
android:id="@+id/sat_entry_checkbox"
android:layout_width="match_parent"
android:layout_height="36dp"
android:text="@string/placeholder"
@@ -20,7 +20,7 @@
<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_trans"
android:id="@+id/trans_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"