+32 -6

docs/designs/settings.html

reviewed

··· 248 248 <div class="theme-swatch" style="background-color: #08bdba"></div> 249 249 <div class="theme-swatch" style="background-color: #ee5396"></div> 250 250 </div> 251 251 - <svg class="theme-palette-check" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"> 251 251 + <svg 252 252 + class="theme-palette-check" 253 253 + viewBox="0 0 24 24" 254 254 + fill="none" 255 255 + stroke="currentColor" 256 256 + stroke-width="3" 257 257 + stroke-linecap="round" 258 258 + stroke-linejoin="round"> 252 259 <polyline points="20 6 9 17 4 12" /> 253 260 </svg> 254 261 </div> ··· 261 268 <div class="theme-swatch" style="background-color: #74c7ec"></div> 262 269 <div class="theme-swatch" style="background-color: #f5c2e7"></div> 263 270 </div> 264 264 - <svg class="theme-palette-check" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"> 271 271 + <svg 272 272 + class="theme-palette-check" 273 273 + viewBox="0 0 24 24" 274 274 + fill="none" 275 275 + stroke="currentColor" 276 276 + stroke-width="3" 277 277 + stroke-linecap="round" 278 278 + stroke-linejoin="round"> 265 279 <polyline points="20 6 9 17 4 12" /> 266 280 </svg> 267 281 </div> ··· 274 288 <div class="theme-swatch" style="background-color: #ebcb8b"></div> 275 289 <div class="theme-swatch" style="background-color: #b48ead"></div> 276 290 </div> 277 277 - <svg class="theme-palette-check" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"> 291 291 + <svg 292 292 + class="theme-palette-check" 293 293 + viewBox="0 0 24 24" 294 294 + fill="none" 295 295 + stroke="currentColor" 296 296 + stroke-width="3" 297 297 + stroke-linecap="round" 298 298 + stroke-linejoin="round"> 278 299 <polyline points="20 6 9 17 4 12" /> 279 300 </svg> 280 301 </div> ··· 287 308 <div class="theme-swatch" style="background-color: #9ccfd8"></div> 288 309 <div class="theme-swatch" style="background-color: #f6c177"></div> 289 310 </div> 290 290 - <svg class="theme-palette-check" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"> 311 311 + <svg 312 312 + class="theme-palette-check" 313 313 + viewBox="0 0 24 24" 314 314 + fill="none" 315 315 + stroke="currentColor" 316 316 + stroke-width="3" 317 317 + stroke-linecap="round" 318 318 + stroke-linejoin="round"> 291 319 <polyline points="20 6 9 17 4 12" /> 292 320 </svg> 293 321 </div> ··· 685 713 const mode = localStorage.getItem("appearance-mode") || "dark"; 686 714 const palette = localStorage.getItem("palette") || "oxocarbon"; 687 715 688 688 - // Restore mode 689 716 document.querySelectorAll(".segment-btn").forEach((el) => el.classList.remove("active")); 690 717 const modeBtn = document.querySelector(`.segment-btn[data-mode="${mode}"]`); 691 718 if (modeBtn) modeBtn.classList.add("active"); ··· 697 724 applyVariant(mode); 698 725 } 699 726 700 700 - // Restore palette 701 727 document.querySelectorAll(".theme-palette-row").forEach((el) => el.classList.remove("active")); 702 728 const paletteRow = document.querySelector(`.theme-palette-row[data-palette="${palette}"]`); 703 729 if (paletteRow) paletteRow.classList.add("active");

+8 -8

docs/tasks/phase-2.md

reviewed

··· 27 27 28 28 ## M6 — Search 29 29 30 30 - - [ ] Search screen with text input, sort toggle (`top` / `latest`), and result tabs (posts / actors) 31 31 - - [ ] `SearchBloc` — events: `QuerySubmitted`, `TypeaheadRequested`, `HistoryCleared`, `HistoryEntryDeleted` 32 32 - - [ ] Post search via `searchPosts` with paginated results 33 33 - - [ ] Actor search via `searchActors` with paginated results 34 34 - - [ ] Typeahead autocomplete via `searchActorsTypeahead` 35 35 - - [ ] Drift migration: add `search_history` table (query, type, searched_at, account_did) 36 36 - - [ ] Persisted search history — display recent queries, tap to re-execute, swipe to delete, cap at 50 per account 37 37 - - [ ] Search with `@` should autocomplete with avatars + handles (debounced) 30 30 + - [x] Search screen with text input, sort toggle (`top` / `latest`), and result tabs (posts / actors) 31 31 + - [x] `SearchBloc` — events: `QuerySubmitted`, `TypeaheadRequested`, `HistoryCleared`, `HistoryEntryDeleted` 32 32 + - [x] Post search via `searchPosts` with paginated results 33 33 + - [x] Actor search via `searchActors` with paginated results 34 34 + - [x] Typeahead autocomplete via `searchActorsTypeahead` 35 35 + - [x] Drift migration: add `search_history` table (query, type, searched_at, account_did) 36 36 + - [x] Persisted search history — display recent queries, tap to re-execute, swipe to delete, cap at 50 per account 37 37 + - [x] Search with `@` should autocomplete with avatars + handles (debounced) 38 38 39 39 ## M7 — Dev Tools (PDS Explorer) 40 40

+38 -2

lib/core/database/app_database.dart

reviewed

··· 6 6 7 7 part 'app_database.g.dart'; 8 8 9 9 - @DriftDatabase(tables: [Accounts, CachedProfiles, CachedPosts, Settings, SavedFeeds]) 9 9 + @DriftDatabase(tables: [Accounts, CachedProfiles, CachedPosts, Settings, SavedFeeds, SearchHistory]) 10 10 class AppDatabase extends _$AppDatabase { 11 11 AppDatabase({QueryExecutor? executor}) : super(executor ?? _openConnection()); 12 12 13 13 @override 14 14 - int get schemaVersion => 3; 14 14 + int get schemaVersion => 4; 15 15 16 16 @override 17 17 MigrationStrategy get migration => MigrationStrategy( ··· 28 28 } 29 29 if (from < 3) { 30 30 await migrator.createTable(savedFeeds); 31 31 + } 32 32 + if (from < 4) { 33 33 + await migrator.createTable(searchHistory); 31 34 } 32 35 }, 33 36 ); ··· 139 142 await insertSavedFeed(feed); 140 143 } 141 144 }); 145 145 + } 146 146 + 147 147 + Future<List<SearchHistoryEntry>> getSearchHistory(String accountDid, {int limit = 50}) => 148 148 + (select(searchHistory) 149 149 + ..where((h) => h.accountDid.equals(accountDid)) 150 150 + ..orderBy([(h) => OrderingTerm.desc(h.searchedAt)]) 151 151 + ..limit(limit)) 152 152 + .get(); 153 153 + 154 154 + Future<int> insertSearchHistory(SearchHistoryCompanion entry) => into(searchHistory).insert(entry); 155 155 + 156 156 + Future<int> deleteSearchHistoryEntry(int id) => (delete(searchHistory)..where((h) => h.id.equals(id))).go(); 157 157 + 158 158 + Future<int> clearSearchHistory(String accountDid) => 159 159 + (delete(searchHistory)..where((h) => h.accountDid.equals(accountDid))).go(); 160 160 + 161 161 + Future<void> addSearchHistoryEntry({required String query, required String type, required String accountDid}) async { 162 162 + await insertSearchHistory( 163 163 + SearchHistoryCompanion( 164 164 + query: Value(query), 165 165 + type: Value(type), 166 166 + accountDid: Value(accountDid), 167 167 + searchedAt: Value(DateTime.now()), 168 168 + ), 169 169 + ); 170 170 + 171 171 + final entries = await getSearchHistory(accountDid, limit: 100); 172 172 + if (entries.length > 50) { 173 173 + final toDelete = entries.skip(50); 174 174 + for (final entry in toDelete) { 175 175 + await deleteSearchHistoryEntry(entry.id); 176 176 + } 177 177 + } 142 178 } 143 179 }

+458 -1

lib/core/database/app_database.g.dart

reviewed

··· 1788 1788 } 1789 1789 } 1790 1790 1791 1791 + class $SearchHistoryTable extends SearchHistory with TableInfo<$SearchHistoryTable, SearchHistoryEntry> { 1792 1792 + @override 1793 1793 + final GeneratedDatabase attachedDatabase; 1794 1794 + final String? _alias; 1795 1795 + $SearchHistoryTable(this.attachedDatabase, [this._alias]); 1796 1796 + static const VerificationMeta _idMeta = const VerificationMeta('id'); 1797 1797 + @override 1798 1798 + late final GeneratedColumn<int> id = GeneratedColumn<int>( 1799 1799 + 'id', 1800 1800 + aliasedName, 1801 1801 + false, 1802 1802 + hasAutoIncrement: true, 1803 1803 + type: DriftSqlType.int, 1804 1804 + requiredDuringInsert: false, 1805 1805 + defaultConstraints: GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT'), 1806 1806 + ); 1807 1807 + static const VerificationMeta _queryMeta = const VerificationMeta('query'); 1808 1808 + @override 1809 1809 + late final GeneratedColumn<String> query = GeneratedColumn<String>( 1810 1810 + 'query', 1811 1811 + aliasedName, 1812 1812 + false, 1813 1813 + type: DriftSqlType.string, 1814 1814 + requiredDuringInsert: true, 1815 1815 + ); 1816 1816 + static const VerificationMeta _typeMeta = const VerificationMeta('type'); 1817 1817 + @override 1818 1818 + late final GeneratedColumn<String> type = GeneratedColumn<String>( 1819 1819 + 'type', 1820 1820 + aliasedName, 1821 1821 + false, 1822 1822 + type: DriftSqlType.string, 1823 1823 + requiredDuringInsert: true, 1824 1824 + ); 1825 1825 + static const VerificationMeta _searchedAtMeta = const VerificationMeta('searchedAt'); 1826 1826 + @override 1827 1827 + late final GeneratedColumn<DateTime> searchedAt = GeneratedColumn<DateTime>( 1828 1828 + 'searched_at', 1829 1829 + aliasedName, 1830 1830 + false, 1831 1831 + type: DriftSqlType.dateTime, 1832 1832 + requiredDuringInsert: false, 1833 1833 + defaultValue: currentDateAndTime, 1834 1834 + ); 1835 1835 + static const VerificationMeta _accountDidMeta = const VerificationMeta('accountDid'); 1836 1836 + @override 1837 1837 + late final GeneratedColumn<String> accountDid = GeneratedColumn<String>( 1838 1838 + 'account_did', 1839 1839 + aliasedName, 1840 1840 + false, 1841 1841 + type: DriftSqlType.string, 1842 1842 + requiredDuringInsert: true, 1843 1843 + ); 1844 1844 + @override 1845 1845 + List<GeneratedColumn> get $columns => [id, query, type, searchedAt, accountDid]; 1846 1846 + @override 1847 1847 + String get aliasedName => _alias ?? actualTableName; 1848 1848 + @override 1849 1849 + String get actualTableName => $name; 1850 1850 + static const String $name = 'search_history'; 1851 1851 + @override 1852 1852 + VerificationContext validateIntegrity(Insertable<SearchHistoryEntry> instance, {bool isInserting = false}) { 1853 1853 + final context = VerificationContext(); 1854 1854 + final data = instance.toColumns(true); 1855 1855 + if (data.containsKey('id')) { 1856 1856 + context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta)); 1857 1857 + } 1858 1858 + if (data.containsKey('query')) { 1859 1859 + context.handle(_queryMeta, query.isAcceptableOrUnknown(data['query']!, _queryMeta)); 1860 1860 + } else if (isInserting) { 1861 1861 + context.missing(_queryMeta); 1862 1862 + } 1863 1863 + if (data.containsKey('type')) { 1864 1864 + context.handle(_typeMeta, type.isAcceptableOrUnknown(data['type']!, _typeMeta)); 1865 1865 + } else if (isInserting) { 1866 1866 + context.missing(_typeMeta); 1867 1867 + } 1868 1868 + if (data.containsKey('searched_at')) { 1869 1869 + context.handle(_searchedAtMeta, searchedAt.isAcceptableOrUnknown(data['searched_at']!, _searchedAtMeta)); 1870 1870 + } 1871 1871 + if (data.containsKey('account_did')) { 1872 1872 + context.handle(_accountDidMeta, accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta)); 1873 1873 + } else if (isInserting) { 1874 1874 + context.missing(_accountDidMeta); 1875 1875 + } 1876 1876 + return context; 1877 1877 + } 1878 1878 + 1879 1879 + @override 1880 1880 + Set<GeneratedColumn> get $primaryKey => {id}; 1881 1881 + @override 1882 1882 + SearchHistoryEntry map(Map<String, dynamic> data, {String? tablePrefix}) { 1883 1883 + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; 1884 1884 + return SearchHistoryEntry( 1885 1885 + id: attachedDatabase.typeMapping.read(DriftSqlType.int, data['${effectivePrefix}id'])!, 1886 1886 + query: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}query'])!, 1887 1887 + type: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}type'])!, 1888 1888 + searchedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}searched_at'])!, 1889 1889 + accountDid: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}account_did'])!, 1890 1890 + ); 1891 1891 + } 1892 1892 + 1893 1893 + @override 1894 1894 + $SearchHistoryTable createAlias(String alias) { 1895 1895 + return $SearchHistoryTable(attachedDatabase, alias); 1896 1896 + } 1897 1897 + } 1898 1898 + 1899 1899 + class SearchHistoryEntry extends DataClass implements Insertable<SearchHistoryEntry> { 1900 1900 + final int id; 1901 1901 + final String query; 1902 1902 + final String type; 1903 1903 + final DateTime searchedAt; 1904 1904 + final String accountDid; 1905 1905 + const SearchHistoryEntry({ 1906 1906 + required this.id, 1907 1907 + required this.query, 1908 1908 + required this.type, 1909 1909 + required this.searchedAt, 1910 1910 + required this.accountDid, 1911 1911 + }); 1912 1912 + @override 1913 1913 + Map<String, Expression> toColumns(bool nullToAbsent) { 1914 1914 + final map = <String, Expression>{}; 1915 1915 + map['id'] = Variable<int>(id); 1916 1916 + map['query'] = Variable<String>(query); 1917 1917 + map['type'] = Variable<String>(type); 1918 1918 + map['searched_at'] = Variable<DateTime>(searchedAt); 1919 1919 + map['account_did'] = Variable<String>(accountDid); 1920 1920 + return map; 1921 1921 + } 1922 1922 + 1923 1923 + SearchHistoryCompanion toCompanion(bool nullToAbsent) { 1924 1924 + return SearchHistoryCompanion( 1925 1925 + id: Value(id), 1926 1926 + query: Value(query), 1927 1927 + type: Value(type), 1928 1928 + searchedAt: Value(searchedAt), 1929 1929 + accountDid: Value(accountDid), 1930 1930 + ); 1931 1931 + } 1932 1932 + 1933 1933 + factory SearchHistoryEntry.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) { 1934 1934 + serializer ??= driftRuntimeOptions.defaultSerializer; 1935 1935 + return SearchHistoryEntry( 1936 1936 + id: serializer.fromJson<int>(json['id']), 1937 1937 + query: serializer.fromJson<String>(json['query']), 1938 1938 + type: serializer.fromJson<String>(json['type']), 1939 1939 + searchedAt: serializer.fromJson<DateTime>(json['searchedAt']), 1940 1940 + accountDid: serializer.fromJson<String>(json['accountDid']), 1941 1941 + ); 1942 1942 + } 1943 1943 + @override 1944 1944 + Map<String, dynamic> toJson({ValueSerializer? serializer}) { 1945 1945 + serializer ??= driftRuntimeOptions.defaultSerializer; 1946 1946 + return <String, dynamic>{ 1947 1947 + 'id': serializer.toJson<int>(id), 1948 1948 + 'query': serializer.toJson<String>(query), 1949 1949 + 'type': serializer.toJson<String>(type), 1950 1950 + 'searchedAt': serializer.toJson<DateTime>(searchedAt), 1951 1951 + 'accountDid': serializer.toJson<String>(accountDid), 1952 1952 + }; 1953 1953 + } 1954 1954 + 1955 1955 + SearchHistoryEntry copyWith({int? id, String? query, String? type, DateTime? searchedAt, String? accountDid}) => 1956 1956 + SearchHistoryEntry( 1957 1957 + id: id ?? this.id, 1958 1958 + query: query ?? this.query, 1959 1959 + type: type ?? this.type, 1960 1960 + searchedAt: searchedAt ?? this.searchedAt, 1961 1961 + accountDid: accountDid ?? this.accountDid, 1962 1962 + ); 1963 1963 + SearchHistoryEntry copyWithCompanion(SearchHistoryCompanion data) { 1964 1964 + return SearchHistoryEntry( 1965 1965 + id: data.id.present ? data.id.value : this.id, 1966 1966 + query: data.query.present ? data.query.value : this.query, 1967 1967 + type: data.type.present ? data.type.value : this.type, 1968 1968 + searchedAt: data.searchedAt.present ? data.searchedAt.value : this.searchedAt, 1969 1969 + accountDid: data.accountDid.present ? data.accountDid.value : this.accountDid, 1970 1970 + ); 1971 1971 + } 1972 1972 + 1973 1973 + @override 1974 1974 + String toString() { 1975 1975 + return (StringBuffer('SearchHistoryEntry(') 1976 1976 + ..write('id: $id, ') 1977 1977 + ..write('query: $query, ') 1978 1978 + ..write('type: $type, ') 1979 1979 + ..write('searchedAt: $searchedAt, ') 1980 1980 + ..write('accountDid: $accountDid') 1981 1981 + ..write(')')) 1982 1982 + .toString(); 1983 1983 + } 1984 1984 + 1985 1985 + @override 1986 1986 + int get hashCode => Object.hash(id, query, type, searchedAt, accountDid); 1987 1987 + @override 1988 1988 + bool operator ==(Object other) => 1989 1989 + identical(this, other) || 1990 1990 + (other is SearchHistoryEntry && 1991 1991 + other.id == this.id && 1992 1992 + other.query == this.query && 1993 1993 + other.type == this.type && 1994 1994 + other.searchedAt == this.searchedAt && 1995 1995 + other.accountDid == this.accountDid); 1996 1996 + } 1997 1997 + 1998 1998 + class SearchHistoryCompanion extends UpdateCompanion<SearchHistoryEntry> { 1999 1999 + final Value<int> id; 2000 2000 + final Value<String> query; 2001 2001 + final Value<String> type; 2002 2002 + final Value<DateTime> searchedAt; 2003 2003 + final Value<String> accountDid; 2004 2004 + const SearchHistoryCompanion({ 2005 2005 + this.id = const Value.absent(), 2006 2006 + this.query = const Value.absent(), 2007 2007 + this.type = const Value.absent(), 2008 2008 + this.searchedAt = const Value.absent(), 2009 2009 + this.accountDid = const Value.absent(), 2010 2010 + }); 2011 2011 + SearchHistoryCompanion.insert({ 2012 2012 + this.id = const Value.absent(), 2013 2013 + required String query, 2014 2014 + required String type, 2015 2015 + this.searchedAt = const Value.absent(), 2016 2016 + required String accountDid, 2017 2017 + }) : query = Value(query), 2018 2018 + type = Value(type), 2019 2019 + accountDid = Value(accountDid); 2020 2020 + static Insertable<SearchHistoryEntry> custom({ 2021 2021 + Expression<int>? id, 2022 2022 + Expression<String>? query, 2023 2023 + Expression<String>? type, 2024 2024 + Expression<DateTime>? searchedAt, 2025 2025 + Expression<String>? accountDid, 2026 2026 + }) { 2027 2027 + return RawValuesInsertable({ 2028 2028 + if (id != null) 'id': id, 2029 2029 + if (query != null) 'query': query, 2030 2030 + if (type != null) 'type': type, 2031 2031 + if (searchedAt != null) 'searched_at': searchedAt, 2032 2032 + if (accountDid != null) 'account_did': accountDid, 2033 2033 + }); 2034 2034 + } 2035 2035 + 2036 2036 + SearchHistoryCompanion copyWith({ 2037 2037 + Value<int>? id, 2038 2038 + Value<String>? query, 2039 2039 + Value<String>? type, 2040 2040 + Value<DateTime>? searchedAt, 2041 2041 + Value<String>? accountDid, 2042 2042 + }) { 2043 2043 + return SearchHistoryCompanion( 2044 2044 + id: id ?? this.id, 2045 2045 + query: query ?? this.query, 2046 2046 + type: type ?? this.type, 2047 2047 + searchedAt: searchedAt ?? this.searchedAt, 2048 2048 + accountDid: accountDid ?? this.accountDid, 2049 2049 + ); 2050 2050 + } 2051 2051 + 2052 2052 + @override 2053 2053 + Map<String, Expression> toColumns(bool nullToAbsent) { 2054 2054 + final map = <String, Expression>{}; 2055 2055 + if (id.present) { 2056 2056 + map['id'] = Variable<int>(id.value); 2057 2057 + } 2058 2058 + if (query.present) { 2059 2059 + map['query'] = Variable<String>(query.value); 2060 2060 + } 2061 2061 + if (type.present) { 2062 2062 + map['type'] = Variable<String>(type.value); 2063 2063 + } 2064 2064 + if (searchedAt.present) { 2065 2065 + map['searched_at'] = Variable<DateTime>(searchedAt.value); 2066 2066 + } 2067 2067 + if (accountDid.present) { 2068 2068 + map['account_did'] = Variable<String>(accountDid.value); 2069 2069 + } 2070 2070 + return map; 2071 2071 + } 2072 2072 + 2073 2073 + @override 2074 2074 + String toString() { 2075 2075 + return (StringBuffer('SearchHistoryCompanion(') 2076 2076 + ..write('id: $id, ') 2077 2077 + ..write('query: $query, ') 2078 2078 + ..write('type: $type, ') 2079 2079 + ..write('searchedAt: $searchedAt, ') 2080 2080 + ..write('accountDid: $accountDid') 2081 2081 + ..write(')')) 2082 2082 + .toString(); 2083 2083 + } 2084 2084 + } 2085 2085 + 1791 2086 abstract class _$AppDatabase extends GeneratedDatabase { 1792 2087 _$AppDatabase(QueryExecutor e) : super(e); 1793 2088 $AppDatabaseManager get managers => $AppDatabaseManager(this); ··· 1796 2091 late final $CachedPostsTable cachedPosts = $CachedPostsTable(this); 1797 2092 late final $SettingsTable settings = $SettingsTable(this); 1798 2093 late final $SavedFeedsTable savedFeeds = $SavedFeedsTable(this); 2094 2094 + late final $SearchHistoryTable searchHistory = $SearchHistoryTable(this); 1799 2095 @override 1800 2096 Iterable<TableInfo<Table, Object?>> get allTables => allSchemaEntities.whereType<TableInfo<Table, Object?>>(); 1801 2097 @override 1802 1802 - List<DatabaseSchemaEntity> get allSchemaEntities => [accounts, cachedProfiles, cachedPosts, settings, savedFeeds]; 2098 2098 + List<DatabaseSchemaEntity> get allSchemaEntities => [ 2099 2099 + accounts, 2100 2100 + cachedProfiles, 2101 2101 + cachedPosts, 2102 2102 + settings, 2103 2103 + savedFeeds, 2104 2104 + searchHistory, 2105 2105 + ]; 1803 2106 } 1804 2107 1805 2108 typedef $$AccountsTableCreateCompanionBuilder = ··· 2674 2977 SavedFeedEntry, 2675 2978 PrefetchHooks Function() 2676 2979 >; 2980 2980 + typedef $$SearchHistoryTableCreateCompanionBuilder = 2981 2981 + SearchHistoryCompanion Function({ 2982 2982 + Value<int> id, 2983 2983 + required String query, 2984 2984 + required String type, 2985 2985 + Value<DateTime> searchedAt, 2986 2986 + required String accountDid, 2987 2987 + }); 2988 2988 + typedef $$SearchHistoryTableUpdateCompanionBuilder = 2989 2989 + SearchHistoryCompanion Function({ 2990 2990 + Value<int> id, 2991 2991 + Value<String> query, 2992 2992 + Value<String> type, 2993 2993 + Value<DateTime> searchedAt, 2994 2994 + Value<String> accountDid, 2995 2995 + }); 2996 2996 + 2997 2997 + class $$SearchHistoryTableFilterComposer extends Composer<_$AppDatabase, $SearchHistoryTable> { 2998 2998 + $$SearchHistoryTableFilterComposer({ 2999 2999 + required super.$db, 3000 3000 + required super.$table, 3001 3001 + super.joinBuilder, 3002 3002 + super.$addJoinBuilderToRootComposer, 3003 3003 + super.$removeJoinBuilderFromRootComposer, 3004 3004 + }); 3005 3005 + ColumnFilters<int> get id => $composableBuilder(column: $table.id, builder: (column) => ColumnFilters(column)); 3006 3006 + 3007 3007 + ColumnFilters<String> get query => 3008 3008 + $composableBuilder(column: $table.query, builder: (column) => ColumnFilters(column)); 3009 3009 + 3010 3010 + ColumnFilters<String> get type => $composableBuilder(column: $table.type, builder: (column) => ColumnFilters(column)); 3011 3011 + 3012 3012 + ColumnFilters<DateTime> get searchedAt => 3013 3013 + $composableBuilder(column: $table.searchedAt, builder: (column) => ColumnFilters(column)); 3014 3014 + 3015 3015 + ColumnFilters<String> get accountDid => 3016 3016 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnFilters(column)); 3017 3017 + } 3018 3018 + 3019 3019 + class $$SearchHistoryTableOrderingComposer extends Composer<_$AppDatabase, $SearchHistoryTable> { 3020 3020 + $$SearchHistoryTableOrderingComposer({ 3021 3021 + required super.$db, 3022 3022 + required super.$table, 3023 3023 + super.joinBuilder, 3024 3024 + super.$addJoinBuilderToRootComposer, 3025 3025 + super.$removeJoinBuilderFromRootComposer, 3026 3026 + }); 3027 3027 + ColumnOrderings<int> get id => $composableBuilder(column: $table.id, builder: (column) => ColumnOrderings(column)); 3028 3028 + 3029 3029 + ColumnOrderings<String> get query => 3030 3030 + $composableBuilder(column: $table.query, builder: (column) => ColumnOrderings(column)); 3031 3031 + 3032 3032 + ColumnOrderings<String> get type => 3033 3033 + $composableBuilder(column: $table.type, builder: (column) => ColumnOrderings(column)); 3034 3034 + 3035 3035 + ColumnOrderings<DateTime> get searchedAt => 3036 3036 + $composableBuilder(column: $table.searchedAt, builder: (column) => ColumnOrderings(column)); 3037 3037 + 3038 3038 + ColumnOrderings<String> get accountDid => 3039 3039 + $composableBuilder(column: $table.accountDid, builder: (column) => ColumnOrderings(column)); 3040 3040 + } 3041 3041 + 3042 3042 + class $$SearchHistoryTableAnnotationComposer extends Composer<_$AppDatabase, $SearchHistoryTable> { 3043 3043 + $$SearchHistoryTableAnnotationComposer({ 3044 3044 + required super.$db, 3045 3045 + required super.$table, 3046 3046 + super.joinBuilder, 3047 3047 + super.$addJoinBuilderToRootComposer, 3048 3048 + super.$removeJoinBuilderFromRootComposer, 3049 3049 + }); 3050 3050 + GeneratedColumn<int> get id => $composableBuilder(column: $table.id, builder: (column) => column); 3051 3051 + 3052 3052 + GeneratedColumn<String> get query => $composableBuilder(column: $table.query, builder: (column) => column); 3053 3053 + 3054 3054 + GeneratedColumn<String> get type => $composableBuilder(column: $table.type, builder: (column) => column); 3055 3055 + 3056 3056 + GeneratedColumn<DateTime> get searchedAt => 3057 3057 + $composableBuilder(column: $table.searchedAt, builder: (column) => column); 3058 3058 + 3059 3059 + GeneratedColumn<String> get accountDid => $composableBuilder(column: $table.accountDid, builder: (column) => column); 3060 3060 + } 3061 3061 + 3062 3062 + class $$SearchHistoryTableTableManager 3063 3063 + extends 3064 3064 + RootTableManager< 3065 3065 + _$AppDatabase, 3066 3066 + $SearchHistoryTable, 3067 3067 + SearchHistoryEntry, 3068 3068 + $$SearchHistoryTableFilterComposer, 3069 3069 + $$SearchHistoryTableOrderingComposer, 3070 3070 + $$SearchHistoryTableAnnotationComposer, 3071 3071 + $$SearchHistoryTableCreateCompanionBuilder, 3072 3072 + $$SearchHistoryTableUpdateCompanionBuilder, 3073 3073 + (SearchHistoryEntry, BaseReferences<_$AppDatabase, $SearchHistoryTable, SearchHistoryEntry>), 3074 3074 + SearchHistoryEntry, 3075 3075 + PrefetchHooks Function() 3076 3076 + > { 3077 3077 + $$SearchHistoryTableTableManager(_$AppDatabase db, $SearchHistoryTable table) 3078 3078 + : super( 3079 3079 + TableManagerState( 3080 3080 + db: db, 3081 3081 + table: table, 3082 3082 + createFilteringComposer: () => $$SearchHistoryTableFilterComposer($db: db, $table: table), 3083 3083 + createOrderingComposer: () => $$SearchHistoryTableOrderingComposer($db: db, $table: table), 3084 3084 + createComputedFieldComposer: () => $$SearchHistoryTableAnnotationComposer($db: db, $table: table), 3085 3085 + updateCompanionCallback: 3086 3086 + ({ 3087 3087 + Value<int> id = const Value.absent(), 3088 3088 + Value<String> query = const Value.absent(), 3089 3089 + Value<String> type = const Value.absent(), 3090 3090 + Value<DateTime> searchedAt = const Value.absent(), 3091 3091 + Value<String> accountDid = const Value.absent(), 3092 3092 + }) => SearchHistoryCompanion( 3093 3093 + id: id, 3094 3094 + query: query, 3095 3095 + type: type, 3096 3096 + searchedAt: searchedAt, 3097 3097 + accountDid: accountDid, 3098 3098 + ), 3099 3099 + createCompanionCallback: 3100 3100 + ({ 3101 3101 + Value<int> id = const Value.absent(), 3102 3102 + required String query, 3103 3103 + required String type, 3104 3104 + Value<DateTime> searchedAt = const Value.absent(), 3105 3105 + required String accountDid, 3106 3106 + }) => SearchHistoryCompanion.insert( 3107 3107 + id: id, 3108 3108 + query: query, 3109 3109 + type: type, 3110 3110 + searchedAt: searchedAt, 3111 3111 + accountDid: accountDid, 3112 3112 + ), 3113 3113 + withReferenceMapper: (p0) => p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(), 3114 3114 + prefetchHooksCallback: null, 3115 3115 + ), 3116 3116 + ); 3117 3117 + } 3118 3118 + 3119 3119 + typedef $$SearchHistoryTableProcessedTableManager = 3120 3120 + ProcessedTableManager< 3121 3121 + _$AppDatabase, 3122 3122 + $SearchHistoryTable, 3123 3123 + SearchHistoryEntry, 3124 3124 + $$SearchHistoryTableFilterComposer, 3125 3125 + $$SearchHistoryTableOrderingComposer, 3126 3126 + $$SearchHistoryTableAnnotationComposer, 3127 3127 + $$SearchHistoryTableCreateCompanionBuilder, 3128 3128 + $$SearchHistoryTableUpdateCompanionBuilder, 3129 3129 + (SearchHistoryEntry, BaseReferences<_$AppDatabase, $SearchHistoryTable, SearchHistoryEntry>), 3130 3130 + SearchHistoryEntry, 3131 3131 + PrefetchHooks Function() 3132 3132 + >; 2677 3133 2678 3134 class $AppDatabaseManager { 2679 3135 final _$AppDatabase _db; ··· 2683 3139 $$CachedPostsTableTableManager get cachedPosts => $$CachedPostsTableTableManager(_db, _db.cachedPosts); 2684 3140 $$SettingsTableTableManager get settings => $$SettingsTableTableManager(_db, _db.settings); 2685 3141 $$SavedFeedsTableTableManager get savedFeeds => $$SavedFeedsTableTableManager(_db, _db.savedFeeds); 3142 3142 + $$SearchHistoryTableTableManager get searchHistory => $$SearchHistoryTableTableManager(_db, _db.searchHistory); 2686 3143 }

+9

lib/core/database/tables.dart

reviewed

··· 65 65 @override 66 66 Set<Column> get primaryKey => {id, accountDid}; 67 67 } 68 68 + 69 69 + @DataClassName('SearchHistoryEntry') 70 70 + class SearchHistory extends Table { 71 71 + IntColumn get id => integer().autoIncrement()(); 72 72 + TextColumn get query => text()(); 73 73 + TextColumn get type => text()(); 74 74 + DateTimeColumn get searchedAt => dateTime().withDefault(currentDateAndTime)(); 75 75 + TextColumn get accountDid => text()(); 76 76 + }

+6

lib/core/router/app_router.dart

reviewed

··· 10 10 import 'package:lazurite/features/feed/presentation/home_feed_screen.dart'; 11 11 import 'package:lazurite/features/logs/presentation/logs_screen.dart'; 12 12 import 'package:lazurite/features/profile/presentation/profile_screen.dart'; 13 13 + import 'package:lazurite/features/search/presentation/search_screen.dart'; 13 14 import 'package:lazurite/features/settings/presentation/about_screen.dart'; 14 15 import 'package:lazurite/features/settings/presentation/settings_screen.dart'; 15 16 ··· 19 20 final NavigatorObserver? navigatorObserver; 20 21 final GlobalKey<NavigatorState> _rootNavigatorKey = GlobalKey<NavigatorState>(debugLabel: 'root'); 21 22 final GlobalKey<NavigatorState> _homeNavigatorKey = GlobalKey<NavigatorState>(debugLabel: 'home'); 23 23 + final GlobalKey<NavigatorState> _searchNavigatorKey = GlobalKey<NavigatorState>(debugLabel: 'search'); 22 24 final GlobalKey<NavigatorState> _profileNavigatorKey = GlobalKey<NavigatorState>(debugLabel: 'profile'); 23 25 final GlobalKey<NavigatorState> _settingsNavigatorKey = GlobalKey<NavigatorState>(debugLabel: 'settings'); 24 26 ··· 54 56 routes: [GoRoute(path: 'feeds', builder: (context, state) => const FeedManagementScreen())], 55 57 ), 56 58 ], 59 59 + ), 60 60 + StatefulShellBranch( 61 61 + navigatorKey: _searchNavigatorKey, 62 62 + routes: [GoRoute(path: '/search', builder: (context, state) => const SearchScreen())], 57 63 ), 58 64 StatefulShellBranch( 59 65 navigatorKey: _profileNavigatorKey,

+1

lib/core/router/app_shell.dart

reviewed

··· 24 24 25 25 List<Widget> get _destinations => const [ 26 26 NavigationDestination(icon: Icon(Icons.home_outlined), selectedIcon: Icon(Icons.home), label: 'Home'), 27 27 + NavigationDestination(icon: Icon(Icons.search_outlined), selectedIcon: Icon(Icons.search), label: 'Search'), 27 28 NavigationDestination(icon: Icon(Icons.person_outline), selectedIcon: Icon(Icons.person), label: 'Profile'), 28 29 NavigationDestination(icon: Icon(Icons.settings_outlined), selectedIcon: Icon(Icons.settings), label: 'Settings'), 29 30 ];

+3 -1

lib/features/devtools/cubit/dev_tools_state.dart

reviewed

··· 106 106 : selectedCollection as String?, 107 107 records: identical(records, _devToolsStateNoChange) ? this.records : records as List<RepoListRecordsRecord>?, 108 108 recordsCursor: identical(recordsCursor, _devToolsStateNoChange) ? this.recordsCursor : recordsCursor as String?, 109 109 - selectedRecord: identical(selectedRecord, _devToolsStateNoChange) ? this.selectedRecord : selectedRecord as RecordInfo?, 109 109 + selectedRecord: identical(selectedRecord, _devToolsStateNoChange) 110 110 + ? this.selectedRecord 111 111 + : selectedRecord as RecordInfo?, 110 112 errorMessage: identical(errorMessage, _devToolsStateNoChange) ? this.errorMessage : errorMessage as String?, 111 113 ); 112 114 }

+267

lib/features/search/bloc/search_bloc.dart

reviewed

··· 1 1 + import 'dart:async'; 2 2 + 3 3 + import 'package:bluesky/app_bsky_actor_defs.dart'; 4 4 + import 'package:bluesky/app_bsky_feed_defs.dart'; 5 5 + import 'package:equatable/equatable.dart'; 6 6 + import 'package:flutter_bloc/flutter_bloc.dart'; 7 7 + import 'package:lazurite/core/database/app_database.dart'; 8 8 + import 'package:lazurite/features/search/data/search_repository.dart'; 9 9 + 10 10 + part 'search_state.dart'; 11 11 + 12 12 + class SearchBloc extends Bloc<SearchEvent, SearchState> { 13 13 + SearchBloc({required SearchRepository searchRepository, required AppDatabase database, required String accountDid}) 14 14 + : _searchRepository = searchRepository, 15 15 + _database = database, 16 16 + _accountDid = accountDid, 17 17 + super(const SearchState.initial()) { 18 18 + on<QuerySubmitted>(_onQuerySubmitted); 19 19 + on<SearchTabChanged>(_onSearchTabChanged); 20 20 + on<SearchSortChanged>(_onSearchSortChanged); 21 21 + on<LoadMoreRequested>(_onLoadMoreRequested); 22 22 + on<TypeaheadRequested>(_onTypeaheadRequested); 23 23 + on<TypeaheadResultsLoaded>(_onTypeaheadResultsLoaded); 24 24 + on<HistoryLoaded>(_onHistoryLoaded); 25 25 + on<HistoryEntryDeleted>(_onHistoryEntryDeleted); 26 26 + on<HistoryCleared>(_onHistoryCleared); 27 27 + on<QueryCleared>(_onQueryCleared); 28 28 + 29 29 + add(const HistoryLoaded()); 30 30 + } 31 31 + 32 32 + final SearchRepository _searchRepository; 33 33 + final AppDatabase _database; 34 34 + final String _accountDid; 35 35 + Timer? _debounceTimer; 36 36 + 37 37 + Future<void> _onQuerySubmitted(QuerySubmitted event, Emitter<SearchState> emit) async { 38 38 + final query = event.query.trim(); 39 39 + if (query.isEmpty) { 40 40 + emit(const SearchState.initial()); 41 41 + add(const HistoryLoaded()); 42 42 + return; 43 43 + } 44 44 + 45 45 + final currentTab = state.currentTab; 46 46 + final currentSort = state.currentSort; 47 47 + 48 48 + if (currentTab == SearchTab.posts) { 49 49 + emit(SearchState.loadingPosts(query: query, sort: currentSort)); 50 50 + 51 51 + try { 52 52 + final result = await _searchRepository.searchPosts(query: query, sort: currentSort, limit: 50); 53 53 + await _database.addSearchHistoryEntry(query: query, type: 'posts', accountDid: _accountDid); 54 54 + final history = await _database.getSearchHistory(_accountDid, limit: 50); 55 55 + 56 56 + emit( 57 57 + SearchState.loadedPosts( 58 58 + query: query, 59 59 + sort: currentSort, 60 60 + posts: result.posts, 61 61 + cursor: result.cursor, 62 62 + hitsTotal: result.hitsTotal, 63 63 + ).copyWith(searchHistory: history), 64 64 + ); 65 65 + } catch (error) { 66 66 + emit(SearchState.error(query: query, message: 'Failed to search posts: $error')); 67 67 + } 68 68 + } else { 69 69 + emit(SearchState.loadingActors(query: query)); 70 70 + 71 71 + try { 72 72 + final result = await _searchRepository.searchActors(query: query, limit: 50); 73 73 + await _database.addSearchHistoryEntry(query: query, type: 'actors', accountDid: _accountDid); 74 74 + final history = await _database.getSearchHistory(_accountDid, limit: 50); 75 75 + 76 76 + emit( 77 77 + SearchState.loadedActors( 78 78 + query: query, 79 79 + actors: result.actors, 80 80 + cursor: result.cursor, 81 81 + ).copyWith(searchHistory: history), 82 82 + ); 83 83 + } catch (error) { 84 84 + emit(SearchState.error(query: query, message: 'Failed to search actors: $error')); 85 85 + } 86 86 + } 87 87 + } 88 88 + 89 89 + Future<void> _onSearchTabChanged(SearchTabChanged event, Emitter<SearchState> emit) async { 90 90 + if (state.currentTab == event.tab) return; 91 91 + 92 92 + emit(state.copyWith(currentTab: event.tab)); 93 93 + 94 94 + if (state.query.isNotEmpty) { 95 95 + add(QuerySubmitted(query: state.query)); 96 96 + } 97 97 + } 98 98 + 99 99 + Future<void> _onSearchSortChanged(SearchSortChanged event, Emitter<SearchState> emit) async { 100 100 + if (state.currentSort == event.sort) return; 101 101 + 102 102 + emit(state.copyWith(currentSort: event.sort)); 103 103 + 104 104 + if (state.query.isNotEmpty && state.currentTab == SearchTab.posts) { 105 105 + add(QuerySubmitted(query: state.query)); 106 106 + } 107 107 + } 108 108 + 109 109 + Future<void> _onLoadMoreRequested(LoadMoreRequested event, Emitter<SearchState> emit) async { 110 110 + if (state.isLoadingMore || state.cursor == null) return; 111 111 + 112 112 + emit(state.copyWith(isLoadingMore: true)); 113 113 + 114 114 + try { 115 115 + if (state.currentTab == SearchTab.posts) { 116 116 + final result = await _searchRepository.searchPosts( 117 117 + query: state.query, 118 118 + sort: state.currentSort, 119 119 + cursor: state.cursor, 120 120 + limit: 50, 121 121 + ); 122 122 + 123 123 + emit(state.copyWith(posts: [...state.posts, ...result.posts], cursor: result.cursor, isLoadingMore: false)); 124 124 + } else { 125 125 + final result = await _searchRepository.searchActors(query: state.query, cursor: state.cursor, limit: 50); 126 126 + 127 127 + emit(state.copyWith(actors: [...state.actors, ...result.actors], cursor: result.cursor, isLoadingMore: false)); 128 128 + } 129 129 + } catch (error) { 130 130 + emit(state.copyWith(isLoadingMore: false)); 131 131 + } 132 132 + } 133 133 + 134 134 + Future<void> _onTypeaheadRequested(TypeaheadRequested event, Emitter<SearchState> emit) async { 135 135 + final query = event.query.trim(); 136 136 + 137 137 + _debounceTimer?.cancel(); 138 138 + 139 139 + if (!query.startsWith('@')) { 140 140 + emit(state.copyWith(typeaheadActors: [])); 141 141 + return; 142 142 + } 143 143 + 144 144 + final handleQuery = query.substring(1).trim(); 145 145 + if (handleQuery.isEmpty) { 146 146 + emit(state.copyWith(typeaheadActors: [])); 147 147 + return; 148 148 + } 149 149 + 150 150 + _debounceTimer = Timer(const Duration(milliseconds: 300), () { 151 151 + add(TypeaheadResultsLoaded(query: handleQuery)); 152 152 + }); 153 153 + } 154 154 + 155 155 + Future<void> _onTypeaheadResultsLoaded(TypeaheadResultsLoaded event, Emitter<SearchState> emit) async { 156 156 + try { 157 157 + final actors = await _searchRepository.searchActorsTypeahead(query: event.query, limit: 5); 158 158 + emit(state.copyWith(typeaheadActors: actors)); 159 159 + } catch (_) { 160 160 + emit(state.copyWith(typeaheadActors: [])); 161 161 + } 162 162 + } 163 163 + 164 164 + Future<void> _onHistoryLoaded(HistoryLoaded event, Emitter<SearchState> emit) async { 165 165 + final entries = await _database.getSearchHistory(_accountDid, limit: 50); 166 166 + emit(state.copyWith(searchHistory: entries)); 167 167 + } 168 168 + 169 169 + Future<void> _onHistoryEntryDeleted(HistoryEntryDeleted event, Emitter<SearchState> emit) async { 170 170 + await _database.deleteSearchHistoryEntry(event.id); 171 171 + final entries = await _database.getSearchHistory(_accountDid, limit: 50); 172 172 + emit(state.copyWith(searchHistory: entries)); 173 173 + } 174 174 + 175 175 + Future<void> _onHistoryCleared(HistoryCleared event, Emitter<SearchState> emit) async { 176 176 + await _database.clearSearchHistory(_accountDid); 177 177 + emit(state.copyWith(searchHistory: [])); 178 178 + } 179 179 + 180 180 + void _onQueryCleared(QueryCleared event, Emitter<SearchState> emit) { 181 181 + emit(const SearchState.initial()); 182 182 + add(const HistoryLoaded()); 183 183 + } 184 184 + 185 185 + @override 186 186 + Future<void> close() { 187 187 + _debounceTimer?.cancel(); 188 188 + return super.close(); 189 189 + } 190 190 + } 191 191 + 192 192 + abstract class SearchEvent extends Equatable { 193 193 + const SearchEvent(); 194 194 + 195 195 + @override 196 196 + List<Object?> get props => []; 197 197 + } 198 198 + 199 199 + class QuerySubmitted extends SearchEvent { 200 200 + const QuerySubmitted({required this.query}); 201 201 + 202 202 + final String query; 203 203 + 204 204 + @override 205 205 + List<Object?> get props => [query]; 206 206 + } 207 207 + 208 208 + class SearchTabChanged extends SearchEvent { 209 209 + const SearchTabChanged({required this.tab}); 210 210 + 211 211 + final SearchTab tab; 212 212 + 213 213 + @override 214 214 + List<Object?> get props => [tab]; 215 215 + } 216 216 + 217 217 + class SearchSortChanged extends SearchEvent { 218 218 + const SearchSortChanged({required this.sort}); 219 219 + 220 220 + final String sort; 221 221 + 222 222 + @override 223 223 + List<Object?> get props => [sort]; 224 224 + } 225 225 + 226 226 + class LoadMoreRequested extends SearchEvent { 227 227 + const LoadMoreRequested(); 228 228 + } 229 229 + 230 230 + class TypeaheadRequested extends SearchEvent { 231 231 + const TypeaheadRequested({required this.query}); 232 232 + 233 233 + final String query; 234 234 + 235 235 + @override 236 236 + List<Object?> get props => [query]; 237 237 + } 238 238 + 239 239 + class TypeaheadResultsLoaded extends SearchEvent { 240 240 + const TypeaheadResultsLoaded({required this.query}); 241 241 + 242 242 + final String query; 243 243 + 244 244 + @override 245 245 + List<Object?> get props => [query]; 246 246 + } 247 247 + 248 248 + class HistoryLoaded extends SearchEvent { 249 249 + const HistoryLoaded(); 250 250 + } 251 251 + 252 252 + class HistoryEntryDeleted extends SearchEvent { 253 253 + const HistoryEntryDeleted({required this.id}); 254 254 + 255 255 + final int id; 256 256 + 257 257 + @override 258 258 + List<Object?> get props => [id]; 259 259 + } 260 260 + 261 261 + class HistoryCleared extends SearchEvent { 262 262 + const HistoryCleared(); 263 263 + } 264 264 + 265 265 + class QueryCleared extends SearchEvent { 266 266 + const QueryCleared(); 267 267 + }

+141

lib/features/search/bloc/search_state.dart

reviewed

··· 1 1 + part of 'search_bloc.dart'; 2 2 + 3 3 + enum SearchTab { posts, actors } 4 4 + 5 5 + extension SearchTabLabel on SearchTab { 6 6 + String get label => switch (this) { 7 7 + SearchTab.posts => 'Posts', 8 8 + SearchTab.actors => 'People', 9 9 + }; 10 10 + } 11 11 + 12 12 + enum SearchSort { 13 13 + top, 14 14 + latest; 15 15 + 16 16 + factory SearchSort.fromString(String value) { 17 17 + return switch (value) { 18 18 + 'top' => SearchSort.top, 19 19 + _ => SearchSort.latest, 20 20 + }; 21 21 + } 22 22 + } 23 23 + 24 24 + extension SearchSortLabel on SearchSort { 25 25 + String get label => switch (this) { 26 26 + SearchSort.top => 'Top', 27 27 + SearchSort.latest => 'Latest', 28 28 + }; 29 29 + } 30 30 + 31 31 + enum SearchStatus { initial, loading, loaded, error } 32 32 + 33 33 + class SearchState extends Equatable { 34 34 + const SearchState._({ 35 35 + required this.status, 36 36 + this.query = '', 37 37 + this.currentTab = SearchTab.posts, 38 38 + this.currentSort = 'top', 39 39 + this.posts = const [], 40 40 + this.actors = const [], 41 41 + this.cursor, 42 42 + this.hitsTotal, 43 43 + this.errorMessage, 44 44 + this.isLoadingMore = false, 45 45 + this.typeaheadActors = const [], 46 46 + this.searchHistory = const [], 47 47 + }); 48 48 + 49 49 + const SearchState.initial() : this._(status: SearchStatus.initial); 50 50 + 51 51 + const SearchState.loadingPosts({required String query, required String sort}) 52 52 + : this._(status: SearchStatus.loading, query: query, currentSort: sort); 53 53 + 54 54 + const SearchState.loadingActors({required String query}) 55 55 + : this._(status: SearchStatus.loading, query: query, currentTab: SearchTab.actors); 56 56 + 57 57 + const SearchState.loadedPosts({ 58 58 + required String query, 59 59 + required String sort, 60 60 + required List<PostView> posts, 61 61 + String? cursor, 62 62 + int? hitsTotal, 63 63 + }) : this._( 64 64 + status: SearchStatus.loaded, 65 65 + query: query, 66 66 + currentSort: sort, 67 67 + posts: posts, 68 68 + cursor: cursor, 69 69 + hitsTotal: hitsTotal, 70 70 + ); 71 71 + 72 72 + const SearchState.loadedActors({required String query, required List<ProfileView> actors, String? cursor}) 73 73 + : this._(status: SearchStatus.loaded, query: query, currentTab: SearchTab.actors, actors: actors, cursor: cursor); 74 74 + 75 75 + const SearchState.error({required String query, required String message}) 76 76 + : this._(status: SearchStatus.error, query: query, errorMessage: message); 77 77 + 78 78 + final SearchStatus status; 79 79 + final String query; 80 80 + final SearchTab currentTab; 81 81 + final String currentSort; 82 82 + final List<PostView> posts; 83 83 + final List<ProfileView> actors; 84 84 + final String? cursor; 85 85 + final int? hitsTotal; 86 86 + final String? errorMessage; 87 87 + final bool isLoadingMore; 88 88 + final List<ProfileViewBasic> typeaheadActors; 89 89 + final List<SearchHistoryEntry> searchHistory; 90 90 + 91 91 + bool get isLoading => status == SearchStatus.loading; 92 92 + bool get hasError => status == SearchStatus.error; 93 93 + bool get hasResults => posts.isNotEmpty || actors.isNotEmpty; 94 94 + bool get hasMore => cursor != null; 95 95 + 96 96 + SearchState copyWith({ 97 97 + SearchStatus? status, 98 98 + String? query, 99 99 + SearchTab? currentTab, 100 100 + String? currentSort, 101 101 + List<PostView>? posts, 102 102 + List<ProfileView>? actors, 103 103 + String? cursor, 104 104 + int? hitsTotal, 105 105 + String? errorMessage, 106 106 + bool? isLoadingMore, 107 107 + List<ProfileViewBasic>? typeaheadActors, 108 108 + List<SearchHistoryEntry>? searchHistory, 109 109 + }) { 110 110 + return SearchState._( 111 111 + status: status ?? this.status, 112 112 + query: query ?? this.query, 113 113 + currentTab: currentTab ?? this.currentTab, 114 114 + currentSort: currentSort ?? this.currentSort, 115 115 + posts: posts ?? this.posts, 116 116 + actors: actors ?? this.actors, 117 117 + cursor: cursor ?? this.cursor, 118 118 + hitsTotal: hitsTotal ?? this.hitsTotal, 119 119 + errorMessage: errorMessage ?? this.errorMessage, 120 120 + isLoadingMore: isLoadingMore ?? this.isLoadingMore, 121 121 + typeaheadActors: typeaheadActors ?? this.typeaheadActors, 122 122 + searchHistory: searchHistory ?? this.searchHistory, 123 123 + ); 124 124 + } 125 125 + 126 126 + @override 127 127 + List<Object?> get props => [ 128 128 + status, 129 129 + query, 130 130 + currentTab, 131 131 + currentSort, 132 132 + posts, 133 133 + actors, 134 134 + cursor, 135 135 + hitsTotal, 136 136 + errorMessage, 137 137 + isLoadingMore, 138 138 + typeaheadActors, 139 139 + searchHistory, 140 140 + ]; 141 141 + }

+56

lib/features/search/data/search_repository.dart

reviewed

··· 1 1 + import 'package:bluesky/app_bsky_actor_defs.dart'; 2 2 + import 'package:bluesky/app_bsky_feed_defs.dart'; 3 3 + import 'package:bluesky/app_bsky_feed_searchposts.dart'; 4 4 + import 'package:bluesky/bluesky.dart'; 5 5 + 6 6 + class SearchRepository { 7 7 + SearchRepository({required Bluesky bluesky}) : _bluesky = bluesky; 8 8 + 9 9 + final Bluesky _bluesky; 10 10 + 11 11 + Future<SearchPostsResult> searchPosts({ 12 12 + required String query, 13 13 + String sort = 'top', 14 14 + String? cursor, 15 15 + int limit = 50, 16 16 + }) async { 17 17 + final sortValue = sort == 'latest' 18 18 + ? const FeedSearchPostsSort.knownValue(data: KnownFeedSearchPostsSort.latest) 19 19 + : const FeedSearchPostsSort.knownValue(data: KnownFeedSearchPostsSort.top); 20 20 + 21 21 + final response = await _bluesky.feed.searchPosts(q: query, sort: sortValue, cursor: cursor, limit: limit); 22 22 + 23 23 + return SearchPostsResult( 24 24 + posts: response.data.posts, 25 25 + cursor: response.data.cursor, 26 26 + hitsTotal: response.data.hitsTotal, 27 27 + ); 28 28 + } 29 29 + 30 30 + Future<SearchActorsResult> searchActors({required String query, String? cursor, int limit = 50}) async { 31 31 + final response = await _bluesky.actor.searchActors(q: query, cursor: cursor, limit: limit); 32 32 + 33 33 + return SearchActorsResult(actors: response.data.actors, cursor: response.data.cursor); 34 34 + } 35 35 + 36 36 + Future<List<ProfileViewBasic>> searchActorsTypeahead({required String query, int limit = 10}) async { 37 37 + final response = await _bluesky.actor.searchActorsTypeahead(q: query, limit: limit); 38 38 + 39 39 + return response.data.actors; 40 40 + } 41 41 + } 42 42 + 43 43 + class SearchPostsResult { 44 44 + SearchPostsResult({required this.posts, this.cursor, this.hitsTotal}); 45 45 + 46 46 + final List<PostView> posts; 47 47 + final String? cursor; 48 48 + final int? hitsTotal; 49 49 + } 50 50 + 51 51 + class SearchActorsResult { 52 52 + SearchActorsResult({required this.actors, this.cursor}); 53 53 + 54 54 + final List<ProfileView> actors; 55 55 + final String? cursor; 56 56 + }

+796

lib/features/search/presentation/search_screen.dart

reviewed

··· 1 1 + import 'package:bluesky/app_bsky_actor_defs.dart'; 2 2 + import 'package:bluesky/app_bsky_feed_defs.dart'; 3 3 + import 'package:bluesky/app_bsky_feed_post.dart'; 4 4 + import 'package:flutter/material.dart'; 5 5 + import 'package:flutter_bloc/flutter_bloc.dart'; 6 6 + import 'package:go_router/go_router.dart'; 7 7 + import 'package:intl/intl.dart'; 8 8 + import 'package:lazurite/features/feed/presentation/widgets/facet_text.dart'; 9 9 + import 'package:lazurite/features/search/bloc/search_bloc.dart'; 10 10 + 11 11 + class SearchScreen extends StatefulWidget { 12 12 + const SearchScreen({super.key}); 13 13 + 14 14 + @override 15 15 + State<SearchScreen> createState() => _SearchScreenState(); 16 16 + } 17 17 + 18 18 + class _SearchScreenState extends State<SearchScreen> { 19 19 + final TextEditingController _searchController = TextEditingController(); 20 20 + final FocusNode _focusNode = FocusNode(); 21 21 + final ScrollController _scrollController = ScrollController(); 22 22 + 23 23 + @override 24 24 + void initState() { 25 25 + super.initState(); 26 26 + _searchController.addListener(_onSearchChanged); 27 27 + _scrollController.addListener(_onScroll); 28 28 + } 29 29 + 30 30 + @override 31 31 + void dispose() { 32 32 + _searchController.removeListener(_onSearchChanged); 33 33 + _searchController.dispose(); 34 34 + _focusNode.dispose(); 35 35 + _scrollController.dispose(); 36 36 + super.dispose(); 37 37 + } 38 38 + 39 39 + void _onSearchChanged() { 40 40 + setState(() {}); 41 41 + context.read<SearchBloc>().add(TypeaheadRequested(query: _searchController.text)); 42 42 + } 43 43 + 44 44 + void _onScroll() { 45 45 + if (_scrollController.position.pixels >= _scrollController.position.maxScrollExtent - 200) { 46 46 + context.read<SearchBloc>().add(const LoadMoreRequested()); 47 47 + } 48 48 + } 49 49 + 50 50 + void _onSubmit(String query) { 51 51 + if (query.trim().isEmpty) return; 52 52 + context.read<SearchBloc>().add(QuerySubmitted(query: query)); 53 53 + _focusNode.unfocus(); 54 54 + } 55 55 + 56 56 + void _onCancel() { 57 57 + _searchController.clear(); 58 58 + setState(() {}); 59 59 + context.read<SearchBloc>().add(const QueryCleared()); 60 60 + } 61 61 + 62 62 + void _onTabChanged(SearchTab tab) { 63 63 + context.read<SearchBloc>().add(SearchTabChanged(tab: tab)); 64 64 + } 65 65 + 66 66 + void _onSortChanged(String sort) { 67 67 + context.read<SearchBloc>().add(SearchSortChanged(sort: sort)); 68 68 + } 69 69 + 70 70 + void _onHistoryTap(String query, String type) { 71 71 + _searchController.text = query; 72 72 + final tab = type == 'posts' ? SearchTab.posts : SearchTab.actors; 73 73 + context.read<SearchBloc>().add(SearchTabChanged(tab: tab)); 74 74 + context.read<SearchBloc>().add(QuerySubmitted(query: query)); 75 75 + _focusNode.unfocus(); 76 76 + } 77 77 + 78 78 + void _onHistoryDelete(int id) { 79 79 + context.read<SearchBloc>().add(HistoryEntryDeleted(id: id)); 80 80 + } 81 81 + 82 82 + void _onClearHistory() { 83 83 + showDialog( 84 84 + context: context, 85 85 + builder: (context) => AlertDialog( 86 86 + title: const Text('Clear search history?'), 87 87 + content: const Text('This will delete all your recent searches.'), 88 88 + actions: [ 89 89 + TextButton(onPressed: () => Navigator.pop(context), child: const Text('Cancel')), 90 90 + TextButton( 91 91 + onPressed: () { 92 92 + Navigator.pop(context); 93 93 + context.read<SearchBloc>().add(const HistoryCleared()); 94 94 + }, 95 95 + child: const Text('Clear'), 96 96 + ), 97 97 + ], 98 98 + ), 99 99 + ); 100 100 + } 101 101 + 102 102 + @override 103 103 + Widget build(BuildContext context) { 104 104 + return Scaffold( 105 105 + body: SafeArea( 106 106 + child: BlocBuilder<SearchBloc, SearchState>( 107 107 + builder: (context, state) { 108 108 + return Column( 109 109 + children: [ 110 110 + _buildSearchBar(context, state), 111 111 + _buildTabs(context, state), 112 112 + if (state.currentTab == SearchTab.posts && state.hasResults) _buildSortToggle(context, state), 113 113 + Expanded(child: _buildBody(context, state)), 114 114 + ], 115 115 + ); 116 116 + }, 117 117 + ), 118 118 + ), 119 119 + ); 120 120 + } 121 121 + 122 122 + Widget _buildSearchBar(BuildContext context, SearchState state) { 123 123 + final hasText = _searchController.text.isNotEmpty; 124 124 + final theme = Theme.of(context); 125 125 + return Container( 126 126 + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 12), 127 127 + decoration: BoxDecoration( 128 128 + border: Border(bottom: BorderSide(color: theme.dividerColor)), 129 129 + ), 130 130 + child: Row( 131 131 + children: [ 132 132 + Expanded( 133 133 + child: TextField( 134 134 + controller: _searchController, 135 135 + focusNode: _focusNode, 136 136 + onSubmitted: _onSubmit, 137 137 + textInputAction: TextInputAction.search, 138 138 + decoration: InputDecoration( 139 139 + hintText: 'Search posts or people', 140 140 + prefixIcon: const Icon(Icons.search, size: 20), 141 141 + suffixIcon: hasText ? _buildSuffixIcon(context, theme) : null, 142 142 + border: OutlineInputBorder(borderRadius: BorderRadius.circular(999)), 143 143 + contentPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 0), 144 144 + filled: true, 145 145 + fillColor: theme.colorScheme.surfaceContainerHighest, 146 146 + enabledBorder: OutlineInputBorder( 147 147 + borderRadius: BorderRadius.circular(999), 148 148 + borderSide: BorderSide.none, 149 149 + ), 150 150 + focusedBorder: OutlineInputBorder( 151 151 + borderRadius: BorderRadius.circular(999), 152 152 + borderSide: BorderSide(color: theme.colorScheme.primary), 153 153 + ), 154 154 + ), 155 155 + ), 156 156 + ), 157 157 + ], 158 158 + ), 159 159 + ); 160 160 + } 161 161 + 162 162 + Widget _buildSuffixIcon(BuildContext context, ThemeData theme) { 163 163 + return Row( 164 164 + mainAxisSize: MainAxisSize.min, 165 165 + children: [ 166 166 + IconButton( 167 167 + onPressed: _onCancel, 168 168 + icon: const Icon(Icons.close, size: 20), 169 169 + padding: EdgeInsets.zero, 170 170 + constraints: const BoxConstraints(minWidth: 24, minHeight: 24), 171 171 + ), 172 172 + IconButton( 173 173 + onPressed: () => _onSubmit(_searchController.text), 174 174 + icon: Icon(Icons.arrow_forward_rounded, size: 20, color: theme.colorScheme.primary), 175 175 + padding: EdgeInsets.zero, 176 176 + constraints: const BoxConstraints(minWidth: 24, minHeight: 24), 177 177 + ), 178 178 + ], 179 179 + ); 180 180 + } 181 181 + 182 182 + Widget _buildTabs(BuildContext context, SearchState state) { 183 183 + return Container( 184 184 + decoration: BoxDecoration( 185 185 + border: Border(bottom: BorderSide(color: Theme.of(context).dividerColor)), 186 186 + ), 187 187 + child: Row(children: [_buildTab(context, SearchTab.posts, state), _buildTab(context, SearchTab.actors, state)]), 188 188 + ); 189 189 + } 190 190 + 191 191 + Widget _buildTab(BuildContext context, SearchTab tab, SearchState state) { 192 192 + final isSelected = state.currentTab == tab; 193 193 + final theme = Theme.of(context); 194 194 + final textStyle = theme.textTheme.bodyLarge?.copyWith( 195 195 + fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal, 196 196 + color: isSelected ? theme.colorScheme.onSurface : theme.colorScheme.onSurfaceVariant, 197 197 + ); 198 198 + return Expanded( 199 199 + child: InkWell( 200 200 + onTap: () => _onTabChanged(tab), 201 201 + child: Container( 202 202 + padding: const EdgeInsets.symmetric(vertical: 12), 203 203 + decoration: BoxDecoration( 204 204 + border: Border( 205 205 + bottom: BorderSide(color: isSelected ? theme.colorScheme.primary : Colors.transparent, width: 2), 206 206 + ), 207 207 + ), 208 208 + child: Text(tab.label, textAlign: TextAlign.center, style: textStyle), 209 209 + ), 210 210 + ), 211 211 + ); 212 212 + } 213 213 + 214 214 + Widget _buildSortToggle(BuildContext context, SearchState state) { 215 215 + final theme = Theme.of(context); 216 216 + 217 217 + return Container( 218 218 + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), 219 219 + decoration: BoxDecoration( 220 220 + border: Border(top: BorderSide(color: theme.dividerColor)), 221 221 + ), 222 222 + child: Row( 223 223 + children: [ 224 224 + Text('Sort by', style: theme.textTheme.bodySmall?.copyWith(color: theme.colorScheme.onSurfaceVariant)), 225 225 + const SizedBox(width: 8), 226 226 + Container( 227 227 + decoration: BoxDecoration( 228 228 + color: theme.colorScheme.surfaceContainerHighest, 229 229 + borderRadius: BorderRadius.circular(8), 230 230 + ), 231 231 + child: Row( 232 232 + mainAxisSize: MainAxisSize.min, 233 233 + children: [ 234 234 + _buildSortOption(context, SearchSort.top, state), 235 235 + _buildSortOption(context, SearchSort.latest, state), 236 236 + ], 237 237 + ), 238 238 + ), 239 239 + ], 240 240 + ), 241 241 + ); 242 242 + } 243 243 + 244 244 + Widget _buildSortOption(BuildContext context, SearchSort sort, SearchState state) { 245 245 + final isSelected = state.currentSort == sort.name; 246 246 + final theme = Theme.of(context); 247 247 + final labelColor = isSelected ? theme.colorScheme.onPrimary : theme.colorScheme.onSurfaceVariant; 248 248 + 249 249 + return GestureDetector( 250 250 + onTap: () => _onSortChanged(sort.name), 251 251 + child: Container( 252 252 + padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 6), 253 253 + decoration: BoxDecoration( 254 254 + color: isSelected ? theme.colorScheme.primary : null, 255 255 + borderRadius: BorderRadius.circular(8), 256 256 + ), 257 257 + child: Text( 258 258 + sort.label, 259 259 + style: theme.textTheme.bodySmall?.copyWith(fontWeight: FontWeight.w500, color: labelColor), 260 260 + ), 261 261 + ), 262 262 + ); 263 263 + } 264 264 + 265 265 + Widget _buildBody(BuildContext context, SearchState state) { 266 266 + if (state.typeaheadActors.isNotEmpty && _searchController.text.startsWith('@')) { 267 267 + return _buildTypeaheadResults(context, state); 268 268 + } 269 269 + 270 270 + if (state.query.isEmpty) { 271 271 + return _buildSearchHistory(context, state); 272 272 + } 273 273 + 274 274 + if (state.isLoading) { 275 275 + return const Center(child: CircularProgressIndicator()); 276 276 + } 277 277 + 278 278 + if (state.hasError) { 279 279 + return Center( 280 280 + child: Column( 281 281 + mainAxisAlignment: MainAxisAlignment.center, 282 282 + children: [ 283 283 + Text('Search failed', style: Theme.of(context).textTheme.titleMedium), 284 284 + const SizedBox(height: 8), 285 285 + Text( 286 286 + state.errorMessage ?? 'Unknown error', 287 287 + textAlign: TextAlign.center, 288 288 + style: Theme.of(context).textTheme.bodySmall, 289 289 + ), 290 290 + const SizedBox(height: 16), 291 291 + FilledButton( 292 292 + onPressed: () => context.read<SearchBloc>().add(QuerySubmitted(query: state.query)), 293 293 + child: const Text('Retry'), 294 294 + ), 295 295 + ], 296 296 + ), 297 297 + ); 298 298 + } 299 299 + 300 300 + if (state.currentTab == SearchTab.posts) { 301 301 + return _buildPostResults(context, state); 302 302 + } else { 303 303 + return _buildActorResults(context, state); 304 304 + } 305 305 + } 306 306 + 307 307 + Widget _buildSearchHistory(BuildContext context, SearchState state) { 308 308 + final history = state.searchHistory; 309 309 + if (history.isEmpty) { 310 310 + return const _SearchEmptyState(); 311 311 + } 312 312 + 313 313 + return Column( 314 314 + children: [ 315 315 + Container( 316 316 + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), 317 317 + child: Row( 318 318 + mainAxisAlignment: MainAxisAlignment.spaceBetween, 319 319 + children: [ 320 320 + Text('Recent Searches', style: Theme.of(context).textTheme.titleSmall), 321 321 + TextButton(onPressed: _onClearHistory, child: const Text('Clear All')), 322 322 + ], 323 323 + ), 324 324 + ), 325 325 + Expanded( 326 326 + child: ListView.builder( 327 327 + itemCount: history.length, 328 328 + itemBuilder: (context, index) { 329 329 + final entry = history[index]; 330 330 + final label = entry.type == 'posts' ? 'Posts' : 'People'; 331 331 + return Dismissible( 332 332 + key: Key('history_${entry.id}'), 333 333 + direction: DismissDirection.endToStart, 334 334 + onDismissed: (_) => _onHistoryDelete(entry.id), 335 335 + background: Container( 336 336 + alignment: Alignment.centerRight, 337 337 + padding: const EdgeInsets.only(right: 16), 338 338 + color: Theme.of(context).colorScheme.error, 339 339 + child: Icon(Icons.delete, color: Theme.of(context).colorScheme.onError), 340 340 + ), 341 341 + child: ListTile( 342 342 + leading: const Icon(Icons.history), 343 343 + title: Text(entry.query), 344 344 + subtitle: Text('$label · ${_formatHistoryTime(entry.searchedAt)}'), 345 345 + onTap: () => _onHistoryTap(entry.query, entry.type), 346 346 + ), 347 347 + ); 348 348 + }, 349 349 + ), 350 350 + ), 351 351 + ], 352 352 + ); 353 353 + } 354 354 + 355 355 + Widget _buildTypeaheadResults(BuildContext context, SearchState state) { 356 356 + return ListView.builder( 357 357 + itemCount: state.typeaheadActors.length, 358 358 + itemBuilder: (context, index) { 359 359 + final actor = state.typeaheadActors[index]; 360 360 + return _ActorListTile( 361 361 + actor: actor, 362 362 + onTap: () { 363 363 + _searchController.text = '@${actor.handle}'; 364 364 + _onSubmit('@${actor.handle}'); 365 365 + }, 366 366 + ); 367 367 + }, 368 368 + ); 369 369 + } 370 370 + 371 371 + Widget _buildPostResults(BuildContext context, SearchState state) { 372 372 + final posts = state.posts; 373 373 + if (posts.isEmpty) { 374 374 + return Center(child: Text('No posts found', style: Theme.of(context).textTheme.bodyLarge)); 375 375 + } 376 376 + 377 377 + return ListView.builder( 378 378 + controller: _scrollController, 379 379 + itemCount: posts.length + (state.isLoadingMore ? 1 : 0), 380 380 + itemBuilder: (context, index) { 381 381 + if (index == posts.length) { 382 382 + return const Center( 383 383 + child: Padding(padding: EdgeInsets.all(16), child: CircularProgressIndicator()), 384 384 + ); 385 385 + } 386 386 + return _PostViewCard(post: posts[index]); 387 387 + }, 388 388 + ); 389 389 + } 390 390 + 391 391 + Widget _buildActorResults(BuildContext context, SearchState state) { 392 392 + final actors = state.actors; 393 393 + if (actors.isEmpty) { 394 394 + return Center(child: Text('No people found', style: Theme.of(context).textTheme.bodyLarge)); 395 395 + } 396 396 + 397 397 + return ListView.builder( 398 398 + controller: _scrollController, 399 399 + itemCount: actors.length + (state.isLoadingMore ? 1 : 0), 400 400 + itemBuilder: (context, index) { 401 401 + if (index == actors.length) { 402 402 + return const Center( 403 403 + child: Padding(padding: EdgeInsets.all(16), child: CircularProgressIndicator()), 404 404 + ); 405 405 + } 406 406 + return _ActorResultTile(actor: actors[index]); 407 407 + }, 408 408 + ); 409 409 + } 410 410 + 411 411 + String _formatHistoryTime(DateTime time) { 412 412 + final now = DateTime.now(); 413 413 + final difference = now.difference(time); 414 414 + 415 415 + if (difference.inMinutes < 1) { 416 416 + return 'Just now'; 417 417 + } 418 418 + if (difference.inHours < 1) { 419 419 + return '${difference.inMinutes}m ago'; 420 420 + } 421 421 + if (difference.inDays < 1) { 422 422 + return '${difference.inHours}h ago'; 423 423 + } 424 424 + if (difference.inDays < 7) { 425 425 + return '${difference.inDays}d ago'; 426 426 + } 427 427 + return DateFormat('MMM d').format(time); 428 428 + } 429 429 + } 430 430 + 431 431 + class _PostViewCard extends StatelessWidget { 432 432 + const _PostViewCard({required this.post}); 433 433 + 434 434 + final PostView post; 435 435 + 436 436 + @override 437 437 + Widget build(BuildContext context) { 438 438 + final record = _tryParseRecord(post.record); 439 439 + final createdAt = record?.createdAt ?? post.indexedAt; 440 440 + 441 441 + return Card( 442 442 + margin: const EdgeInsets.symmetric(horizontal: 0, vertical: 1), 443 443 + elevation: 0, 444 444 + shape: const RoundedRectangleBorder(), 445 445 + child: Padding( 446 446 + padding: const EdgeInsets.all(16), 447 447 + child: Column( 448 448 + crossAxisAlignment: CrossAxisAlignment.start, 449 449 + children: [ 450 450 + _buildHeader(context, post.author, createdAt), 451 451 + if (record != null && record.text.isNotEmpty) ...[ 452 452 + const SizedBox(height: 12), 453 453 + FacetText(text: record.text, facets: record.facets, style: Theme.of(context).textTheme.bodyLarge), 454 454 + ], 455 455 + const SizedBox(height: 12), 456 456 + _buildActions(context), 457 457 + ], 458 458 + ), 459 459 + ), 460 460 + ); 461 461 + } 462 462 + 463 463 + Widget _buildHeader(BuildContext context, ProfileViewBasic author, DateTime createdAt) { 464 464 + return InkWell( 465 465 + onTap: () => _navigateToProfile(context, author.did), 466 466 + child: Row( 467 467 + crossAxisAlignment: CrossAxisAlignment.start, 468 468 + children: [ 469 469 + CircleAvatar( 470 470 + radius: 22, 471 471 + backgroundColor: Theme.of(context).colorScheme.surfaceContainerHighest, 472 472 + backgroundImage: author.avatar != null ? NetworkImage(author.avatar!) : null, 473 473 + child: author.avatar == null 474 474 + ? Text(_initials(author.displayName ?? author.handle), style: Theme.of(context).textTheme.labelLarge) 475 475 + : null, 476 476 + ), 477 477 + const SizedBox(width: 12), 478 478 + Expanded( 479 479 + child: Column( 480 480 + crossAxisAlignment: CrossAxisAlignment.start, 481 481 + children: [ 482 482 + Text( 483 483 + author.displayName ?? author.handle, 484 484 + style: Theme.of(context).textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.w700), 485 485 + maxLines: 1, 486 486 + overflow: TextOverflow.ellipsis, 487 487 + ), 488 488 + const SizedBox(height: 2), 489 489 + Text( 490 490 + '@${author.handle} · ${_formatTime(createdAt)}', 491 491 + style: Theme.of( 492 492 + context, 493 493 + ).textTheme.bodySmall?.copyWith(color: Theme.of(context).colorScheme.onSurfaceVariant), 494 494 + ), 495 495 + ], 496 496 + ), 497 497 + ), 498 498 + ], 499 499 + ), 500 500 + ); 501 501 + } 502 502 + 503 503 + Widget _buildActions(BuildContext context) { 504 504 + return Row( 505 505 + mainAxisAlignment: MainAxisAlignment.spaceAround, 506 506 + children: [ 507 507 + _buildActionButton(context, Icons.chat_bubble_outline, '${post.replyCount ?? 0}'), 508 508 + _buildActionButton(context, Icons.repeat, '${post.repostCount ?? 0}'), 509 509 + _buildActionButton(context, Icons.favorite_border, '${post.likeCount ?? 0}'), 510 510 + _buildActionButton(context, Icons.share_outlined, ''), 511 511 + ], 512 512 + ); 513 513 + } 514 514 + 515 515 + Widget _buildActionButton(BuildContext context, IconData icon, String count) { 516 516 + final iconColor = Theme.of(context).colorScheme.onSurfaceVariant; 517 517 + 518 518 + return InkWell( 519 519 + onTap: () {}, 520 520 + borderRadius: BorderRadius.circular(999), 521 521 + child: Padding( 522 522 + padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), 523 523 + child: Row( 524 524 + children: [ 525 525 + Icon(icon, size: 18, color: iconColor), 526 526 + if (count.isNotEmpty) ...[ 527 527 + const SizedBox(width: 4), 528 528 + Text(count, style: Theme.of(context).textTheme.bodySmall?.copyWith(color: iconColor)), 529 529 + ], 530 530 + ], 531 531 + ), 532 532 + ), 533 533 + ); 534 534 + } 535 535 + 536 536 + void _navigateToProfile(BuildContext context, String did) { 537 537 + final router = GoRouter.maybeOf(context); 538 538 + if (router != null) { 539 539 + router.push('/profile/view?actor=${Uri.encodeQueryComponent(did)}'); 540 540 + } 541 541 + } 542 542 + 543 543 + FeedPostRecord? _tryParseRecord(Map<String, dynamic> record) { 544 544 + try { 545 545 + return FeedPostRecord.fromJson(record); 546 546 + } catch (_) { 547 547 + return null; 548 548 + } 549 549 + } 550 550 + 551 551 + String _formatTime(DateTime time) { 552 552 + final now = DateTime.now(); 553 553 + final difference = now.difference(time); 554 554 + 555 555 + if (difference.inMinutes < 1) { 556 556 + return 'now'; 557 557 + } 558 558 + if (difference.inHours < 1) { 559 559 + return '${difference.inMinutes}m'; 560 560 + } 561 561 + if (difference.inDays < 1) { 562 562 + return '${difference.inHours}h'; 563 563 + } 564 564 + if (difference.inDays < 7) { 565 565 + return '${difference.inDays}d'; 566 566 + } 567 567 + return DateFormat('MMM d').format(time); 568 568 + } 569 569 + 570 570 + String _initials(String value) { 571 571 + final parts = value.trim().split(RegExp(r'\s+')); 572 572 + if (parts.isEmpty || parts.first.isEmpty) { 573 573 + return '?'; 574 574 + } 575 575 + if (parts.length == 1) { 576 576 + return parts.first.substring(0, 1).toUpperCase(); 577 577 + } 578 578 + return '${parts.first.substring(0, 1)}${parts.last.substring(0, 1)}'.toUpperCase(); 579 579 + } 580 580 + } 581 581 + 582 582 + class _ActorResultTile extends StatelessWidget { 583 583 + const _ActorResultTile({required this.actor}); 584 584 + 585 585 + final ProfileView actor; 586 586 + 587 587 + @override 588 588 + Widget build(BuildContext context) { 589 589 + return InkWell( 590 590 + onTap: () => _navigateToProfile(context, actor.did), 591 591 + child: Container( 592 592 + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), 593 593 + decoration: BoxDecoration( 594 594 + border: Border(bottom: BorderSide(color: Theme.of(context).dividerColor)), 595 595 + ), 596 596 + child: Row( 597 597 + children: [ 598 598 + CircleAvatar( 599 599 + radius: 24, 600 600 + backgroundColor: Theme.of(context).colorScheme.surfaceContainerHighest, 601 601 + backgroundImage: actor.avatar != null ? NetworkImage(actor.avatar!) : null, 602 602 + child: actor.avatar == null 603 603 + ? Text(_initials(actor.displayName ?? actor.handle), style: Theme.of(context).textTheme.labelLarge) 604 604 + : null, 605 605 + ), 606 606 + const SizedBox(width: 12), 607 607 + Expanded( 608 608 + child: Column( 609 609 + crossAxisAlignment: CrossAxisAlignment.start, 610 610 + children: [ 611 611 + Text( 612 612 + actor.displayName ?? actor.handle, 613 613 + style: Theme.of(context).textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.w600), 614 614 + maxLines: 1, 615 615 + overflow: TextOverflow.ellipsis, 616 616 + ), 617 617 + Text( 618 618 + '@${actor.handle}', 619 619 + style: Theme.of( 620 620 + context, 621 621 + ).textTheme.bodySmall?.copyWith(color: Theme.of(context).colorScheme.onSurfaceVariant), 622 622 + ), 623 623 + if (actor.description != null && actor.description!.isNotEmpty) ...[ 624 624 + const SizedBox(height: 2), 625 625 + Text( 626 626 + actor.description!, 627 627 + maxLines: 1, 628 628 + overflow: TextOverflow.ellipsis, 629 629 + style: Theme.of( 630 630 + context, 631 631 + ).textTheme.bodySmall?.copyWith(color: Theme.of(context).colorScheme.onSurfaceVariant), 632 632 + ), 633 633 + ], 634 634 + ], 635 635 + ), 636 636 + ), 637 637 + const SizedBox(width: 8), 638 638 + _FollowButton(actor: actor), 639 639 + ], 640 640 + ), 641 641 + ), 642 642 + ); 643 643 + } 644 644 + 645 645 + void _navigateToProfile(BuildContext context, String did) { 646 646 + final router = GoRouter.maybeOf(context); 647 647 + if (router != null) { 648 648 + router.push('/profile/view?actor=${Uri.encodeQueryComponent(did)}'); 649 649 + } 650 650 + } 651 651 + 652 652 + String _initials(String value) { 653 653 + final parts = value.trim().split(RegExp(r'\s+')); 654 654 + if (parts.isEmpty || parts.first.isEmpty) { 655 655 + return '?'; 656 656 + } 657 657 + if (parts.length == 1) { 658 658 + return parts.first.substring(0, 1).toUpperCase(); 659 659 + } 660 660 + return '${parts.first.substring(0, 1)}${parts.last.substring(0, 1)}'.toUpperCase(); 661 661 + } 662 662 + } 663 663 + 664 664 + class _ActorListTile extends StatelessWidget { 665 665 + const _ActorListTile({required this.actor, required this.onTap}); 666 666 + 667 667 + final ProfileViewBasic actor; 668 668 + final VoidCallback onTap; 669 669 + 670 670 + @override 671 671 + Widget build(BuildContext context) { 672 672 + return InkWell( 673 673 + onTap: onTap, 674 674 + child: Container( 675 675 + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), 676 676 + child: Row( 677 677 + children: [ 678 678 + CircleAvatar( 679 679 + radius: 20, 680 680 + backgroundColor: Theme.of(context).colorScheme.surfaceContainerHighest, 681 681 + backgroundImage: actor.avatar != null ? NetworkImage(actor.avatar!) : null, 682 682 + child: actor.avatar == null 683 683 + ? Text(_initials(actor.displayName ?? actor.handle), style: Theme.of(context).textTheme.labelMedium) 684 684 + : null, 685 685 + ), 686 686 + const SizedBox(width: 12), 687 687 + Expanded( 688 688 + child: Column( 689 689 + crossAxisAlignment: CrossAxisAlignment.start, 690 690 + children: [ 691 691 + Text( 692 692 + actor.displayName ?? actor.handle, 693 693 + style: Theme.of(context).textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w600), 694 694 + maxLines: 1, 695 695 + overflow: TextOverflow.ellipsis, 696 696 + ), 697 697 + Text( 698 698 + '@${actor.handle}', 699 699 + style: Theme.of( 700 700 + context, 701 701 + ).textTheme.bodySmall?.copyWith(color: Theme.of(context).colorScheme.onSurfaceVariant), 702 702 + ), 703 703 + ], 704 704 + ), 705 705 + ), 706 706 + ], 707 707 + ), 708 708 + ), 709 709 + ); 710 710 + } 711 711 + 712 712 + String _initials(String value) { 713 713 + final parts = value.trim().split(RegExp(r'\s+')); 714 714 + if (parts.isEmpty || parts.first.isEmpty) { 715 715 + return '?'; 716 716 + } 717 717 + if (parts.length == 1) { 718 718 + return parts.first.substring(0, 1).toUpperCase(); 719 719 + } 720 720 + return '${parts.first.substring(0, 1)}${parts.last.substring(0, 1)}'.toUpperCase(); 721 721 + } 722 722 + } 723 723 + 724 724 + class _FollowButton extends StatefulWidget { 725 725 + const _FollowButton({required this.actor}); 726 726 + 727 727 + final ProfileView actor; 728 728 + 729 729 + @override 730 730 + State<_FollowButton> createState() => _FollowButtonState(); 731 731 + } 732 732 + 733 733 + class _FollowButtonState extends State<_FollowButton> { 734 734 + late bool _isFollowing; 735 735 + 736 736 + @override 737 737 + void initState() { 738 738 + super.initState(); 739 739 + _isFollowing = widget.actor.viewer?.following != null; 740 740 + } 741 741 + 742 742 + @override 743 743 + Widget build(BuildContext context) { 744 744 + if (_isFollowing) { 745 745 + return OutlinedButton( 746 746 + onPressed: _toggleFollow, 747 747 + style: OutlinedButton.styleFrom( 748 748 + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6), 749 749 + shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(999)), 750 750 + ), 751 751 + child: const Text('Following'), 752 752 + ); 753 753 + } 754 754 + 755 755 + return FilledButton.tonal( 756 756 + onPressed: _toggleFollow, 757 757 + style: FilledButton.styleFrom( 758 758 + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6), 759 759 + shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(999)), 760 760 + ), 761 761 + child: const Text('Follow'), 762 762 + ); 763 763 + } 764 764 + 765 765 + void _toggleFollow() { 766 766 + setState(() => _isFollowing = !_isFollowing); 767 767 + } 768 768 + } 769 769 + 770 770 + class _SearchEmptyState extends StatelessWidget { 771 771 + const _SearchEmptyState(); 772 772 + 773 773 + @override 774 774 + Widget build(BuildContext context) { 775 775 + return Center( 776 776 + child: Padding( 777 777 + padding: const EdgeInsets.all(24), 778 778 + child: Column( 779 779 + mainAxisSize: MainAxisSize.min, 780 780 + children: [ 781 781 + Icon(Icons.search, size: 64, color: Theme.of(context).colorScheme.outline), 782 782 + const SizedBox(height: 16), 783 783 + Text('Search', style: Theme.of(context).textTheme.titleMedium), 784 784 + const SizedBox(height: 8), 785 785 + Text( 786 786 + 'Find posts and people on the network.\n' 787 787 + 'Type @ to search for users.', 788 788 + textAlign: TextAlign.center, 789 789 + style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: Theme.of(context).colorScheme.outline), 790 790 + ), 791 791 + ], 792 792 + ), 793 793 + ), 794 794 + ); 795 795 + } 796 796 + }

+8

lib/main.dart

reviewed

··· 17 17 import 'package:lazurite/features/feed/data/feed_repository.dart'; 18 18 import 'package:lazurite/features/profile/bloc/profile_bloc.dart'; 19 19 import 'package:lazurite/features/profile/data/profile_repository.dart'; 20 20 + import 'package:lazurite/features/search/bloc/search_bloc.dart'; 21 21 + import 'package:lazurite/features/search/data/search_repository.dart'; 20 22 import 'package:lazurite/features/settings/bloc/settings_cubit.dart'; 21 23 import 'package:lazurite/features/settings/bloc/settings_state.dart'; 22 24 ··· 114 116 } 115 117 116 118 final feedRepository = FeedRepository(bluesky: bluesky); 119 119 + final searchRepository = SearchRepository(bluesky: bluesky); 117 120 final accountDid = authState.tokens?.did ?? ''; 118 121 119 122 return MultiBlocProvider( ··· 132 135 )..loadPreferences(), 133 136 ), 134 137 BlocProvider(create: (_) => DevToolsCubit(atproto: bluesky.atproto)), 138 138 + BlocProvider( 139 139 + create: (_) => 140 140 + SearchBloc(searchRepository: searchRepository, database: widget.database, accountDid: accountDid), 141 141 + ), 135 142 RepositoryProvider.value(value: feedRepository), 143 143 + RepositoryProvider.value(value: searchRepository), 136 144 ], 137 145 child: appShell, 138 146 );

+125

test/features/search/presentation/search_screen_test.dart

reviewed

··· 1 1 + import 'package:flutter/material.dart'; 2 2 + import 'package:flutter_bloc/flutter_bloc.dart'; 3 3 + import 'package:flutter_test/flutter_test.dart'; 4 4 + import 'package:lazurite/core/database/app_database.dart'; 5 5 + import 'package:lazurite/features/search/bloc/search_bloc.dart'; 6 6 + import 'package:lazurite/features/search/data/search_repository.dart'; 7 7 + import 'package:lazurite/features/search/presentation/search_screen.dart'; 8 8 + import 'package:mocktail/mocktail.dart'; 9 9 + 10 10 + class MockSearchRepository extends Mock implements SearchRepository {} 11 11 + 12 12 + class MockAppDatabase extends Mock implements AppDatabase {} 13 13 + 14 14 + void main() { 15 15 + group('SearchScreen', () { 16 16 + late MockSearchRepository mockSearchRepository; 17 17 + late MockAppDatabase mockDatabase; 18 18 + 19 19 + setUp(() { 20 20 + mockSearchRepository = MockSearchRepository(); 21 21 + mockDatabase = MockAppDatabase(); 22 22 + when(() => mockDatabase.getSearchHistory(any(), limit: any(named: 'limit'))).thenAnswer((_) async => []); 23 23 + when( 24 24 + () => mockSearchRepository.searchPosts( 25 25 + query: any(named: 'query'), 26 26 + sort: any(named: 'sort'), 27 27 + cursor: any(named: 'cursor'), 28 28 + limit: any(named: 'limit'), 29 29 + ), 30 30 + ).thenAnswer((_) async => SearchPostsResult(posts: [])); 31 31 + when( 32 32 + () => mockSearchRepository.searchActors( 33 33 + query: any(named: 'query'), 34 34 + cursor: any(named: 'cursor'), 35 35 + limit: any(named: 'limit'), 36 36 + ), 37 37 + ).thenAnswer((_) async => SearchActorsResult(actors: [])); 38 38 + when( 39 39 + () => mockSearchRepository.searchActorsTypeahead( 40 40 + query: any(named: 'query'), 41 41 + limit: any(named: 'limit'), 42 42 + ), 43 43 + ).thenAnswer((_) async => []); 44 44 + }); 45 45 + 46 46 + Widget buildSubject() { 47 47 + return MaterialApp( 48 48 + home: BlocProvider<SearchBloc>( 49 49 + create: (_) => 50 50 + SearchBloc(searchRepository: mockSearchRepository, database: mockDatabase, accountDid: 'did:plc:test'), 51 51 + child: const SearchScreen(), 52 52 + ), 53 53 + ); 54 54 + } 55 55 + 56 56 + testWidgets('displays search input and tabs', (tester) async { 57 57 + await tester.pumpWidget(buildSubject()); 58 58 + await tester.pumpAndSettle(); 59 59 + 60 60 + expect(find.text('Search posts or people'), findsOneWidget); 61 61 + expect(find.text('Posts'), findsOneWidget); 62 62 + expect(find.text('People'), findsOneWidget); 63 63 + expect(find.text('Top'), findsOneWidget); 64 64 + expect(find.text('Latest'), findsOneWidget); 65 65 + }); 66 66 + 67 67 + testWidgets('shows empty state when no search history', (tester) async { 68 68 + await tester.pumpWidget(buildSubject()); 69 69 + await tester.pumpAndSettle(); 70 70 + 71 71 + expect(find.text('Search'), findsOneWidget); 72 72 + expect(find.textContaining('Find posts and people'), findsOneWidget); 73 73 + }); 74 74 + 75 75 + testWidgets('tab switching works correctly', (tester) async { 76 76 + await tester.pumpWidget(buildSubject()); 77 77 + await tester.pumpAndSettle(); 78 78 + 79 79 + final peopleTab = find.text('People'); 80 80 + await tester.tap(peopleTab); 81 81 + await tester.pumpAndSettle(); 82 82 + 83 83 + final postsTab = find.text('Posts'); 84 84 + await tester.tap(postsTab); 85 85 + await tester.pumpAndSettle(); 86 86 + }); 87 87 + 88 88 + testWidgets('sort toggle changes correctly', (tester) async { 89 89 + await tester.pumpWidget(buildSubject()); 90 90 + await tester.pumpAndSettle(); 91 91 + 92 92 + final latestButton = find.text('Latest'); 93 93 + await tester.tap(latestButton); 94 94 + await tester.pumpAndSettle(); 95 95 + }); 96 96 + 97 97 + testWidgets('shows search history when available', (tester) async { 98 98 + final historyEntry = SearchHistoryEntry( 99 99 + id: 1, 100 100 + query: 'flutter', 101 101 + type: 'posts', 102 102 + searchedAt: DateTime.now(), 103 103 + accountDid: 'did:plc:test', 104 104 + ); 105 105 + 106 106 + when( 107 107 + () => mockDatabase.getSearchHistory(any(), limit: any(named: 'limit')), 108 108 + ).thenAnswer((_) async => [historyEntry]); 109 109 + 110 110 + await tester.pumpWidget( 111 111 + MaterialApp( 112 112 + home: BlocProvider<SearchBloc>( 113 113 + create: (_) => 114 114 + SearchBloc(searchRepository: mockSearchRepository, database: mockDatabase, accountDid: 'did:plc:test'), 115 115 + child: const SearchScreen(), 116 116 + ), 117 117 + ), 118 118 + ); 119 119 + await tester.pumpAndSettle(); 120 120 + 121 121 + expect(find.text('Recent Searches'), findsOneWidget); 122 122 + expect(find.text('flutter'), findsOneWidget); 123 123 + }); 124 124 + }); 125 125 + }