Up version for release

Up Version for release
2022-10-04 15:29:47 -05:00 · 2022-10-04 15:29:37 -05:00 · 2022-10-04 15:21:58 -05:00 · 2022-10-04 15:19:29 -05:00 · 2022-10-04 09:46:06 -05:00 · 2022-10-01 16:01:27 -05:00
17 changed files with 85 additions and 67 deletions
--- a/README.md
+++ b/README.md
@@ -46,6 +46,7 @@ Spec: Free-tier Oracle VM - Amsterdam - 2.4Ghz quad-core ARM64 CPU, 24GB RAM
 - [Installation](#installation)
 - [Update](#update)
 - [Mobile App](#mobile-app)
+- [App Beta Invitation links](#App-Beta-release-channel)
 - [Development](#development)
 - [Support](#support)
 - [Known Issues](#known-issues)
@@ -205,7 +206,11 @@ docker-compose pull && docker-compose up -d

 > *The Play/App Store version might be lagging behind the latest release due to the review process.*

+# App Beta release channel

+You can opt-in to join app beta release channel by following the links below:
+* Android: Invitation link from [web](https://play.google.com/store/apps/details?id=app.alextran.immich) or from [mobile](https://play.google.com/store/apps/details?id=app.alextran.immich)
+* iOS: [TestFlight invitation link](https://testflight.apple.com/join/1vYsAa8P)
  <br/>  

 # Development
--- a/mobile/android/fastlane/Fastfile
+++ b/mobile/android/fastlane/Fastfile
@@ -16,12 +16,17 @@
 default_platform(:android)

 platform :android do
-  desc "Build Android"
-  lane :build do
+  desc "Build Android and Release Testing"
+  lane :beta do
    gradle(
      task: 'bundle', 
      build_type: 'Release',
+      properties: {
+        "android.injected.version.code" => 47,
+        "android.injected.version.name" => "1.30.2",
+      }
    )
+    upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab', track: 'beta')
  end

  desc "Build and Release Android"
@@ -30,8 +35,8 @@ platform :android do
      task: 'bundle', 
      build_type: 'Release',
      properties: {
-        "android.injected.version.code" => 46,
-        "android.injected.version.name" => "1.30.0",
+        "android.injected.version.code" => 48,
+        "android.injected.version.name" => "1.30.2",
      }
    )
    upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab')
--- a/mobile/android/fastlane/README.md
+++ b/mobile/android/fastlane/README.md
@@ -15,13 +15,13 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do

 ## Android

-### android build
+### android beta

 ```sh
-[bundle exec] fastlane android build
+[bundle exec] fastlane android beta
 ```

-Build Android
+Build Android and Release Testing

 ### android release

--- a/mobile/android/fastlane/metadata/android/en-US/changelogs/47.txt
+++ b/mobile/android/fastlane/metadata/android/en-US/changelogs/47.txt
@@ -0,0 +1 @@
+* Improve scroll thumb date info
--- a/mobile/android/fastlane/metadata/android/en-US/changelogs/48.txt
+++ b/mobile/android/fastlane/metadata/android/en-US/changelogs/48.txt
@@ -0,0 +1 @@
+* Fixed parsing date error prevent timeline to be loaded.
--- a/mobile/android/fastlane/report.xml
+++ b/mobile/android/fastlane/report.xml
@@ -5,17 +5,17 @@
    
    
      
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000316">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000233">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="99.857291">
+      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="61.699536">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="40.236485">
+      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="46.210553">
        
      </testcase>
    
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj
@@ -360,7 +360,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 60;
+				CURRENT_PROJECT_VERSION = 62;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -495,7 +495,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 60;
+				CURRENT_PROJECT_VERSION = 62;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -522,7 +522,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 60;
+				CURRENT_PROJECT_VERSION = 62;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
--- a/mobile/ios/Runner/Info.plist
+++ b/mobile/ios/Runner/Info.plist
@@ -17,11 +17,11 @@
    <key>CFBundlePackageType</key>
    <string>APPL</string>
    <key>CFBundleShortVersionString</key>
-    <string>1.29.6</string>
+    <string>1.30.1</string>
    <key>CFBundleSignature</key>
    <string>????</string>
    <key>CFBundleVersion</key>
-    <string>60</string>
+    <string>62</string>
    <key>LSRequiresIPhoneOS</key>
    <true />
    <key>MGLMapboxMetricsEnabledSettingShownInApp</key>
--- a/mobile/ios/fastlane/Fastfile
+++ b/mobile/ios/fastlane/Fastfile
@@ -19,7 +19,7 @@ platform :ios do
  desc "iOS Beta"
  lane :beta do
    increment_version_number(
-      version_number: "1.30.0"
+      version_number: "1.30.2"
    )
    increment_build_number(
      build_number: latest_testflight_build_number + 1,
--- a/mobile/ios/fastlane/report.xml
+++ b/mobile/ios/fastlane/report.xml
@@ -5,32 +5,32 @@
    
    
      
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000316">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000209">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.604146">
+      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.78333">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="5.321654">
+      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="3.947588">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.655368">
+      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.505399">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="4: build_app" time="62.328417">
+      <testcase classname="fastlane.lanes" name="4: build_app" time="80.954627">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="62.633232">
+      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="58.295965">
        
      </testcase>
    
--- a/mobile/lib/modules/home/providers/home_page_render_list_provider.dart
+++ b/mobile/lib/modules/home/providers/home_page_render_list_provider.dart
@@ -1,5 +1,6 @@
 import 'dart:math';

+import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
 import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
@@ -22,16 +23,14 @@ class RenderAssetGridElement {
  final RenderAssetGridElementType type;
  final RenderAssetGridRow? assetRow;
  final String? title;
-  final int? month;
-  final int? year;
+  final DateTime date;
  final List<AssetResponseDto>? relatedAssetList;

  RenderAssetGridElement(
    this.type, {
    this.assetRow,
    this.title,
-    this.month,
-    this.year,
+    required this.date,
    this.relatedAssetList,
  });
 }
@@ -46,45 +45,50 @@ final renderListProvider = StateProvider((ref) {
  DateTime? lastDate;

  assetGroups.forEach((groupName, assets) {
-    final date = DateTime.parse(groupName);
+    try {
+      final date = DateTime.parse(groupName);

-    if (lastDate == null || lastDate!.month != date.month) {
+      if (lastDate == null || lastDate!.month != date.month) {
+        elements.add(
+          RenderAssetGridElement(
+            RenderAssetGridElementType.monthTitle,
+            title: groupName,
+            date: date,
+          ),
+        );
+      }
+
+      // Add group title
      elements.add(
-        RenderAssetGridElement(RenderAssetGridElementType.monthTitle,
-            title: groupName, month: date.month, year: date.year),
-      );
-    }
-
-    // Add group title
-    elements.add(
-      RenderAssetGridElement(
-        RenderAssetGridElementType.dayTitle,
-        title: groupName,
-        month: date.month,
-        year: date.year,
-        relatedAssetList: assets,
-      ),
-    );
-
-    // Add rows
-    int cursor = 0;
-    while (cursor < assets.length) {
-      int rowElements = min(assets.length - cursor, assetsPerRow);
-
-      final rowElement = RenderAssetGridElement(
-        RenderAssetGridElementType.assetRow,
-        month: date.month,
-        year: date.year,
-        assetRow: RenderAssetGridRow(
-          assets.sublist(cursor, cursor + rowElements),
+        RenderAssetGridElement(
+          RenderAssetGridElementType.dayTitle,
+          title: groupName,
+          date: date,
+          relatedAssetList: assets,
        ),
      );

-      elements.add(rowElement);
-      cursor += rowElements;
-    }
+      // Add rows
+      int cursor = 0;
+      while (cursor < assets.length) {
+        int rowElements = min(assets.length - cursor, assetsPerRow);

-    lastDate = date;
+        final rowElement = RenderAssetGridElement(
+          RenderAssetGridElementType.assetRow,
+          date: date,
+          assetRow: RenderAssetGridRow(
+            assets.sublist(cursor, cursor + rowElements),
+          ),
+        );
+
+        elements.add(rowElement);
+        cursor += rowElements;
+      }
+
+      lastDate = date;
+    } catch (e) {
+      debugPrint(e.toString());
+    }
  });

  return elements;
--- a/mobile/lib/modules/home/ui/asset_list_v2/draggable_scrollbar_custom.dart
+++ b/mobile/lib/modules/home/ui/asset_list_v2/draggable_scrollbar_custom.dart
@@ -189,6 +189,7 @@ class ScrollLabel extends StatelessWidget {
          borderRadius: const BorderRadius.all(Radius.circular(16.0)),
          child: Container(
            constraints: constraints ?? _defaultConstraints,
+            padding: const EdgeInsets.symmetric(horizontal: 10.0),
            alignment: Alignment.center,
            child: child,
          ),
@@ -257,8 +258,6 @@ class DraggableScrollbarState extends State<DraggableScrollbar>
  Widget build(BuildContext context) {
    Text? labelText;
    if (widget.labelTextBuilder != null && _isDragInProcess) {
-      int numberOfItems = widget.child.itemCount;
-
      labelText = widget.labelTextBuilder!(_currentItem);
    }

--- a/mobile/lib/modules/home/ui/asset_list_v2/immich_asset_grid.dart
+++ b/mobile/lib/modules/home/ui/asset_list_v2/immich_asset_grid.dart
@@ -127,8 +127,8 @@ class ImmichAssetGrid extends HookConsumerWidget {
  }

  Text _labelBuilder(int pos) {
-    return Text(
-      "${renderList[pos].month} / ${renderList[pos].year}",
+    final date = renderList[pos].date;
+    return Text(DateFormat.yMMMd().format(date),
      style: const TextStyle(
        color: Colors.white,
        fontWeight: FontWeight.bold,
@@ -154,6 +154,7 @@ class ImmichAssetGrid extends HookConsumerWidget {
        controller: _itemScrollController,
        backgroundColor: Theme.of(context).hintColor,
        labelTextBuilder: _labelBuilder,
+        labelConstraints: const BoxConstraints(maxHeight: 28),
        scrollbarAnimationDuration: const Duration(seconds: 1),
        scrollbarTimeToFade: const Duration(seconds: 4),
        child: ScrollablePositionedList.builder(
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone

 publish_to: "none"
-version: 1.30.0+46
+version: 1.30.2+48

 environment:
  sdk: ">=2.17.0 <3.0.0"
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -29,4 +29,6 @@ COPY --from=builder /usr/src/app/dist ./dist

 RUN npm prune --production

+VOLUME /usr/src/app/upload
+
 EXPOSE 3001
--- a/server/apps/immich/src/constants/server_version.constant.ts
+++ b/server/apps/immich/src/constants/server_version.constant.ts
@@ -11,6 +11,6 @@ export interface IServerVersion {
 export const serverVersion: IServerVersion = {
  major: 1,
  minor: 30,
-  patch: 0,
-  build: 46,
+  patch: 2,
+  build: 48,
 };
--- a/server/apps/microservices/src/processors/thumbnail.processor.ts
+++ b/server/apps/microservices/src/processors/thumbnail.processor.ts
@@ -62,7 +62,7 @@ export class ThumbnailGeneratorProcessor {

    const temp = asset.originalPath.split('/');
    const originalFilename = temp[temp.length - 1].split('.')[0];
-    const jpegThumbnailPath = resizePath + originalFilename + '.jpeg';
+    const jpegThumbnailPath = join(resizePath, `${originalFilename}.jpeg`);

    if (asset.type == AssetType.IMAGE) {
      try {
Author	SHA1	Message	Date
Alex	536fda04f2	Up version for release	2022-10-04 15:29:47 -05:00
Alex	2094204877	Up version for release	2022-10-04 15:29:37 -05:00
Alex	ab375cca1a	Up Version for release	2022-10-04 15:21:58 -05:00
Alex	479f706f8a	fix(mobile): Fix error parsing datetime prevent the timeline to be displayed (#784 )	2022-10-04 15:19:29 -05:00
Deepesh Bhardwaj	4342285507	Updated jpeg thumbnail path (#780 )	2022-10-04 09:46:06 -05:00
Jonas Janz	8bb656cb17	add docker volumes to services (#766 ) * add docker volumes to services this change adds the volume definitions for /usr/src/app/upload /usr/src/app/.reverse-geocoding-dump to the `immich-server` docker-compose files as /usr/src/app/upload should always be a volume for the containers I also added it to the `Dockerfile` Signed-off-by: PixelJonas <5434875+PixelJonas@users.noreply.github.com> * remove geocoding-dump volume from docker-compose Signed-off-by: PixelJonas <5434875+PixelJonas@users.noreply.github.com>	2022-10-01 16:01:27 -05:00
Alex	3f1f835df3	Update readme for beta release invitation links	2022-09-29 15:13:18 -05:00
Matthias Rupp	87ca031335	Fix bug with missing year and add date to drag handle (#761 )	2022-09-29 10:19:55 -05:00
				`@@ -0,0 +1 @@`
				`* Fixed parsing date error prevent timeline to be loaded.`