Skip to content

Commit

Permalink
Return to message list upon "Mark as unread"
Browse files Browse the repository at this point in the history
  • Loading branch information
gitstart committed Aug 24, 2023
1 parent cbf480d commit f068f7d
Show file tree
Hide file tree
Showing 5 changed files with 113 additions and 92 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,7 @@ class MessageViewFragment :
}

fun onToggleRead() {
fragmentListener.showNextMessageOrReturn()
toggleFlag(Flag.SEEN)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ class GeneralSettingsDataStore(
"messageview_autofit_width" -> K9.isAutoFitWidth
"messageview_return_to_list" -> K9.isMessageViewReturnToList
"messageview_show_next" -> K9.isMessageViewShowNext
"messageview_return_to_list_after_unread" -> K9.isMessageViewReturnToList
"messageview_show_next_after_unread" -> K9.isMessageViewShowNext
"quiet_time_enabled" -> K9.isQuietTimeEnabled
"disable_notifications_during_quiet_time" -> !K9.isNotificationDuringQuietTimeEnabled
"privacy_hide_useragent" -> K9.isHideUserAgent
Expand Down Expand Up @@ -69,6 +71,8 @@ class GeneralSettingsDataStore(
"messageview_autofit_width" -> K9.isAutoFitWidth = value
"messageview_return_to_list" -> K9.isMessageViewReturnToList = value
"messageview_show_next" -> K9.isMessageViewShowNext = value
"messageview_return_to_list_after_unread" -> K9.isMessageViewReturnToList = value
"messageview_show_next_after_unread" -> K9.isMessageViewShowNext = value
"quiet_time_enabled" -> K9.isQuietTimeEnabled = value
"disable_notifications_during_quiet_time" -> K9.isNotificationDuringQuietTimeEnabled = !value
"privacy_hide_useragent" -> K9.isHideUserAgent = value
Expand Down
4 changes: 4 additions & 0 deletions app/ui/legacy/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,10 @@ Please submit bug reports, contribute new features and ask questions at
<string name="global_settings_messageview_return_to_list_summary">Return to message list after message deletion</string>
<string name="global_settings_messageview_show_next_label">Show next message after delete</string>
<string name="global_settings_messageview_show_next_summary">Show next message by default after message deletion</string>
<string name="global_settings_messageview_return_to_list_label_after_unread">Return to list after message is marked as unread</string>
<string name="global_settings_messageview_return_to_list_after_unread_summary">Return to message list after message is marked as unread</string>
<string name="global_settings_messageview_show_next_label_after_unread">Show next message after message is marked as unread</string>
<string name="global_settings_messageview_show_next_after_unread_summary">Show next message by default after message is marked as unread</string>

<string name="global_settings_confirm_actions_title">Confirm actions</string>
<string name="global_settings_confirm_actions_summary">Show a dialog whenever you perform selected actions</string>
Expand Down
12 changes: 12 additions & 0 deletions app/ui/legacy/src/main/res/xml/general_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,18 @@
android:summary="@string/global_settings_messageview_show_next_summary"
android:title="@string/global_settings_messageview_show_next_label" />

<CheckBoxPreference
android:disableDependentsState="true"
android:key="messageview_return_to_list_after_unread"
android:summary="@string/global_settings_messageview_return_to_list_after_unread_summary"
android:title="@string/global_settings_messageview_return_to_list_label_after_unread" />

<CheckBoxPreference
android:dependency="messageview_return_to_list_after_unread"
android:key="messageview_show_next_after_unread"
android:summary="@string/global_settings_messageview_show_next_after_unread_summary"
android:title="@string/global_settings_messageview_show_next_label_after_unread" />

<MultiSelectListPreference
android:dialogTitle="@string/global_settings_confirm_actions_title"
android:entries="@array/confirm_action_entries"
Expand Down
184 changes: 92 additions & 92 deletions gradlew.bat
Original file line number Diff line number Diff line change
@@ -1,92 +1,92 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega

0 comments on commit f068f7d

Please sign in to comment.