Disable auto trim for most settings fields. Added some advice and a TODO in README.md

Author: RandomModderJDK

README.md

@@ -4,7 +4,8 @@
 
 Manage your homework, with untis and discord support.
 
-You can take/import pictures and assign them to a homework. Sharing/Synchronization of homework is also possible.
+You can take/import pictures and assign them to a homework. Sharing/Synchronization of homework is
+also possible.
 
 ### Untis
 
@@ -16,49 +17,65 @@ And secondly, for QOL, it can import the subjects you are going to have in the n
 
 ### Discord
 
-You can use a combination of a bot and webhooks to achieve regulated homework ex-/import. The discord bot must have read message permissions for the channels, that could be used for homeworks. Furthermore, he should be member of only one guild.
+You can use a combination of a bot and webhooks to achieve regulated homework ex-/import. The
+discord bot must have read message permissions for the channels, that could be used for homeworks.
+Furthermore, he should be member of only one guild.
 
 You can "export"(send) your homework easily, by:
+
 1. Creating and assigning a subject
 2. Specifying a bot (token)
 3. Creating a discord relation, this must be assigned to the target channel to support import
 4. Specifying the webhook url for the given channel
 5. Clicking send on the homework
 
+If the discord relations are configured, you can just click on the fetch icon in the upper right
+corner of the home screen. This may overwrite local changes, so be careful.
+
+## TODO
 
-If the discord relations are configured, you can just click on the fetch icon in the upper right corner of the home screen. This may overwrite local changes, so be careful.
+- [ ] Qrcode generator to share webhooks and bot token
 
 ## Getting Started / Installation
+
 <details open>
 <summary><h3 style="display:inline-block">An online(ish) app is enough for me </h3></summary>
 
-> <b>BE WARNED: If you use the app with a bot token on the web, you are sending your token to a CORS proxy that redirects it to discord. Someone (in this case Cloudflare) could sniff your token. Unfortunately a CORS proxy is needed on the web, because discord does not send adequate CORS.</b>
+> <b>BE WARNED: If you use the app with a bot token on the web, you are sending your token to a CORS
+> proxy that redirects it to discord. Someone (in this case Cloudflare) could sniff your token.
+> Unfortunately a CORS proxy is needed on the web, because discord does not send adequate CORS.</b>
 
-If you took notice of this warning, you can just open the GitHub Pages app: [https://randommodderjdk.github.io/hw_manager_flutter](https://randommodderjdk.github.io/hw_manager_flutter)
+If you took notice of this warning, you can just open the GitHub Pages
+app: [https://randommodderjdk.github.io/hw_manager_flutter](https://randommodderjdk.github.io/hw_manager_flutter)
 
 <details> <summary><h4 style="display:inline-block">iOS / iPadOS web app</h4></summary>
 You have two options to add the website (always needs internet connection):
 
-> ##### 1. Use Safari's "Add to Homescreen": 
-> Go to the website above and click on the share icon. There click on "Add to home screen", type in a name and submit.
+> ##### 1. Use Safari's "Add to Homescreen":
+> Go to the website above and click on the share icon. There click on "Add to home screen", type in
+> a name and submit.
 
 > ##### 2. Use a profile (WebClip)
-> Go to [https://ivi.cx/](https://ivi.cx/) and enter the details you want. You can use for example the asset provided in this repository as an icon. 
+> Go to [https://ivi.cx/](https://ivi.cx/) and enter the details you want. You can use for example
+> the asset provided in this repository as an icon.
 
 </details>
 
 <details> <summary><h4 style="display:inline-block">Android homescreen app</h4></summary>
 Use your browser to create a web app on android. Search for "Add Shortcut" or anything similar.
 
-This is like the native app (except the security), especially when the browser caches it. Tested with Chromium-based browsers and firefox. 
+This is like the native app (except the security), especially when the browser caches it. Tested
+with Chromium-based browsers and firefox.
 
 </details>
 </details>
-<details open><summary><h3 style="display:inline-block">I prefer the native app</h3></summary>
+<details open><summary><h3 style="display:inline-block">I prefer the native app [recommended]</h3></summary>
 
-**If you are on android** and go ahead to releases and download your arch.
+**If you are on android**, go ahead to releases and download your arch.
 
-**If you are on ios**, download the ipa (native app) in the releases, if you know how to install it. This is not really signed. I would recommend Alt-/Troll-/Sidestore. When Apple allows apps to finally be installed like on android, then do it that way.
+**If you are on ios**, download the ipa (native app) in the releases, if you know how to install it.
+This is not really signed. I would recommend Alt-/Sidestore. When Apple allows apps to
+finally be installed like on android, then do it that way.
 
 **If you'd like any other platform**:
 Clone this repo, (add your platform,), build HWM (and maybe contribute a GitHub action) yourself.

lib/routes/settings_route.dart

@@ -68,7 +68,8 @@ class SettingsRoute extends StatelessWidget {
  backgroundColor: Colors.transparent,
  boxShadow: const [],
  centralizeFirstChild: false,
- arrowWidget: const Icon(Icons.keyboard_arrow_up_rounded, size: 40.0),
+ arrowWidget:
+ const Icon(Icons.keyboard_arrow_up_rounded, size: 40.0),
  firstChild: Expanded(
  child: Align(
  alignment: Alignment.centerLeft,
@@ -86,6 +87,7 @@ class SettingsRoute extends StatelessWidget {
  hintText: context.locals.settingsUntisLoginServerHint,
  initValue: Preferences.getUntisServer(),
  onChanged: (s) => Preferences.saveUntisServer(s ?? ""),
+ autoTrim: true,
  ),
  const SizedBox(height: 10),
  SettingsTextFormField(
@@ -99,15 +101,17 @@ class SettingsRoute extends StatelessWidget {
  labelText: context.locals.settingsUntisLoginUsername,
  hintText: context.locals.settingsUntisLoginUsernameHint,
  initValue: Preferences.getUntisUsername(),
- onChanged: (s) => Preferences.saveUntisUsername(s ?? ""),
+ onChanged: (s) =>
+ Preferences.saveUntisUsername(s ?? ""),
  ),
  const SizedBox(height: 10),
  SettingsTextFormField(
  passwordStyle: true,
  labelText: context.locals.settingsUntisLoginPassword,
  hintText: context.locals.settingsUntisLoginPasswordHint,
  initValue: Preferences.getUntisPassword(),
- onChanged: (s) => Preferences.saveUntisPassword(s ?? ""),
+ onChanged: (s) =>
+ Preferences.saveUntisPassword(s ?? ""),
  ),
  ],
  ),
@@ -116,16 +120,20 @@ class SettingsRoute extends StatelessWidget {
  HWMSettingsTile(
  title: Text(context.locals.settingsUntisTestLoginTitle),
  leading: const Icon(Icons.task_alt_rounded),
- description: Text(context.locals.settingsUntisTestLoginDescription),
- onPressed: (context) async => UntisHelper().loginWithPreferences().then(
- (success) =>
- success ? untisConfirmation(locals.untisLoginSuccess) : untisError(locals.untisLoginFailure),
- ),
+ description:
+ Text(context.locals.settingsUntisTestLoginDescription),
+ onPressed: (context) async =>
+ UntisHelper().loginWithPreferences().then(
+ (success) => success
+ ? untisConfirmation(locals.untisLoginSuccess)
+ : untisError(locals.untisLoginFailure),
+ ),
  ),
  HWMSettingsTile(
  title: Text(context.locals.settingsUntisImportTitle),
  leading: const Icon(Icons.cloud_download_outlined),
- description: Text(context.locals.settingsUntisImportDescription),
+ description:
+ Text(context.locals.settingsUntisImportDescription),
  onPressed: (context) async {
  final List<UntisSubject> subjects;
  try {
@@ -171,36 +179,55 @@ class SettingsRoute extends StatelessWidget {
  HWMSettingsTile(
  title: SettingsTextFormField(
  labelText: context.locals.settingsDiscordRelationsBotToken,
- hintText: "OPdhu29hawopuhnUOUWE9awofhou.awdawdh34WDGGHH-Wawdsghj",
+ hintText:
+ "OPdhu29hawopuhnUOUWE9awofhou.awdawdh34WDGGHH-Wawdsghj",
  initValue: Preferences.getDiscordToken(),
- onChanged: (s) async => Preferences.saveDiscordToken(s ?? ""),
+ onChanged: (s) => Preferences.saveDiscordToken(s ?? ""),
+ autoTrim: true,
  onDeactivate: () async {
  final String token = await Preferences.getDiscordToken();
  if (DiscordHelper().tokenEqualsTo(token)) return;
- discordStatusUpdate(locals.settingsDiscordRelationsBotTryToken);
- final bool successfulLogin = await DiscordHelper().login(token);
- final bool successfulGuildRefresh = await DiscordHelper().refreshGuildCache();
- final bool successfulChannelRefresh = await DiscordHelper().refreshChannelCache();
- if (successfulLogin && successfulGuildRefresh && successfulChannelRefresh) {
- discordConfirmation(locals.settingsDiscordRelationsBotTryTokenSuccess);
+ discordStatusUpdate(
+ locals.settingsDiscordRelationsBotTryToken);
+ final bool successfulLogin =
+ await DiscordHelper().login(token);
+ final bool successfulGuildRefresh =
+ await DiscordHelper().refreshGuildCache();
+ final bool successfulChannelRefresh =
+ await DiscordHelper().refreshChannelCache();
+ if (successfulLogin &&
+ successfulGuildRefresh &&
+ successfulChannelRefresh) {
+ discordConfirmation(
+ locals.settingsDiscordRelationsBotTryTokenSuccess);
  } else {
- discordError(locals.settingsDiscordRelationsBotTryTokenFailure);
+ discordError(
+ locals.settingsDiscordRelationsBotTryTokenFailure);
  }
  },
  onEnter: (s) {
  Preferences.getDiscordToken().then((token) async {
  if (!DiscordHelper().tokenEqualsTo(token)) {
- discordStatusUpdate(locals.settingsDiscordRelationsBotTryToken);
+ discordStatusUpdate(
+ locals.settingsDiscordRelationsBotTryToken);
  }
- if (!DiscordHelper().tokenEqualsTo(token) || DiscordHelper().tokenEqualsTo(null)) {
- final bool successfulLogin = await DiscordHelper().login(token);
- final bool successfulGuildRefresh = await DiscordHelper().refreshGuildCache();
- final bool successfulChannelRefresh = await DiscordHelper().refreshChannelCache();
- if (!(successfulLogin && successfulGuildRefresh && successfulChannelRefresh)) {
- discordError(locals.settingsDiscordRelationsBotTryTokenFailure);
+ if (!DiscordHelper().tokenEqualsTo(token) ||
+ DiscordHelper().tokenEqualsTo(null)) {
+ final bool successfulLogin =
+ await DiscordHelper().login(token);
+ final bool successfulGuildRefresh =
+ await DiscordHelper().refreshGuildCache();
+ final bool successfulChannelRefresh =
+ await DiscordHelper().refreshChannelCache();
+ if (!(successfulLogin &&
+ successfulGuildRefresh &&
+ successfulChannelRefresh)) {
+ discordError(locals
+ .settingsDiscordRelationsBotTryTokenFailure);
  return null;
  }
- discordConfirmation(locals.settingsDiscordRelationsBotTryTokenSuccess);
+ discordConfirmation(
+ locals.settingsDiscordRelationsBotTryTokenSuccess);
  DiscordHelper().loggedInNotifier.notifyListeners();
  }
  });
@@ -247,18 +274,29 @@ class SettingsRoute extends StatelessWidget {
  onPressed: (context) async {
  final String token = await Preferences.getDiscordToken();
  if (!DiscordHelper().tokenEqualsTo(token)) {
- discordStatusUpdate(locals.settingsDiscordRelationsBotTryToken);
- final bool successfulLogin = await DiscordHelper().login(token);
- final bool successfulGuildRefresh = await DiscordHelper().refreshGuildCache();
- final bool successfulChannelRefresh = await DiscordHelper().refreshChannelCache();
- if (!(successfulLogin && successfulGuildRefresh && successfulChannelRefresh)) {
- discordError(locals.settingsDiscordRelationsBotTryTokenFailure);
+ discordStatusUpdate(
+ locals.settingsDiscordRelationsBotTryToken);
+ final bool successfulLogin =
+ await DiscordHelper().login(token);
+ final bool successfulGuildRefresh =
+ await DiscordHelper().refreshGuildCache();
+ final bool successfulChannelRefresh =
+ await DiscordHelper().refreshChannelCache();
+ if (!(successfulLogin &&
+ successfulGuildRefresh &&
+ successfulChannelRefresh)) {
+ discordError(
+ locals.settingsDiscordRelationsBotTryTokenFailure);
  return;
  }
  }
- final List<DiscordRelation> relations = await DBHelper.retrieveDiscordRelations();
- final Iterable<GuildChannel>? channels = (await DiscordHelper().channels)?.where(
- (c) => !relations.map((r) => r.channelID).contains(c.id.value.toString()),
+ final List<DiscordRelation> relations =
+ await DBHelper.retrieveDiscordRelations();
+ final Iterable<GuildChannel>? channels =
+ (await DiscordHelper().channels)?.where(
+ (c) => !relations
+ .map((r) => r.channelID)
+ .contains(c.id.value.toString()),
  );
  if (channels == null) {
  discordError(locals.settingsDiscordRelationsImportFailure);
@@ -271,11 +309,13 @@ class SettingsRoute extends StatelessWidget {
  channelID: c.id.value.toString(),
  channelName: c.name,
  );
- if (kDebugMode) print("Added channel ${c.name} ${c.id.value}");
+ if (kDebugMode)
+ print("Added channel ${c.name} ${c.id.value}");
  DBHelper.insertDiscordRelation(dr);
  count++;
  }
- discordConfirmation(locals.settingsDiscordRelationsImportSuccess(count));
+ discordConfirmation(
+ locals.settingsDiscordRelationsImportSuccess(count));
  },
  leading: const Icon(Icons.cloud_download_outlined),
  ),
@@ -312,7 +352,7 @@ class SettingsTextFormField extends StatefulWidget {
  required this.labelText,
  required this.hintText,
  this.passwordStyle = false,
- this.autoTrim = true,
+ this.autoTrim = false,
  this.initValue,
  this.onChanged,
  this.onEnter,
@@ -353,12 +393,15 @@ class _SettingsTextFormFieldState extends State<SettingsTextFormField> {
  ).applyDefaults(Theme.of(context).inputDecorationTheme),
  onChanged: (s) {
  if (widget.autoTrim) {
- if (s.trim() != s) setState(() => _controller.text = s.trim()); // Remove whitespace immediately
+ if (s.trim() != s)
+ setState(() =>
+ _controller.text = s.trim()); // Remove whitespace immediately
  s = s.trim();
  }
  widget.onChanged?.call(s);
  },
- onFieldSubmitted: (s) => widget.onEnter?.call(widget.autoTrim ? s.trim() : s),
+ onFieldSubmitted: (s) =>
+ widget.onEnter?.call(widget.autoTrim ? s.trim() : s),
  //onTapOutside: onFinishEditing, // disabled because it break the focus system
  );
  }