Compare commits
13 Commits
143206cd72
...
v0.1.17
| Author | SHA1 | Date | |
|---|---|---|---|
| 3bc7d713dd | |||
| 1d9ace45a1 | |||
| 588843a989 | |||
| f780638269 | |||
| 37447b4a53 | |||
| c283de7a45 | |||
| 483db8bfbd | |||
| a4d471dc62 | |||
| 970d78943b | |||
| a66c25c784 | |||
| 609a477b75 | |||
| 6d847aa2bb | |||
| f0b3c11e63 |
79
.gitea/workflows/android_build.yml
Normal file
79
.gitea/workflows/android_build.yml
Normal file
@@ -0,0 +1,79 @@
|
||||
name: Flutter APK Build
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
pull_request:
|
||||
branches:
|
||||
- main
|
||||
workflow_dispatch:
|
||||
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
actions: read
|
||||
|
||||
jobs:
|
||||
build_apk:
|
||||
name: Build Flutter APK
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v3
|
||||
|
||||
# - name: Cache pub deps
|
||||
# uses: actions/cache@v3
|
||||
# with:
|
||||
# path: ~/.pub-cache
|
||||
# key: ${{ runner.os }}-pub-${{ hashFiles('**/pubspec.yaml') }}
|
||||
# restore-keys: ${{ runner.os }}-pub-
|
||||
|
||||
- name: Setup Java (Temurin 17)
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
distribution: temurin
|
||||
java-version: '17'
|
||||
|
||||
- name: Setup Android SDK
|
||||
uses: android-actions/setup-android@v3
|
||||
with:
|
||||
packages: "platform-tools platforms;android-36 build-tools;36.0.0"
|
||||
|
||||
- name: Setup Flutter
|
||||
uses: subosito/flutter-action@v2
|
||||
with:
|
||||
channel: stable
|
||||
- run: flutter --version
|
||||
- run: flutter doctor
|
||||
|
||||
- name: Get dependencies
|
||||
run: flutter pub get
|
||||
|
||||
- name: Build APK
|
||||
run: flutter build apk --release
|
||||
|
||||
- name: Upload APK artifact
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: flutter-apk
|
||||
path: build/app/outputs/flutter-apk/app-release.apk
|
||||
retention-days: 30
|
||||
|
||||
- name: Create Gitea release
|
||||
uses: akkuman/gitea-release-action@v1
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.RUNNER_CREATE_RELEASE }}
|
||||
with:
|
||||
# tag & name: adjust to your versioning
|
||||
tag_name: "v0.1.${{ github.run_number }}"
|
||||
name: "Flutter Android v0.1.${{ github.run_number }}"
|
||||
body: "Automated build from CI"
|
||||
draft: false
|
||||
prerelease: false
|
||||
files: |
|
||||
build/app/outputs/flutter-apk/app-release.apk
|
||||
gitea_url: "https://git.skup.in"
|
||||
owner: "marco"
|
||||
repo: "maps_bookmarks"
|
||||
@@ -3,6 +3,7 @@ import 'package:provider/provider.dart';
|
||||
import 'pages/collection_page.dart';
|
||||
import 'pages/collections_list_page.dart';
|
||||
import 'pages/search_page.dart';
|
||||
import 'service/search_provider.dart';
|
||||
import 'service/shared_link_provider.dart';
|
||||
import 'service/storage.dart';
|
||||
import 'service/share_intent_service.dart';
|
||||
@@ -12,8 +13,11 @@ void main() async {
|
||||
WidgetsFlutterBinding.ensureInitialized();
|
||||
await Storage.initialize();
|
||||
runApp(
|
||||
ChangeNotifierProvider(
|
||||
create: (_) => SharedLinkProvider(),
|
||||
MultiProvider(
|
||||
providers: [
|
||||
ChangeNotifierProvider(create: (_) => SharedLinkProvider()),
|
||||
ChangeNotifierProvider(create: (_) => SearchProvider()),
|
||||
],
|
||||
child: const MapsBookmarks(),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -1,23 +1,14 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../model/bookmark.dart';
|
||||
import '../service/storage.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import '../service/search_provider.dart';
|
||||
import '../widgets/search_widgets/search_bar_widget.dart';
|
||||
import '../widgets/search_widgets/search_results_widget.dart';
|
||||
|
||||
class SearchPage extends StatefulWidget {
|
||||
class SearchPage extends StatelessWidget {
|
||||
const SearchPage({super.key});
|
||||
|
||||
static const String routeName = '/search';
|
||||
|
||||
@override
|
||||
State<SearchPage> createState() => _SearchPageState();
|
||||
}
|
||||
|
||||
class _SearchPageState extends State<SearchPage> {
|
||||
final List<Bookmark> allBookmarks = Storage.loadBookmarks();
|
||||
String searchString = '';
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
@@ -25,17 +16,9 @@ class _SearchPageState extends State<SearchPage> {
|
||||
body: Column(
|
||||
children: [
|
||||
SearchBarWidget(
|
||||
onEditingComplete: (searchString) => setState(() {
|
||||
this.searchString = searchString;
|
||||
}),
|
||||
),
|
||||
Expanded(
|
||||
child: SearchResultsWidget(
|
||||
bookmarks: allBookmarks.where(
|
||||
(bookmark) => bookmark.name.contains(searchString),
|
||||
),
|
||||
),
|
||||
onEditingComplete: context.read<SearchProvider>().setSearchText,
|
||||
),
|
||||
Expanded(child: SearchResultsWidget()),
|
||||
],
|
||||
),
|
||||
);
|
||||
|
||||
12
lib/service/search_provider.dart
Normal file
12
lib/service/search_provider.dart
Normal file
@@ -0,0 +1,12 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
class SearchProvider extends ChangeNotifier {
|
||||
String _searchText = '';
|
||||
|
||||
void setSearchText(String searchText, {bool silent = false}) {
|
||||
_searchText = searchText;
|
||||
if (!silent) notifyListeners();
|
||||
}
|
||||
|
||||
String get searchText => _searchText;
|
||||
}
|
||||
@@ -7,10 +7,10 @@ class SearchBarWidget extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
TextEditingController searchBarController = TextEditingController();
|
||||
return TextField(
|
||||
controller: searchBarController,
|
||||
onEditingComplete: () => onEditingComplete(searchBarController.text),
|
||||
);
|
||||
return TextField(onChanged: (text) => onChanged(text, context));
|
||||
}
|
||||
|
||||
void onChanged(String text, BuildContext context) {
|
||||
if (context.mounted) onEditingComplete(text);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,16 +1,24 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
import '../../model/bookmark.dart';
|
||||
import '../../service/notifying.dart';
|
||||
import '../../service/search_provider.dart';
|
||||
import '../../service/storage.dart' show Storage;
|
||||
import '../../service/url_launcher.dart';
|
||||
|
||||
class SearchResultsWidget extends StatelessWidget {
|
||||
const SearchResultsWidget({super.key, required this.bookmarks});
|
||||
class SearchResultsWidget extends StatefulWidget {
|
||||
const SearchResultsWidget({super.key});
|
||||
|
||||
final Iterable<Bookmark> bookmarks;
|
||||
@override
|
||||
State<SearchResultsWidget> createState() => _SearchResultsWidgetState();
|
||||
}
|
||||
|
||||
class _SearchResultsWidgetState extends State<SearchResultsWidget> {
|
||||
final List<Bookmark> allBookmarks = Storage.loadBookmarks();
|
||||
|
||||
Widget bookmarkListItemBuilder(BuildContext context, int index) {
|
||||
final bookmark = bookmarks.elementAt(index);
|
||||
final bookmark = filteredBookmarks.elementAt(index);
|
||||
return ListTile(
|
||||
title: Text(bookmark.name),
|
||||
onTap: () => launchUrlFromString(bookmark.link).then((errorCode) {
|
||||
@@ -25,12 +33,18 @@ class SearchResultsWidget extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
if (bookmarks.isNotEmpty) {
|
||||
if (filteredBookmarks.isNotEmpty) {
|
||||
return ListView.builder(
|
||||
itemBuilder: bookmarkListItemBuilder,
|
||||
itemCount: bookmarks.length,
|
||||
itemCount: filteredBookmarks.length,
|
||||
);
|
||||
}
|
||||
return Center(child: Text('Start searching'));
|
||||
}
|
||||
|
||||
Iterable<Bookmark> get filteredBookmarks => allBookmarks.where(
|
||||
(bookmark) => bookmark.name.toLowerCase().contains(
|
||||
context.watch<SearchProvider>().searchText.toLowerCase(),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user