Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
*.swp
.DS_Store
.atom/
.build/
.buildlog/
.history
.svn/
.swiftpm/
migrate_working_dir/

# IntelliJ related
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [0.3.4] - 19/07/2025

### Changed
- Upgraded packages to latest versions
- Upgraded flutter to latest stable version

## [0.3.3] - 25/10/2024

### Added
Expand Down Expand Up @@ -77,3 +83,4 @@ Now, when the user attempts to navigate back, the image scale is first reset the
[0.3.0]: https://github.com/ConcenTech/album_share/compare/v0.2.1...v0.3.0
[0.3.2]: https://github.com/ConcenTech/album_share/compare/v0.3.0...v0.3.2
[0.3.3]: https://github.com/ConcenTech/album_share/compare/v0.3.2...v0.3.3
[0.3.4]: https://github.com/ConcenTech/album_share/compare/v0.3.3...v0.3.4
8 changes: 4 additions & 4 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ android {

compileOptions {
coreLibraryDesugaringEnabled true // flutter_local_notifications
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '11'
}

sourceSets {
Expand Down Expand Up @@ -85,6 +85,6 @@ flutter {
}

dependencies {
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
implementation("com.google.android.material:material:1.12.0")
}
2 changes: 1 addition & 1 deletion android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pluginManagement {
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version '8.7.0' apply false
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
id "org.jetbrains.kotlin.android" version "1.8.10" apply false
}

include ":app"
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class DesktopWindowTitlebar extends StatelessWidget {

return ColoredBox(
color: (theme.appBarTheme.backgroundColor ?? theme.colorScheme.surface)
.withOpacity(0.6),
.withValues(alpha: 0.6),
child: Row(
children: [
Expanded(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class MaterialBottomNavigationBar extends StatelessWidget {
child: NavigationBar(
backgroundColor:
(theme.appBarTheme.backgroundColor ?? theme.colorScheme.surface)
.withOpacity(0.6),
.withValues(alpha: 0.6),
selectedIndex: index,
onDestinationSelected: onDestinationSelected,
destinations: items.mapList(
Expand Down Expand Up @@ -58,7 +58,7 @@ class MaterialSideNavigationBar extends StatelessWidget {
return NavigationRail(
backgroundColor:
(theme.appBarTheme.backgroundColor ?? theme.colorScheme.surface)
.withOpacity(0.6),
.withValues(alpha: 0.6),
selectedIndex: index,
onDestinationSelected: onDestinationSelected,
destinations: items.mapList(
Expand Down
2 changes: 1 addition & 1 deletion lib/core/components/scaffold/mobile_scaffold.dart
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class MobileScaffold extends ConsumerWidget {

final appBarColor =
(theme.appBarTheme.backgroundColor ?? theme.colorScheme.surface)
.withOpacity(0.7);
.withValues(alpha: 0.7);

void closeSidebar() =>
ref.read(sidebarListenerProvider(id).notifier).close();
Expand Down
2 changes: 1 addition & 1 deletion lib/core/components/sidebar/activity_sidebar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class ActivitySidebar extends AppSidebar {
return Drawer(
width: AppSidebar.width,
backgroundColor:
Theme.of(context).scaffoldBackgroundColor.withOpacity(0.9),
Theme.of(context).scaffoldBackgroundColor.withValues(alpha: 0.9),
child: SafeArea(
top: false,
child: Consumer(
Expand Down
2 changes: 1 addition & 1 deletion lib/core/components/sidebar/notifications_sidebar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class NotificationSidebar extends AppSidebar {
final provider = ref.watch(ActivityProviders.notifications);
final theme = Theme.of(context);
return Drawer(
backgroundColor: theme.scaffoldBackgroundColor.withOpacity(0.9),
backgroundColor: theme.scaffoldBackgroundColor.withValues(alpha: 0.9),
width: AppSidebar.width,
child: provider.when(
data: (a) {
Expand Down
2 changes: 1 addition & 1 deletion lib/core/utils/app_localisations.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:flutter_gen/gen_l10n/app_localizations.dart' as al;
import 'package:album_share/l10n/app_localizations.dart' as al;

/// Convenience typedef.
///
Expand Down
4 changes: 2 additions & 2 deletions lib/immich/asset_grid/draggable_scrollbar_custom.dart
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class DraggableScrollbar extends StatefulWidget {
@override
DraggableScrollbarState createState() => DraggableScrollbarState();

static buildScrollThumbAndLabel({
static Widget buildScrollThumbAndLabel({
required Widget scrollThumb,
required Color backgroundColor,
required Animation<double>? thumbAnimation,
Expand Down Expand Up @@ -317,7 +317,7 @@ class DraggableScrollbarState extends State<DraggableScrollbar>
// scroll bar has received notification that it's view was scrolled
// so it should also changes his position
// but only if it isn't dragged
changePosition(ScrollNotification notification) {
void changePosition(ScrollNotification notification) {
if (_isDragInProcess) {
return;
}
Expand Down
4 changes: 0 additions & 4 deletions lib/immich/photo_view/photo_view.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
library photo_view;

import 'package:flutter/material.dart';

import 'src/controller/photo_view_controller.dart';
Expand Down Expand Up @@ -601,8 +599,6 @@ PhotoViewScaleState defaultScaleStateCycle(PhotoViewScaleState actual) {
case PhotoViewScaleState.zoomedIn:
case PhotoViewScaleState.zoomedOut:
return PhotoViewScaleState.initial;
default:
return PhotoViewScaleState.initial;
}
}

Expand Down
2 changes: 0 additions & 2 deletions lib/immich/photo_view/photo_view_gallery.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
library photo_view_gallery;

import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ class IgnorableChangeNotifier extends ChangeNotifier {
return super.hasListeners || (_ignorableListeners?.isNotEmpty ?? false);
}

void addIgnorableListener(listener) {
void addIgnorableListener(void Function() listener) {
assert(_debugAssertNotDisposed());
_ignorableListeners!.add(listener);
}

void removeIgnorableListener(listener) {
void removeIgnorableListener(void Function() listener) {
assert(_debugAssertNotDisposed());
_ignorableListeners!.remove(listener);
}
Expand Down
3 changes: 0 additions & 3 deletions lib/immich/photo_view/src/utils/photo_view_utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ double getScaleForScaleState(
);
case PhotoViewScaleState.originalSize:
return _clampSize(1.0, scaleBoundaries);
// Will never be reached
default:
return 0;
}
}

Expand Down
10 changes: 5 additions & 5 deletions lib/immich/providers/haptic_feedback.provider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,31 @@ class HapticNotifier extends StateNotifier<void> {
bool _hapticFeedbackEnabled() =>
_ref.read(PreferencesProviders.service).enableHapticFeedback;

selectionClick() {
void selectionClick() {
if (_hapticFeedbackEnabled()) {
HapticFeedback.selectionClick();
}
}

lightImpact() {
void lightImpact() {
if (_hapticFeedbackEnabled()) {
HapticFeedback.lightImpact();
}
}

mediumImpact() {
void mediumImpact() {
if (_hapticFeedbackEnabled()) {
HapticFeedback.mediumImpact();
}
}

heavyImpact() {
void heavyImpact() {
if (_hapticFeedbackEnabled()) {
HapticFeedback.heavyImpact();
}
}

vibrate() {
void vibrate() {
if (_hapticFeedbackEnabled()) {
HapticFeedback.vibrate();
}
Expand Down
Loading
Loading