From d949ba0fd0c44b056dfee0e681aae0ae7c67a880 Mon Sep 17 00:00:00 2001 From: vincent Bourgmayer Date: Wed, 14 Jun 2023 12:29:43 +0200 Subject: [PATCH 01/11] add troubleshooting string & Having some troubles link in custom_preferences layout --- app/src/main/res/layout/custom_preference.xml | 13 +++++++++++++ app/src/main/res/values/strings.xml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/custom_preference.xml b/app/src/main/res/layout/custom_preference.xml index 2ebf0bbbd..d85f3cdc5 100644 --- a/app/src/main/res/layout/custom_preference.xml +++ b/app/src/main/res/layout/custom_preference.xml @@ -24,6 +24,7 @@ android:layout_height="match_parent" android:orientation="vertical"> + + + Some proprietary apps may also have an Open Source version. Whenever this happens App Lounge shows the Open Source version only, in order to avoid duplicates. Downloading… Additional file for %s - + Having some troubles? Update All -- GitLab From 020b8813cc22073f8821b62e4a02ed52b339eea9 Mon Sep 17 00:00:00 2001 From: vincent Bourgmayer Date: Wed, 14 Jun 2023 15:40:35 +0200 Subject: [PATCH 02/11] set onClickListener for troubleshooting link in preferences. But no action yet as target doesn't exist --- .../java/foundation/e/apps/ui/settings/SettingsFragment.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt b/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt index cdff64f52..125e3b3ea 100644 --- a/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt @@ -195,6 +195,10 @@ class SettingsFragment : PreferenceFragmentCompat() { it.findNavController().navigate(R.id.TOSFragment) } + binding.troubleshotLink.setOnClickListener { + //waiting for specification... + } + binding.logout.setOnClickListener { loginViewModel.logout() } -- GitLab From 1d9514e8340cd9c2bcb3f7740a2a140710fdbbe5 Mon Sep 17 00:00:00 2001 From: vincent Bourgmayer Date: Thu, 15 Jun 2023 12:28:34 +0200 Subject: [PATCH 03/11] change layout to let the having troubles be scrolled with other preferences. No onClickListener set yet. --- .../e/apps/ui/settings/SettingsFragment.kt | 11 +++++--- app/src/main/res/layout/custom_preference.xml | 26 +++++-------------- ...ustom_preferences_troubleshooting_link.xml | 23 ++++++++++++++++ app/src/main/res/xml/settings_preferences.xml | 3 +++ 4 files changed, 39 insertions(+), 24 deletions(-) create mode 100644 app/src/main/res/layout/custom_preferences_troubleshooting_link.xml diff --git a/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt b/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt index 125e3b3ea..a662db169 100644 --- a/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt @@ -23,6 +23,8 @@ import android.content.Intent import android.os.Bundle import android.view.View import android.widget.Toast +import androidx.core.view.children +import androidx.core.view.get import androidx.core.view.isVisible import androidx.fragment.app.activityViewModels import androidx.lifecycle.ViewModelProvider @@ -31,6 +33,8 @@ import androidx.preference.CheckBoxPreference import androidx.preference.Preference import androidx.preference.Preference.OnPreferenceChangeListener import androidx.preference.PreferenceFragmentCompat +import androidx.preference.PreferenceScreen +import androidx.preference.get import androidx.work.ExistingPeriodicWorkPolicy import coil.load import com.google.android.material.snackbar.Snackbar @@ -195,10 +199,9 @@ class SettingsFragment : PreferenceFragmentCompat() { it.findNavController().navigate(R.id.TOSFragment) } - binding.troubleshotLink.setOnClickListener { - //waiting for specification... - } - + /*binding.listContainer[R.id.troubleshotLink].setOnClickListener { + Timber.i("POR VINCE: You clicked on troubleshoot") + }*/ binding.logout.setOnClickListener { loginViewModel.logout() } diff --git a/app/src/main/res/layout/custom_preference.xml b/app/src/main/res/layout/custom_preference.xml index d85f3cdc5..5d572237f 100644 --- a/app/src/main/res/layout/custom_preference.xml +++ b/app/src/main/res/layout/custom_preference.xml @@ -116,24 +116,10 @@ - - - - - - - + + + \ No newline at end of file diff --git a/app/src/main/res/layout/custom_preferences_troubleshooting_link.xml b/app/src/main/res/layout/custom_preferences_troubleshooting_link.xml new file mode 100644 index 000000000..a4d2db5c3 --- /dev/null +++ b/app/src/main/res/layout/custom_preferences_troubleshooting_link.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/app/src/main/res/xml/settings_preferences.xml b/app/src/main/res/xml/settings_preferences.xml index 13f2688d1..934ec94f6 100644 --- a/app/src/main/res/xml/settings_preferences.xml +++ b/app/src/main/res/xml/settings_preferences.xml @@ -23,8 +23,11 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:iconSpaceReserved="false"> + Date: Fri, 16 Jun 2023 09:36:07 +0200 Subject: [PATCH 04/11] add intent to open weblink on click on 'having troubles?', change wording and licence header --- ...ustom_preferences_troubleshooting_link.xml | 30 +++++++++++++------ app/src/main/res/values/strings.xml | 2 +- app/src/main/res/xml/settings_preferences.xml | 7 ++++- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/app/src/main/res/layout/custom_preferences_troubleshooting_link.xml b/app/src/main/res/layout/custom_preferences_troubleshooting_link.xml index a4d2db5c3..1bbe1b4f5 100644 --- a/app/src/main/res/layout/custom_preferences_troubleshooting_link.xml +++ b/app/src/main/res/layout/custom_preferences_troubleshooting_link.xml @@ -1,9 +1,22 @@ - - + @@ -11,13 +24,12 @@ android:id="@+id/troubleshotLink" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="32dp" + android:layout_marginTop="16dp" android:layout_marginEnd="16dp" + android:layout_marginBottom="16dp" android:gravity="end" android:text="@string/troubleshooting" android:textColor="@color/colorAccent" android:textSize="15sp" - android:textStyle="bold" - android:clickable="true" - /> - + android:textStyle="bold"/> + \ 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 3caf31e29..edc2d9772 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -125,7 +125,7 @@ Some proprietary apps may also have an Open Source version. Whenever this happens App Lounge shows the Open Source version only, in order to avoid duplicates. Downloading… Additional file for %s - Having some troubles? + Having troubles? Update All diff --git a/app/src/main/res/xml/settings_preferences.xml b/app/src/main/res/xml/settings_preferences.xml index 934ec94f6..25bf60b6f 100644 --- a/app/src/main/res/xml/settings_preferences.xml +++ b/app/src/main/res/xml/settings_preferences.xml @@ -24,7 +24,12 @@ android:layout_height="match_parent" app:iconSpaceReserved="false"> + android:key="@string/troubleshooting" + android:layout="@layout/custom_preferences_troubleshooting_link"> + + Date: Fri, 16 Jun 2023 10:43:58 +0200 Subject: [PATCH 05/11] add Troubleshoot clickable text into error pop up --- .../apps/ui/parentFragment/TimeoutFragment.kt | 25 +++++++++++++++++-- app/src/main/res/layout/dialog_error_log.xml | 14 ++++++++++- app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/settings_preferences.xml | 2 +- 4 files changed, 38 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt b/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt index c1e236c07..07bc78566 100644 --- a/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 MURENA SAS + * Copyright (C) 2019-2023 MURENA SAS * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,6 +17,8 @@ package foundation.e.apps.ui.parentFragment +import android.content.Intent +import android.net.Uri import androidx.annotation.LayoutRes import androidx.appcompat.app.AlertDialog import androidx.core.view.isVisible @@ -219,6 +221,12 @@ abstract class TimeoutFragment(@LayoutRes layoutId: Int) : Fragment(layoutId) { lastDialog = this } } + private fun openTroubleshootPage() { + val troubleshootUrl = getString(R.string.troubleshootURL) + val openUrlIntent = Intent(Intent.ACTION_VIEW) + openUrlIntent.data = Uri.parse(troubleshootUrl) + startActivity(openUrlIntent) + } /** * Call to trigger [onTimeout]. @@ -236,6 +244,10 @@ abstract class TimeoutFragment(@LayoutRes layoutId: Int) : Fragment(layoutId) { moreInfo.isVisible = false } + troubleshotLink.setOnClickListener { + openTroubleshootPage() + } + val logToDisplay = exception.message ?: "" if (logToDisplay.isNotBlank()) { @@ -282,6 +294,10 @@ abstract class TimeoutFragment(@LayoutRes layoutId: Int) : Fragment(layoutId) { moreInfo.isVisible = false } + troubleshotLink.setOnClickListener { + openTroubleshootPage() + } + val logToDisplay = exception.message ?: "" if (logToDisplay.isNotBlank()) { logDisplay.text = logToDisplay @@ -336,6 +352,11 @@ abstract class TimeoutFragment(@LayoutRes layoutId: Int) : Fragment(layoutId) { logDisplay.isVisible = true moreInfo.isVisible = false } + + troubleshotLink.setOnClickListener { + openTroubleshootPage() + } + val logToDisplay = exception.message ?: "" if (logToDisplay.isNotBlank()) { logDisplay.text = logToDisplay @@ -412,4 +433,4 @@ abstract class TimeoutFragment(@LayoutRes layoutId: Int) : Fragment(layoutId) { super.onDestroyView() authObjects.value = null } -} +} \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_error_log.xml b/app/src/main/res/layout/dialog_error_log.xml index e4005d628..ce308b7ea 100644 --- a/app/src/main/res/layout/dialog_error_log.xml +++ b/app/src/main/res/layout/dialog_error_log.xml @@ -1,6 +1,6 @@ Update All diff --git a/app/src/main/res/xml/settings_preferences.xml b/app/src/main/res/xml/settings_preferences.xml index 25bf60b6f..bbc252b8b 100644 --- a/app/src/main/res/xml/settings_preferences.xml +++ b/app/src/main/res/xml/settings_preferences.xml @@ -28,7 +28,7 @@ android:layout="@layout/custom_preferences_troubleshooting_link"> + android:data="@string/troubleshootURL"/> Date: Fri, 16 Jun 2023 10:45:20 +0200 Subject: [PATCH 06/11] rename key associated to 'having troubles?' in String.xml --- .../main/res/layout/custom_preferences_troubleshooting_link.xml | 2 +- app/src/main/res/layout/dialog_error_log.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/xml/settings_preferences.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/layout/custom_preferences_troubleshooting_link.xml b/app/src/main/res/layout/custom_preferences_troubleshooting_link.xml index 1bbe1b4f5..7831da001 100644 --- a/app/src/main/res/layout/custom_preferences_troubleshooting_link.xml +++ b/app/src/main/res/layout/custom_preferences_troubleshooting_link.xml @@ -28,7 +28,7 @@ android:layout_marginEnd="16dp" android:layout_marginBottom="16dp" android:gravity="end" - android:text="@string/troubleshooting" + android:text="@string/having_troubles" android:textColor="@color/colorAccent" android:textSize="15sp" android:textStyle="bold"/> diff --git a/app/src/main/res/layout/dialog_error_log.xml b/app/src/main/res/layout/dialog_error_log.xml index ce308b7ea..0f5b49de6 100644 --- a/app/src/main/res/layout/dialog_error_log.xml +++ b/app/src/main/res/layout/dialog_error_log.xml @@ -41,7 +41,7 @@ android:id="@+id/troubleshotLink" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/troubleshooting" + android:text="@string/having_troubles" android:textColor="@color/colorAccent" android:layout_marginTop="10dp" android:clickable="true" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 34424ec47..58a47efd4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -125,7 +125,7 @@ Some proprietary apps may also have an Open Source version. Whenever this happens App Lounge shows the Open Source version only, in order to avoid duplicates. Downloading… Additional file for %s - Having troubles? + Having troubles? https://doc.e.foundation/support-topics/app_lounge_troubleshooting diff --git a/app/src/main/res/xml/settings_preferences.xml b/app/src/main/res/xml/settings_preferences.xml index bbc252b8b..fb9c61d8a 100644 --- a/app/src/main/res/xml/settings_preferences.xml +++ b/app/src/main/res/xml/settings_preferences.xml @@ -24,7 +24,7 @@ android:layout_height="match_parent" app:iconSpaceReserved="false"> Date: Mon, 19 Jun 2023 12:01:48 +0200 Subject: [PATCH 07/11] change having troubles location in error dialog, when more info is displayed --- app/src/main/res/layout/dialog_error_log.xml | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/res/layout/dialog_error_log.xml b/app/src/main/res/layout/dialog_error_log.xml index 0f5b49de6..5c2f23e14 100644 --- a/app/src/main/res/layout/dialog_error_log.xml +++ b/app/src/main/res/layout/dialog_error_log.xml @@ -37,18 +37,6 @@ android:visibility="gone" /> - - @@ -68,4 +56,16 @@ + + \ No newline at end of file -- GitLab From 2d6f3e78045e4869861ce6e1f06f906ff0ef1479 Mon Sep 17 00:00:00 2001 From: vincent Bourgmayer Date: Mon, 19 Jun 2023 13:04:32 +0200 Subject: [PATCH 08/11] make having troubles 'underlined' --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 58a47efd4..7f8a5a9a0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -125,7 +125,7 @@ Some proprietary apps may also have an Open Source version. Whenever this happens App Lounge shows the Open Source version only, in order to avoid duplicates. Downloading… Additional file for %s - Having troubles? + Having troubles? https://doc.e.foundation/support-topics/app_lounge_troubleshooting -- GitLab From 2e094e9d935eabd2e57c53632abd7b6a7228805d Mon Sep 17 00:00:00 2001 From: vincent Bourgmayer Date: Mon, 19 Jun 2023 13:33:26 +0200 Subject: [PATCH 09/11] fix 'having troubles' underlining' --- .../e/apps/ui/parentFragment/TimeoutFragment.kt | 8 +++++--- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt b/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt index 07bc78566..1e51e7803 100644 --- a/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt @@ -18,7 +18,9 @@ package foundation.e.apps.ui.parentFragment import android.content.Intent +import android.graphics.Paint import android.net.Uri +import android.widget.TextView import androidx.annotation.LayoutRes import androidx.appcompat.app.AlertDialog import androidx.core.view.isVisible @@ -243,7 +245,7 @@ abstract class TimeoutFragment(@LayoutRes layoutId: Int) : Fragment(layoutId) { logDisplay.isVisible = true moreInfo.isVisible = false } - + troubleshotLink.paintFlags = troubleshotLink.paintFlags or Paint.UNDERLINE_TEXT_FLAG troubleshotLink.setOnClickListener { openTroubleshootPage() } @@ -293,7 +295,7 @@ abstract class TimeoutFragment(@LayoutRes layoutId: Int) : Fragment(layoutId) { logDisplay.isVisible = true moreInfo.isVisible = false } - + troubleshotLink.paintFlags = troubleshotLink.paintFlags or Paint.UNDERLINE_TEXT_FLAG troubleshotLink.setOnClickListener { openTroubleshootPage() } @@ -352,7 +354,7 @@ abstract class TimeoutFragment(@LayoutRes layoutId: Int) : Fragment(layoutId) { logDisplay.isVisible = true moreInfo.isVisible = false } - + troubleshotLink.paintFlags = troubleshotLink.paintFlags or Paint.UNDERLINE_TEXT_FLAG troubleshotLink.setOnClickListener { openTroubleshootPage() } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7f8a5a9a0..58a47efd4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -125,7 +125,7 @@ Some proprietary apps may also have an Open Source version. Whenever this happens App Lounge shows the Open Source version only, in order to avoid duplicates. Downloading… Additional file for %s - Having troubles? + Having troubles? https://doc.e.foundation/support-topics/app_lounge_troubleshooting -- GitLab From 9bbb2022ce564b25a071186d6adc4189be5b468d Mon Sep 17 00:00:00 2001 From: vincent Bourgmayer Date: Mon, 19 Jun 2023 14:15:55 +0200 Subject: [PATCH 10/11] fix licence headers, linebreak & unused import --- .../foundation/e/apps/ui/parentFragment/TimeoutFragment.kt | 2 +- app/src/main/res/values/strings.xml | 3 ++- app/src/main/res/xml/settings_preferences.xml | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt b/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt index 1e51e7803..1164d9131 100644 --- a/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt @@ -20,7 +20,6 @@ package foundation.e.apps.ui.parentFragment import android.content.Intent import android.graphics.Paint import android.net.Uri -import android.widget.TextView import androidx.annotation.LayoutRes import androidx.appcompat.app.AlertDialog import androidx.core.view.isVisible @@ -223,6 +222,7 @@ abstract class TimeoutFragment(@LayoutRes layoutId: Int) : Fragment(layoutId) { lastDialog = this } } + private fun openTroubleshootPage() { val troubleshootUrl = getString(R.string.troubleshootURL) val openUrlIntent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 58a47efd4..6a6dfc14a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,7 @@ - - + + + \ No newline at end of file diff --git a/app/src/main/res/layout/custom_preferences_troubleshooting_link.xml b/app/src/main/res/layout/custom_preferences_troubleshooting_link.xml index 7831da001..b8f85dce5 100644 --- a/app/src/main/res/layout/custom_preferences_troubleshooting_link.xml +++ b/app/src/main/res/layout/custom_preferences_troubleshooting_link.xml @@ -21,7 +21,7 @@ android:layout_height="wrap_content" android:orientation="horizontal">