Compare commits
2 Commits
77a647d17d
...
99a8aaa409
| Author | SHA1 | Date | |
|---|---|---|---|
| 99a8aaa409 | |||
| 85d57c6e1c |
@@ -30,7 +30,10 @@ jobs:
|
|||||||
- name: Get commit message and determine version bump
|
- name: Get commit message and determine version bump
|
||||||
id: version
|
id: version
|
||||||
run: |
|
run: |
|
||||||
COMMIT_MSG="${{ github.event.head_commit.message }}"
|
COMMIT_MSG=$(git log -1 --pretty=%B)
|
||||||
|
HEAD_REF="${{ github.head_ref }}"
|
||||||
|
echo "DEBUG: Commit message: '$COMMIT_MSG'"
|
||||||
|
echo "DEBUG: Head ref: '$HEAD_REF'"
|
||||||
|
|
||||||
if [[ $COMMIT_MSG == [fix]* ]]; then
|
if [[ $COMMIT_MSG == [fix]* ]]; then
|
||||||
BUMP_TYPE="patch"
|
BUMP_TYPE="patch"
|
||||||
@@ -38,10 +41,17 @@ jobs:
|
|||||||
BUMP_TYPE="minor"
|
BUMP_TYPE="minor"
|
||||||
elif [[ $COMMIT_MSG == [release]* ]]; then
|
elif [[ $COMMIT_MSG == [release]* ]]; then
|
||||||
BUMP_TYPE="major"
|
BUMP_TYPE="major"
|
||||||
|
elif [[ $HEAD_REF == fix/* ]]; then
|
||||||
|
BUMP_TYPE="patch"
|
||||||
|
elif [[ $HEAD_REF == feature/* ]] || [[ $HEAD_REF == feat/* ]]; then
|
||||||
|
BUMP_TYPE="minor"
|
||||||
|
elif [[ $HEAD_REF == release/* ]] || [[ $HEAD_REF == hotfix/* ]]; then
|
||||||
|
BUMP_TYPE="major"
|
||||||
else
|
else
|
||||||
BUMP_TYPE="none"
|
BUMP_TYPE="none"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
|
LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
|
||||||
LATEST_TAG=${LATEST_TAG#v}
|
LATEST_TAG=${LATEST_TAG#v}
|
||||||
|
|
||||||
|
|||||||
@@ -12,5 +12,16 @@
|
|||||||
"chooseCollection": "Sammlung auswählen",
|
"chooseCollection": "Sammlung auswählen",
|
||||||
"collections": "Sammlungen",
|
"collections": "Sammlungen",
|
||||||
"tipCreateCollections": "Erstelle deine erste Sammlung!",
|
"tipCreateCollections": "Erstelle deine erste Sammlung!",
|
||||||
"search": "Suche"
|
"search": "Suche",
|
||||||
|
"createBookmark": "Lesezeichen erstellen",
|
||||||
|
"createCollection": "Sammlung erstellen",
|
||||||
|
"create": "Erstellen",
|
||||||
|
"delete": "Löschen",
|
||||||
|
"add": "Hinzufügen",
|
||||||
|
"startSearching": "Suche etwas",
|
||||||
|
"tipNoResults": "Keine Suchergebnisse gefunden",
|
||||||
|
"collectionName": "Name der Sammlung",
|
||||||
|
"bookmarkTitle": "Titel des Lesezeichens",
|
||||||
|
"url": "Url",
|
||||||
|
"description": "Beschreibung"
|
||||||
}
|
}
|
||||||
@@ -12,5 +12,16 @@
|
|||||||
"chooseCollection": "Choose Collection",
|
"chooseCollection": "Choose Collection",
|
||||||
"collections": "Collections",
|
"collections": "Collections",
|
||||||
"tipCreateCollections": "Create your first Collection to get started!",
|
"tipCreateCollections": "Create your first Collection to get started!",
|
||||||
"search": "Search"
|
"search": "Search",
|
||||||
|
"createBookmark": "Create Bookmark",
|
||||||
|
"createCollection": "Create Collection",
|
||||||
|
"create": "Create",
|
||||||
|
"delete": "Delete",
|
||||||
|
"add": "Add",
|
||||||
|
"startSearching": "Start searching",
|
||||||
|
"tipNoResults": "There are no results that match your search",
|
||||||
|
"collectionName": "Collection Name",
|
||||||
|
"bookmarkTitle": "Bookmark Title",
|
||||||
|
"url": "Url",
|
||||||
|
"description": "Description"
|
||||||
}
|
}
|
||||||
@@ -133,6 +133,72 @@ abstract class AppLocalizations {
|
|||||||
/// In en, this message translates to:
|
/// In en, this message translates to:
|
||||||
/// **'Search'**
|
/// **'Search'**
|
||||||
String get search;
|
String get search;
|
||||||
|
|
||||||
|
/// No description provided for @createBookmark.
|
||||||
|
///
|
||||||
|
/// In en, this message translates to:
|
||||||
|
/// **'Create Bookmark'**
|
||||||
|
String get createBookmark;
|
||||||
|
|
||||||
|
/// No description provided for @createCollection.
|
||||||
|
///
|
||||||
|
/// In en, this message translates to:
|
||||||
|
/// **'Create Collection'**
|
||||||
|
String get createCollection;
|
||||||
|
|
||||||
|
/// No description provided for @create.
|
||||||
|
///
|
||||||
|
/// In en, this message translates to:
|
||||||
|
/// **'Create'**
|
||||||
|
String get create;
|
||||||
|
|
||||||
|
/// No description provided for @delete.
|
||||||
|
///
|
||||||
|
/// In en, this message translates to:
|
||||||
|
/// **'Delete'**
|
||||||
|
String get delete;
|
||||||
|
|
||||||
|
/// No description provided for @add.
|
||||||
|
///
|
||||||
|
/// In en, this message translates to:
|
||||||
|
/// **'Add'**
|
||||||
|
String get add;
|
||||||
|
|
||||||
|
/// No description provided for @startSearching.
|
||||||
|
///
|
||||||
|
/// In en, this message translates to:
|
||||||
|
/// **'Start searching'**
|
||||||
|
String get startSearching;
|
||||||
|
|
||||||
|
/// No description provided for @tipNoResults.
|
||||||
|
///
|
||||||
|
/// In en, this message translates to:
|
||||||
|
/// **'There are no results that match your search'**
|
||||||
|
String get tipNoResults;
|
||||||
|
|
||||||
|
/// No description provided for @collectionName.
|
||||||
|
///
|
||||||
|
/// In en, this message translates to:
|
||||||
|
/// **'Collection Name'**
|
||||||
|
String get collectionName;
|
||||||
|
|
||||||
|
/// No description provided for @bookmarkTitle.
|
||||||
|
///
|
||||||
|
/// In en, this message translates to:
|
||||||
|
/// **'Bookmark Title'**
|
||||||
|
String get bookmarkTitle;
|
||||||
|
|
||||||
|
/// No description provided for @url.
|
||||||
|
///
|
||||||
|
/// In en, this message translates to:
|
||||||
|
/// **'Url'**
|
||||||
|
String get url;
|
||||||
|
|
||||||
|
/// No description provided for @description.
|
||||||
|
///
|
||||||
|
/// In en, this message translates to:
|
||||||
|
/// **'Description'**
|
||||||
|
String get description;
|
||||||
}
|
}
|
||||||
|
|
||||||
class _AppLocalizationsDelegate
|
class _AppLocalizationsDelegate
|
||||||
|
|||||||
@@ -27,4 +27,37 @@ class AppLocalizationsDe extends AppLocalizations {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
String get search => 'Suche';
|
String get search => 'Suche';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get createBookmark => 'Lesezeichen erstellen';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get createCollection => 'Sammlung erstellen';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get create => 'Erstellen';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get delete => 'Löschen';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get add => 'Hinzufügen';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get startSearching => 'Suche etwas';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get tipNoResults => 'Keine Suchergebnisse gefunden';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get collectionName => 'Name der Sammlung';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get bookmarkTitle => 'Titel des Lesezeichens';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get url => 'Url';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get description => 'Beschreibung';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,4 +28,37 @@ class AppLocalizationsEn extends AppLocalizations {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
String get search => 'Search';
|
String get search => 'Search';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get createBookmark => 'Create Bookmark';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get createCollection => 'Create Collection';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get create => 'Create';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get delete => 'Delete';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get add => 'Add';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get startSearching => 'Start searching';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get tipNoResults => 'There are no results that match your search';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get collectionName => 'Collection Name';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get bookmarkTitle => 'Bookmark Title';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get url => 'Url';
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get description => 'Description';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
|
|
||||||
|
import '../l10n/app_localizations.dart';
|
||||||
import '../model/collection.dart';
|
import '../model/collection.dart';
|
||||||
import 'edit_dialog_widgets/edit_dialog_actions.dart' show EditDialogActions;
|
import 'edit_dialog_widgets/edit_dialog_actions.dart' show EditDialogActions;
|
||||||
import 'edit_dialog_widgets/edit_dialog_title.dart';
|
import 'edit_dialog_widgets/edit_dialog_title.dart';
|
||||||
@@ -41,7 +42,7 @@ class CreateBookmarkCollectionDialog extends StatelessWidget {
|
|||||||
],
|
],
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
// TODO: Localize
|
// TODO: Localize
|
||||||
labelText: 'Collection Name',
|
labelText: AppLocalizations.of(context)!.collectionName,
|
||||||
border: OutlineInputBorder(borderRadius: BorderRadius.circular(10)),
|
border: OutlineInputBorder(borderRadius: BorderRadius.circular(10)),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
|
|
||||||
|
import '../l10n/app_localizations.dart';
|
||||||
import '../model/bookmark.dart';
|
import '../model/bookmark.dart';
|
||||||
import '../model/maps_link_metadata.dart';
|
import '../model/maps_link_metadata.dart';
|
||||||
import 'edit_dialog_widgets/edit_dialog_actions.dart';
|
import 'edit_dialog_widgets/edit_dialog_actions.dart';
|
||||||
@@ -59,7 +60,7 @@ class CreateBookmarkDialog extends StatelessWidget {
|
|||||||
FilteringTextInputFormatter.deny(RegExp(r'\s\s+')),
|
FilteringTextInputFormatter.deny(RegExp(r'\s\s+')),
|
||||||
],
|
],
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
labelText: 'Bookmark Title',
|
labelText: AppLocalizations.of(context)!.bookmarkTitle,
|
||||||
border: OutlineInputBorder(
|
border: OutlineInputBorder(
|
||||||
borderRadius: BorderRadius.circular(10),
|
borderRadius: BorderRadius.circular(10),
|
||||||
),
|
),
|
||||||
@@ -76,7 +77,7 @@ class CreateBookmarkDialog extends StatelessWidget {
|
|||||||
FilteringTextInputFormatter.deny(RegExp(r'\s\s+')),
|
FilteringTextInputFormatter.deny(RegExp(r'\s\s+')),
|
||||||
],
|
],
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
labelText: 'Url',
|
labelText: AppLocalizations.of(context)!.url,
|
||||||
border: OutlineInputBorder(
|
border: OutlineInputBorder(
|
||||||
borderRadius: BorderRadius.circular(10),
|
borderRadius: BorderRadius.circular(10),
|
||||||
),
|
),
|
||||||
@@ -93,7 +94,7 @@ class CreateBookmarkDialog extends StatelessWidget {
|
|||||||
FilteringTextInputFormatter.deny(RegExp(r'\s\s+')),
|
FilteringTextInputFormatter.deny(RegExp(r'\s\s+')),
|
||||||
],
|
],
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
labelText: 'Description',
|
labelText: AppLocalizations.of(context)!.description,
|
||||||
border: OutlineInputBorder(
|
border: OutlineInputBorder(
|
||||||
borderRadius: BorderRadius.circular(10),
|
borderRadius: BorderRadius.circular(10),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ import 'package:flutter/material.dart'
|
|||||||
show TextButton, FloatingActionButton, Icons;
|
show TextButton, FloatingActionButton, Icons;
|
||||||
import 'package:flutter/widgets.dart';
|
import 'package:flutter/widgets.dart';
|
||||||
|
|
||||||
|
import '../../l10n/app_localizations.dart';
|
||||||
|
|
||||||
class EditDialogActions extends StatelessWidget {
|
class EditDialogActions extends StatelessWidget {
|
||||||
const EditDialogActions({super.key, required this.onSavePressed});
|
const EditDialogActions({super.key, required this.onSavePressed});
|
||||||
final VoidCallback onSavePressed;
|
final VoidCallback onSavePressed;
|
||||||
@@ -13,7 +15,7 @@ class EditDialogActions extends StatelessWidget {
|
|||||||
children: [
|
children: [
|
||||||
TextButton(
|
TextButton(
|
||||||
onPressed: () => Navigator.of(context).pop(),
|
onPressed: () => Navigator.of(context).pop(),
|
||||||
child: Text('Cancel'),
|
child: Text(AppLocalizations.of(context)!.cancel),
|
||||||
),
|
),
|
||||||
FloatingActionButton(onPressed: onSavePressed, child: Icon(Icons.save)),
|
FloatingActionButton(onPressed: onSavePressed, child: Icon(Icons.save)),
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
|
|
||||||
|
import '../../l10n/app_localizations.dart';
|
||||||
import '../../model/bookmark.dart';
|
import '../../model/bookmark.dart';
|
||||||
import '../../service/notifying.dart';
|
import '../../service/notifying.dart';
|
||||||
import '../../service/search_provider.dart';
|
import '../../service/search_provider.dart';
|
||||||
@@ -51,6 +52,6 @@ class _SearchResultsWidgetState extends State<SearchResultsWidget> {
|
|||||||
itemCount: filteredBookmarks.length,
|
itemCount: filteredBookmarks.length,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return Center(child: Text('Start searching'));
|
return Center(child: Text(AppLocalizations.of(context)!.tipNoResults));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user