From efc000ef5cd814184d3626bb315c564cb6aaa866 Mon Sep 17 00:00:00 2001 From: Naveen Belkale Date: Fri, 14 Apr 2023 09:59:25 +0530 Subject: [PATCH 1/3] Applying changes for upgrading pre 1.12 Android projects. Building project fails without these changes. See https://github.com/flutter/flutter/wiki/Upgrading-pre-1.12-Android-projects --- android/app/src/main/AndroidManifest.xml | 18 ++++++++++++++---- .../java/co/appbrewery/dicee/MainActivity.java | 10 +--------- android/app/src/main/res/values/styles.xml | 3 +++ 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index bed531f4..50af1cb3 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -13,7 +13,7 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - + + + + + + diff --git a/android/app/src/main/java/co/appbrewery/dicee/MainActivity.java b/android/app/src/main/java/co/appbrewery/dicee/MainActivity.java index 0c8f4efe..f5e8293a 100644 --- a/android/app/src/main/java/co/appbrewery/dicee/MainActivity.java +++ b/android/app/src/main/java/co/appbrewery/dicee/MainActivity.java @@ -1,13 +1,5 @@ package co.appbrewery.dicee; -import android.os.Bundle; -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; - +import io.flutter.embedding.android.FlutterActivity; public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); - } } diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index 00fa4417..c745a5ef 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -5,4 +5,7 @@ Flutter draws its first frame --> @drawable/launch_background + From 59302167835d75ab12431fe9c25a448c282113cb Mon Sep 17 00:00:00 2001 From: Naveen Belkale Date: Fri, 14 Apr 2023 10:18:33 +0530 Subject: [PATCH 2/3] Complete code --- lib/main.dart | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 6e68f204..829ca856 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,3 +1,5 @@ +import 'dart:math'; + import 'package:flutter/material.dart'; void main() { @@ -15,9 +17,47 @@ void main() { ); } -class DicePage extends StatelessWidget { +class DicePage extends StatefulWidget { + @override + State createState() => _DicePageState(); +} + +class _DicePageState extends State { + int leftDiceNumber = 1; + int rightDiceNumber = 1; + + void buttonPressed() { + leftDiceNumber = Random().nextInt(6) + 1; + rightDiceNumber = Random().nextInt(6) + 1; + } + @override Widget build(BuildContext context) { - return Container(); + return Center( + child: Row( + children: [ + Expanded( + child: Padding( + padding: const EdgeInsets.all(16.0), + child: TextButton( + onPressed: () { + setState(buttonPressed); + }, + child: Image.asset('images/dice$leftDiceNumber.png'), + ), + )), + Expanded( + child: Padding( + padding: const EdgeInsets.all(16.0), + child: TextButton( + onPressed: () { + setState(buttonPressed); + }, + child: Image.asset('images/dice$rightDiceNumber.png'), + ), + )), + ], + ), + ); } } From a0b9ca3a3a557d252d8e8cf918e068e15594cd27 Mon Sep 17 00:00:00 2001 From: Naveen Belkale Date: Fri, 14 Apr 2023 10:20:25 +0530 Subject: [PATCH 3/3] Revert "Complete code" This reverts commit 59302167835d75ab12431fe9c25a448c282113cb. --- lib/main.dart | 44 ++------------------------------------------ 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 829ca856..6e68f204 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,3 @@ -import 'dart:math'; - import 'package:flutter/material.dart'; void main() { @@ -17,47 +15,9 @@ void main() { ); } -class DicePage extends StatefulWidget { - @override - State createState() => _DicePageState(); -} - -class _DicePageState extends State { - int leftDiceNumber = 1; - int rightDiceNumber = 1; - - void buttonPressed() { - leftDiceNumber = Random().nextInt(6) + 1; - rightDiceNumber = Random().nextInt(6) + 1; - } - +class DicePage extends StatelessWidget { @override Widget build(BuildContext context) { - return Center( - child: Row( - children: [ - Expanded( - child: Padding( - padding: const EdgeInsets.all(16.0), - child: TextButton( - onPressed: () { - setState(buttonPressed); - }, - child: Image.asset('images/dice$leftDiceNumber.png'), - ), - )), - Expanded( - child: Padding( - padding: const EdgeInsets.all(16.0), - child: TextButton( - onPressed: () { - setState(buttonPressed); - }, - child: Image.asset('images/dice$rightDiceNumber.png'), - ), - )), - ], - ), - ); + return Container(); } }