diff --git a/android/app/build.gradle b/android/app/build.gradle index 94ec101..ee3c643 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -22,8 +22,14 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } +def keystoreProperties = new Properties() +def keystorePropertiesFile = rootProject.file('key.properties') +if (keystorePropertiesFile.exists()) { + keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) + } + android { - namespace "com.example.infinite_horizons" + namespace "com.haveinfinitehorizons" compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion @@ -41,8 +47,7 @@ android { } defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.infinite_horizons" + applicationId "com.haveinfinitehorizons" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdkVersion flutter.minSdkVersion @@ -50,13 +55,21 @@ android { versionCode flutterVersionCode.toInteger() versionName flutterVersionName } - - buildTypes { + signingConfigs { release { - // TODO: Add your own signing config for the release build. - // Signing with the debug keys for now, so `flutter run --release` works. + keyAlias keystoreProperties['keyAlias'] + keyPassword keystoreProperties['keyPassword'] + storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null + storePassword keystoreProperties['storePassword'] + } + } + buildTypes { + debug { signingConfig signingConfigs.debug } + release { + signingConfig signingConfigs.release + } } } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 00654b3..efe9d1d 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ { @override Widget build(BuildContext context) { return Scaffold( - body: IntroductionScreen( - key: _introKey, - pages: [ - PageViewModel( - title: 'Let’s Study Efficiently', - bodyWidget: WelcomeOrganism(), - ), - PageViewModel( - title: 'Study Type', - bodyWidget: StudyTypeSelectionMolecule(() { - setState(() { - studyType = StudyTypeAbstract.instance!.studyType.previewName; - }); - nextPage(); - }), - ), - PageViewModel( - title: 'Efficient $studyType Study', - bodyWidget: TipsOrganism(), - ), - PageViewModel( - title: 'Energy', - bodyWidget: EnergySelectionMolecule(nextPage), - ), - PageViewModel( - title: 'Let’s Start', - bodyWidget: MotivationOrganism(() => onDone(context)), - ), - ], - showBackButton: true, - back: const Icon(Icons.arrow_back), - next: const Icon(Icons.arrow_forward), - showDoneButton: false, + body: Padding( + padding: const EdgeInsets.only(top: AppThemeData.generalSpacing), + child: IntroductionScreen( + key: _introKey, + pages: [ + PageViewModel( + title: 'Let’s Study Efficiently', + bodyWidget: WelcomeOrganism(), + ), + PageViewModel( + title: 'Study Type', + bodyWidget: StudyTypeSelectionMolecule(() { + setState(() { + studyType = StudyTypeAbstract.instance!.studyType.previewName; + }); + nextPage(); + }), + ), + PageViewModel( + title: 'Efficient $studyType Study', + bodyWidget: TipsOrganism(), + ), + PageViewModel( + title: 'Energy', + bodyWidget: EnergySelectionMolecule(nextPage), + ), + PageViewModel( + title: 'Let’s Start', + bodyWidget: MotivationOrganism(() => onDone(context)), + ), + ], + showBackButton: true, + back: const Icon(Icons.arrow_back), + next: const Icon(Icons.arrow_forward), + showDoneButton: false, + ), ), ); } diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 41b3ac2..6e7393e 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -7,7 +7,7 @@ project(runner LANGUAGES CXX) set(BINARY_NAME "infinite_horizons") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "com.example.infinite_horizons") +set(APPLICATION_ID "com.haveinfinitehorizons") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake.