Compare commits

..

No commits in common. "88a726b1e298195c9ab9a441c9faf99150a1d0f7" and "cabc50d2aab3e7d863c650bba86bfffe27b79cad" have entirely different histories.

7 changed files with 11 additions and 22 deletions

3
.github/FUNDING.yml vendored
View file

@ -1,3 +0,0 @@
# These are supported funding model platforms
github: [vodemn]

View file

@ -19,7 +19,7 @@ on:
include-iap: include-iap:
type: boolean type: boolean
description: Include IAP package description: Include IAP package
default: true default: false # TODO(@vodemn) when Google fixes their api
jobs: jobs:
build: build:
@ -36,7 +36,7 @@ jobs:
- name: Override iap package with stub - name: Override iap package with stub
if: ${{ !inputs.include-iap }} if: ${{ !inputs.include-iap }}
run: | run: |
echo "\ndependency_overrides:\n m3_lightmeter_iap:\n path: iap" >> pubspec.yaml echo "\ndependecies_override:\n m3_lightmeter_iap:\n path: iap" >> pubspec.yaml
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:

View file

@ -34,7 +34,7 @@ on:
include-iap: include-iap:
type: boolean type: boolean
description: Include IAP package description: Include IAP package
default: true default: false # TODO(@vodemn) when Google fixes their api
env: env:
BUILD_ARGS: --release --flavor prod --dart-define cameraPreviewAspectRatio=240/320 -t lib/main_prod.dart BUILD_ARGS: --release --flavor prod --dart-define cameraPreviewAspectRatio=240/320 -t lib/main_prod.dart
@ -55,7 +55,7 @@ jobs:
- name: Override iap package with stub - name: Override iap package with stub
if: ${{ !inputs.include-iap }} if: ${{ !inputs.include-iap }}
run: | run: |
echo "\ndependency_overrides:\n m3_lightmeter_iap:\n path: iap" >> pubspec.yaml echo "\ndependecies_override:\n m3_lightmeter_iap:\n path: iap" >> pubspec.yaml
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -164,8 +164,8 @@ jobs:
- name: Commit changes - name: Commit changes
run: | run: |
git config --local user.email "github-actions[bot]@users.noreply.github.com" git config --global user.name "vodemn"
git config --local user.name "github-actions[bot]" git config --global user.email "vadim.turko@gmail.com"
git add -A git add -A
git commit -m "Version bump" git commit -m "Version bump"

View file

@ -30,7 +30,7 @@ jobs:
- name: Override iap package with stub - name: Override iap package with stub
if: env.STUB_IAP if: env.STUB_IAP
run: | run: |
echo "\ndependency_overrides:\n m3_lightmeter_iap:\n path: iap" >> pubspec.yaml echo "\ndependecies_override:\n m3_lightmeter_iap:\n path: iap" >> pubspec.yaml
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:

View file

@ -109,5 +109,4 @@ flutter {
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "com.android.billingclient:billing-ktx:6.0.0" implementation "com.android.billingclient:billing-ktx:6.0.0"
implementation "com.google.firebase:firebase-analytics:17.4.1"
} }

View file

@ -2,7 +2,6 @@ import 'dart:developer';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:lightmeter/generated/l10n.dart'; import 'package:lightmeter/generated/l10n.dart';
import 'package:lightmeter/res/dimens.dart';
import 'package:lightmeter/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart'; import 'package:lightmeter/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart';
import 'package:m3_lightmeter_iap/m3_lightmeter_iap.dart'; import 'package:m3_lightmeter_iap/m3_lightmeter_iap.dart';
import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart'; import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
@ -12,8 +11,7 @@ class EquipmentProfilesListTile extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final paidStatus = IAPProducts.productOf(context, IAPProductType.paidFeatures)?.status ?? final paidStatus = IAPProducts.productOf(context, IAPProductType.paidFeatures)?.status;
IAPProductStatus.pending;
log(paidStatus.toString()); log(paidStatus.toString());
return ListTile( return ListTile(
leading: const Icon(Icons.camera), leading: const Icon(Icons.camera),
@ -24,18 +22,13 @@ class EquipmentProfilesListTile extends StatelessWidget {
MaterialPageRoute(builder: (_) => const EquipmentProfilesScreen()), MaterialPageRoute(builder: (_) => const EquipmentProfilesScreen()),
); );
}, },
IAPProductStatus.pending => null, IAPProductStatus.purchasable => () {
_ => () {
IAPProductsProvider.of(context).buy(IAPProductType.paidFeatures); IAPProductsProvider.of(context).buy(IAPProductType.paidFeatures);
}, },
_ => null,
}, },
trailing: switch (paidStatus) { trailing: switch (paidStatus) {
IAPProductStatus.purchasable => const Icon(Icons.lock), IAPProductStatus.purchasable => const Icon(Icons.lock),
IAPProductStatus.pending => const SizedBox(
height: Dimens.grid24,
width: Dimens.grid24,
child: CircularProgressIndicator(),
),
_ => null, _ => null,
}, },
); );

View file

@ -1,7 +1,7 @@
name: lightmeter name: lightmeter
description: Lightmeter app inspired by Material 3 design system. description: Lightmeter app inspired by Material 3 design system.
publish_to: "none" publish_to: "none"
version: 0.13.2+38 version: 0.13.1+37
environment: environment:
sdk: ">=3.0.0 <4.0.0" sdk: ">=3.0.0 <4.0.0"