Skip to content

Commit

Permalink
Showing 4 changed files with 32 additions and 49 deletions.
6 changes: 2 additions & 4 deletions app/lib/pages/apps/app_detail/app_detail.dart
Original file line number Diff line number Diff line change
@@ -393,11 +393,9 @@ class _AppDetailPageState extends State<AppDetailPage> {
padding: const EdgeInsets.all(8.0),
child: AnimatedLoadingButton(
width: MediaQuery.of(context).size.width * 0.9,
text: app.getFormattedPrice(),
text: "Subscribe",
onPressed: () async {
if (app.paymentLink != null &&
app.paymentLink!.isNotEmpty &&
!app.isOwner(SharedPreferencesUtil().uid)) {
if (app.paymentLink != null && app.paymentLink!.isNotEmpty) {
_checkPaymentStatus(app.id);
await launchUrl(Uri.parse(app.paymentLink!));
} else {
18 changes: 9 additions & 9 deletions app/lib/pages/apps/list_item.dart
Original file line number Diff line number Diff line change
@@ -108,15 +108,15 @@ class AppListItem extends StatelessWidget {
),
)
: Container(),
app.isPaid
? Padding(
padding: const EdgeInsets.only(top: 8),
child: Text(
app.getFormattedPrice(),
style: TextStyle(color: Colors.grey.shade400, fontSize: 14),
),
)
: const SizedBox(),
//app.isPaid
// ? Padding(
// padding: const EdgeInsets.only(top: 8),
// child: Text(
// app.getFormattedPrice(),
// style: TextStyle(color: Colors.grey.shade400, fontSize: 14),
// ),
// )
// : const SizedBox(),
],
),
],
18 changes: 9 additions & 9 deletions app/lib/pages/apps/widgets/app_section_card.dart
Original file line number Diff line number Diff line change
@@ -140,15 +140,15 @@ class SectionAppItemCard extends StatelessWidget {
],
)
: const SizedBox(),
app.isPaid
? Padding(
padding: const EdgeInsets.only(top: 4.0),
child: Text(
app.getFormattedPrice(),
style: TextStyle(color: Colors.grey.shade400, fontSize: 14),
),
)
: const SizedBox(),
//app.isPaid
// ? Padding(
// padding: const EdgeInsets.only(top: 4.0),
// child: Text(
// app.getFormattedPrice(),
// style: TextStyle(color: Colors.grey.shade400, fontSize: 14),
// ),
// )
// : const SizedBox(),
],
),
)
39 changes: 12 additions & 27 deletions app/lib/pages/onboarding/auth.dart
Original file line number Diff line number Diff line change
@@ -20,8 +20,6 @@ class AuthComponent extends StatefulWidget {
class _AuthComponentState extends State<AuthComponent> {
@override
Widget build(BuildContext context) {
final customBackendUrl = SharedPreferencesUtil().customBackendUrl;

return Consumer<AuthenticationProvider>(
builder: (context, provider, child) {
return Padding(
@@ -41,31 +39,18 @@ class _AuthComponentState extends State<AuthComponent> {
),
),
SizedBox(height: MediaQuery.of(context).textScaleFactor > 1.0 ? 18 : 32),
if (customBackendUrl.isEmpty)
SignInButton(
Buttons.google,
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
onPressed: () => provider.onGoogleSignIn(widget.onSignIn),
),
if (customBackendUrl.isEmpty && Platform.isIOS)
SignInWithAppleButton(
style: SignInWithAppleButtonStyle.whiteOutlined,
onPressed: () => provider.onAppleSignIn(widget.onSignIn),
height: 52,
),
// if (customBackendUrl.isNotEmpty)
// ElevatedButton(
// onPressed: () {
// },
// child: Text('Sign In with Email'),
// ),
// if (customBackendUrl.isNotEmpty) const SizedBox(height: 16),
// if (customBackendUrl.isEmpty)
// TextButton(
// onPressed: () {},
// child: const Text('Sign Up'),
// ),
!Platform.isIOS
? SignInButton(
Buttons.google,
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
onPressed: () => provider.onGoogleSignIn(widget.onSignIn),
)
: SignInWithAppleButton(
style: SignInWithAppleButtonStyle.whiteOutlined,
onPressed: () => provider.onAppleSignIn(widget.onSignIn),
height: 52,
),
const SizedBox(height: 16),
RichText(
textAlign: TextAlign.center,

0 comments on commit 17442ba

Please sign in to comment.