Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,14 @@ class CameraFragment : Fragment() {
intent.extras?.getParcelable<CamEngine.Companion.DataQuick>("dataQuick")?.apply {
activity?.runOnUiThread(Runnable {
// Stuff that updates the UI
fragmentCameraBinding.qualFeedback?.text =
" " + this.rateKbs + "kB/sec"
fragmentCameraBinding.ftFeedback?.text =
" " + this.ms + "ms"
fragmentCameraBinding.qualFeedback?.let {
it.text = " $rateKbs kB/sec"
it.contentDescription = context.getString(R.string.bitrate_desc, rateKbs)
}
fragmentCameraBinding.ftFeedback?.let {
it.text = " $ms ms"
it.contentDescription = context.getString(R.string.frame_time_desc, ms)
}
})

}
Expand Down
11 changes: 4 additions & 7 deletions app/src/main/res/layout/fragment_camera.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:layout_weight="1" />
android:layout_weight="1"
android:tooltipText="@string/frame_time_tooltip" />

<Button
android:id="@+id/buttonKill"
Expand All @@ -101,7 +102,6 @@
android:layout_marginTop="0pt"
android:layout_marginBottom="4pt"
android:background="#FFAA00"
android:importantForAccessibility="no"
android:paddingTop="5pt" />

</TableRow>
Expand Down Expand Up @@ -158,7 +158,6 @@
android:layout_height="wrap_content"
android:labelFor="@+id/spinnerEncoding"
android:text="@string/encoding_label"
android:labelFor="@+id/spinnerEncoding"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />

<Spinner
Expand All @@ -182,7 +181,6 @@
android:layout_height="wrap_content"
android:labelFor="@+id/spinnerCam"
android:text="@string/sensor_label"
android:labelFor="@+id/spinnerCam"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />

<Spinner
Expand All @@ -205,7 +203,6 @@
android:layout_height="wrap_content"
android:labelFor="@+id/spinnerRes"
android:text="@string/resolution_label"
android:labelFor="@+id/spinnerRes"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />

<Spinner
Expand All @@ -230,7 +227,6 @@
android:layout_gravity="center_vertical"
android:labelFor="@+id/spinnerQua"
android:text="@string/quality_label"
android:labelFor="@+id/spinnerQua"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />

<LinearLayout
Expand All @@ -249,7 +245,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/colorPrimary"
android:textSize="12sp" />
android:textSize="12sp"
android:tooltipText="@string/bitrate_tooltip" />
</LinearLayout>

</TableRow>
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,10 @@
<string name="stop_confirmation_message">This will stop the camera stream and close the application.</string>
<string name="stop_confirmation_positive">Stop</string>
<string name="stop_confirmation_negative">Cancel</string>

<!-- Feedback Tooltips and Content Descriptions -->
<string name="frame_time_tooltip">Frame latency</string>
<string name="bitrate_tooltip">Data transfer rate</string>
<string name="frame_time_desc">%1$d milliseconds latency</string>
<string name="bitrate_desc">%1$d kilobytes per second</string>
</resources>