mobi/e-ntfy-android
1
0
Fork 0
Code Pull requests Activity

Add foreground description textview in add dialog

Browse source
This commit is contained in:
Philipp Heckel 2022-02-15 19:56:49 -05:00
parent 1d916de81e
commit 3ea762b5d1
3 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/io/heckel/ntfy/ui/AddFragment.kt
View file

@ -46,6 +46,7 @@ class AddFragment : DialogFragment() {
private lateinit var subscribeInstantDeliveryBox: View private lateinit var subscribeInstantDeliveryBox: View
private lateinit var subscribeInstantDeliveryCheckbox: CheckBox private lateinit var subscribeInstantDeliveryCheckbox: CheckBox
private lateinit var subscribeInstantDeliveryDescription: View private lateinit var subscribeInstantDeliveryDescription: View
private lateinit var subscribeForegroundDescription: TextView
private lateinit var subscribeProgress: ProgressBar private lateinit var subscribeProgress: ProgressBar
private lateinit var subscribeErrorText: TextView private lateinit var subscribeErrorText: TextView
private lateinit var subscribeErrorTextImage: View private lateinit var subscribeErrorTextImage: View
@ -98,6 +99,7 @@ class AddFragment : DialogFragment() {
subscribeInstantDeliveryDescription = view.findViewById(R.id.add_dialog_subscribe_instant_delivery_description) subscribeInstantDeliveryDescription = view.findViewById(R.id.add_dialog_subscribe_instant_delivery_description)
subscribeUseAnotherServerCheckbox = view.findViewById(R.id.add_dialog_subscribe_use_another_server_checkbox) subscribeUseAnotherServerCheckbox = view.findViewById(R.id.add_dialog_subscribe_use_another_server_checkbox)
subscribeUseAnotherServerDescription = view.findViewById(R.id.add_dialog_subscribe_use_another_server_description) subscribeUseAnotherServerDescription = view.findViewById(R.id.add_dialog_subscribe_use_another_server_description)
subscribeForegroundDescription = view.findViewById(R.id.add_dialog_subscribe_foreground_description)
subscribeProgress = view.findViewById(R.id.add_dialog_subscribe_progress) subscribeProgress = view.findViewById(R.id.add_dialog_subscribe_progress)
subscribeErrorText = view.findViewById(R.id.add_dialog_subscribe_error_text) subscribeErrorText = view.findViewById(R.id.add_dialog_subscribe_error_text)
subscribeErrorText.visibility = View.GONE subscribeErrorText.visibility = View.GONE
@ -111,12 +113,8 @@ class AddFragment : DialogFragment() {
loginErrorText = view.findViewById(R.id.add_dialog_login_error_text) loginErrorText = view.findViewById(R.id.add_dialog_login_error_text)
loginErrorTextImage = view.findViewById(R.id.add_dialog_login_error_text_image) loginErrorTextImage = view.findViewById(R.id.add_dialog_login_error_text_image)
// Set "Use another server" description based on flavor // Set foreground description text
subscribeUseAnotherServerDescription.text = if (BuildConfig.FIREBASE_AVAILABLE) { subscribeForegroundDescription.text = getString(R.string.add_dialog_foreground_description, shortUrl(appBaseUrl))
getString(R.string.add_dialog_use_another_server_description)
} else {
getString(R.string.add_dialog_use_another_server_description_noinstant)
}
// Show/hide based on flavor // Show/hide based on flavor
subscribeInstantDeliveryBox.visibility = instantCheckboxVisible() subscribeInstantDeliveryBox.visibility = instantCheckboxVisible()
@ -209,6 +207,7 @@ class AddFragment : DialogFragment() {
validateInputSubscribeView() validateInputSubscribeView()
} }
subscribeInstantDeliveryBox.visibility = instantCheckboxVisible() subscribeInstantDeliveryBox.visibility = instantCheckboxVisible()
subscribeForegroundDescription.visibility = if (!BuildConfig.FIREBASE_AVAILABLE || subscribeInstantDeliveryBox.visibility == View.VISIBLE) View.GONE else View.VISIBLE
// Focus topic text (keyboard is shown too, see above) // Focus topic text (keyboard is shown too, see above)
subscribeTopicText.requestFocus() subscribeTopicText.requestFocus()
@ -346,6 +345,7 @@ class AddFragment : DialogFragment() {
} }
subscribeInstantDeliveryBox.visibility = instantCheckboxVisible() subscribeInstantDeliveryBox.visibility = instantCheckboxVisible()
subscribeInstantDeliveryDescription.visibility = if (subscribeInstantDeliveryBox.visibility == View.VISIBLE && subscribeInstantDeliveryCheckbox.isChecked) View.VISIBLE else View.GONE subscribeInstantDeliveryDescription.visibility = if (subscribeInstantDeliveryBox.visibility == View.VISIBLE && subscribeInstantDeliveryCheckbox.isChecked) View.VISIBLE else View.GONE
subscribeForegroundDescription.visibility = if (!BuildConfig.FIREBASE_AVAILABLE || subscribeInstantDeliveryBox.visibility == View.VISIBLE) View.GONE else View.VISIBLE
} }
} }
} }

37
app/src/main/res/layout/fragment_add_dialog.xml
View file

@ -42,7 +42,7 @@
android:paddingStart="4dp" android:paddingTop="3dp" app:layout_constraintStart_toStartOf="parent" android:paddingStart="4dp" android:paddingTop="3dp" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/add_dialog_subscribe_title"/> app:layout_constraintTop_toBottomOf="@id/add_dialog_subscribe_title"/>
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/add_dialog_subscribe_topic_text" android:id="@+id/add_dialog_subscribe_topic_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:hint="@string/add_dialog_topic_name_hint" android:layout_height="wrap_content" android:hint="@string/add_dialog_topic_name_hint"
@ -88,7 +88,7 @@
android:hint="@string/app_base_url" android:hint="@string/app_base_url"
android:maxLines="1" android:maxLines="1"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:layout_marginBottom="15dp" android:layout_marginBottom="10dp"
android:inputType="textNoSuggestions" android:inputType="textNoSuggestions"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingEnd="0dp" android:paddingEnd="0dp"
@ -128,24 +128,31 @@
android:visibility="gone" app:layout_constraintStart_toStartOf="parent" android:visibility="gone" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/add_dialog_subscribe_instant_delivery_box"/> app:layout_constraintTop_toBottomOf="@id/add_dialog_subscribe_instant_delivery_box"/>
<ImageView <TextView
android:text="@string/add_dialog_foreground_description"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:id="@+id/add_dialog_subscribe_foreground_description"
android:paddingStart="4dp" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/add_dialog_subscribe_instant_delivery_description"/>
<ImageView
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" app:srcCompat="@drawable/ic_error_red_24dp" android:layout_height="20dp" app:srcCompat="@drawable/ic_error_red_24dp"
android:id="@+id/add_dialog_subscribe_error_text_image" android:id="@+id/add_dialog_subscribe_error_text_image"
android:visibility="gone" android:visibility="gone"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/add_dialog_subscribe_error_text" android:layout_marginTop="1dp"/> app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/add_dialog_subscribe_error_text" android:layout_marginTop="1dp"/>
<TextView <TextView
android:text="Unable to resolve host example.com" android:text="Unable to resolve host example.com"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:id="@+id/add_dialog_subscribe_error_text" android:layout_height="wrap_content" android:id="@+id/add_dialog_subscribe_error_text"
android:paddingStart="4dp" android:paddingStart="4dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/add_dialog_subscribe_instant_delivery_description" app:layout_constraintTop_toBottomOf="@id/add_dialog_subscribe_foreground_description"
android:paddingEnd="4dp" android:paddingEnd="4dp"
android:textAppearance="@style/DangerText" android:textAppearance="@style/DangerText"
app:layout_constraintStart_toEndOf="@id/add_dialog_subscribe_error_text_image" app:layout_constraintStart_toEndOf="@id/add_dialog_subscribe_error_text_image"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
tools:visibility="gone"/> tools:visibility="gone"/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView> </ScrollView>
<ScrollView <ScrollView

13
app/src/main/res/values/strings.xml
View file

@ -81,17 +81,10 @@
</string> </string>
<string name="add_dialog_topic_name_hint">Topic name, e.g. phils_alerts</string> <string name="add_dialog_topic_name_hint">Topic name, e.g. phils_alerts</string>
<string name="add_dialog_use_another_server">Use another server</string> <string name="add_dialog_use_another_server">Use another server</string>
<string name="add_dialog_use_another_server_description"> <string name="add_dialog_use_another_server_description">You can subscribe to topics from another server. Type the server URL below.</string>
You can subscribe to topics from another server. This option requires a foreground service.
</string>
<string name="add_dialog_use_another_server_description_noinstant">
You can subscribe to topics from another server. Type the server URL below.
</string>
<string name="add_dialog_instant_delivery">Instant delivery in doze mode</string> <string name="add_dialog_instant_delivery">Instant delivery in doze mode</string>
<string name="add_dialog_instant_delivery_description"> <string name="add_dialog_instant_delivery_description">Ensures that messages are immediately delivered, even if the device is inactive.</string>
Ensures that messages are immediately delivered, even if the device is inactive. <string name="add_dialog_foreground_description">Instant delivery is always enabled for hosts other than %1$s.</string>
This requires a foreground service.
</string>
<string name="add_dialog_button_cancel">Cancel</string> <string name="add_dialog_button_cancel">Cancel</string>
<string name="add_dialog_button_subscribe">Subscribe</string> <string name="add_dialog_button_subscribe">Subscribe</string>
<string name="add_dialog_button_back">Back</string> <string name="add_dialog_button_back">Back</string>