From ad48e9a901aa488e6f73bbd32d9f25e3e9bc0363 Mon Sep 17 00:00:00 2001
From: Anton Weber <anton@antweb.me>
Date: Thu, 22 Aug 2019 15:05:51 +0200
Subject: [PATCH] Implement manual set time button.
---
.../events/badge/card10/main/MainFragment.kt | 9 ++++
.../badge/card10/time/TimeUpdateDialog.kt | 42 +++++++++++++++++++
app/src/main/res/layout/main_fragment.xml | 10 +++++
.../main/res/layout/time_update_dialog.xml | 19 +++++++++
app/src/main/res/values/strings.xml | 3 ++
5 files changed, 83 insertions(+)
create mode 100644 app/src/main/java/de/ccc/events/badge/card10/time/TimeUpdateDialog.kt
create mode 100644 app/src/main/res/layout/time_update_dialog.xml
diff --git a/app/src/main/java/de/ccc/events/badge/card10/main/MainFragment.kt b/app/src/main/java/de/ccc/events/badge/card10/main/MainFragment.kt
index f9a429f..b9af4e1 100644
--- a/app/src/main/java/de/ccc/events/badge/card10/main/MainFragment.kt
+++ b/app/src/main/java/de/ccc/events/badge/card10/main/MainFragment.kt
@@ -29,6 +29,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.Button
import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.fragment.app.DialogFragment
import androidx.fragment.app.Fragment
import de.ccc.events.badge.card10.CARD10_BLUETOOTH_MAC_PREFIX
import de.ccc.events.badge.card10.R
@@ -38,6 +39,7 @@ import de.ccc.events.badge.card10.hatchery.AppListFragment
import de.ccc.events.badge.card10.mood.MoodFragment
import de.ccc.events.badge.card10.scanner.ScannerFragment
import de.ccc.events.badge.card10.sparkle.BeautifulFragment
+import de.ccc.events.badge.card10.time.TimeUpdateDialog
import kotlinx.android.synthetic.main.main_fragment.*
class MainFragment : Fragment() {
@@ -53,6 +55,13 @@ class MainFragment : Fragment() {
button_hatchery.setOnClickListener { startFragment(AppListFragment()) }
button_send.setOnClickListener { startFragment(FileTransferFragment()) }
+ button_set_time.setOnClickListener {
+ val dialogFragment = TimeUpdateDialog()
+ dialogFragment.show(fragmentManager, "time")
+ dialogFragment.setTime()
+ dialogFragment.dismiss()
+ }
+
val bondedCard10s =
bluetoothAdapter.bondedDevices.filter { it.address.startsWith(CARD10_BLUETOOTH_MAC_PREFIX, true) }
diff --git a/app/src/main/java/de/ccc/events/badge/card10/time/TimeUpdateDialog.kt b/app/src/main/java/de/ccc/events/badge/card10/time/TimeUpdateDialog.kt
new file mode 100644
index 0000000..dbc488d
--- /dev/null
+++ b/app/src/main/java/de/ccc/events/badge/card10/time/TimeUpdateDialog.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright by the original author or authors.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package de.ccc.events.badge.card10.time
+
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.fragment.app.DialogFragment
+import de.ccc.events.badge.card10.R
+import de.ccc.events.badge.card10.common.ConnectionService
+
+private const val TAG = "TimeUpdateDialog"
+
+class TimeUpdateDialog : DialogFragment() {
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?) =
+ inflater.inflate(R.layout.time_update_dialog, container, false)
+
+ fun setTime() {
+ ConnectionService.card10Service?.setTime() ?: Log.e(TAG, "card10 service not initialized")
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/main_fragment.xml b/app/src/main/res/layout/main_fragment.xml
index 5151484..dee6ca2 100644
--- a/app/src/main/res/layout/main_fragment.xml
+++ b/app/src/main/res/layout/main_fragment.xml
@@ -85,6 +85,16 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"/>
+ <Button android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/main_button_margin"
+ style="@style/MainButton"
+ android:id="@+id/button_set_time"
+ android:text="@string/main_button_set_time"
+ app:layout_constraintTop_toBottomOf="@+id/button_beautiful"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toRightOf="parent"/>
+
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/time_update_dialog.xml b/app/src/main/res/layout/time_update_dialog.xml
new file mode 100644
index 0000000..89eb708
--- /dev/null
+++ b/app/src/main/res/layout/time_update_dialog.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="@dimen/dialog_padding">
+
+ <ProgressBar android:layout_width="@dimen/progress_dialog_progress_size"
+ android:layout_height="@dimen/progress_dialog_progress_size"
+ android:layout_gravity="center"
+ android:indeterminate="true"/>
+
+ <TextView android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_marginTop="@dimen/progress_dialog_text_margin"
+ android:text="@string/time_update_dialog_setting"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 87c8728..c9daf48 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,6 +10,7 @@
<string name="main_button_send_file">Send File</string>
<string name="main_button_mood">Change Mood</string>
<string name="main_button_beautiful">Beautiful</string>
+ <string name="main_button_set_time">Set Time</string>
<string name="file_transfer_button_pick_file">Select file</string>
<string name="file_transfer_button_start_transfer">Start</string>
@@ -32,6 +33,8 @@
<string name="dialog_action_ok">OK</string>
<string name="dialog_action_cancel">Cancel</string>
+ <string name="time_update_dialog_setting">Setting time</string>
+
<string name="hatchery_error_generic">Something went wrong</string>
<string name="app_detail_downloads">Downloads: %1$d</string>
--
GitLab