Skip to content

Commit

Permalink
First upload to the store
Browse files Browse the repository at this point in the history
  • Loading branch information
guyluz11 committed Apr 19, 2024
1 parent 72a11e5 commit 9ca4da4
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 45 deletions.
27 changes: 20 additions & 7 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -41,22 +47,29 @@ 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
targetSdkVersion flutter.targetSdkVersion
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
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:label="infinite_horizons"
android:label="Infinite Horizons"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher">
<activity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.infinite_horizons
package com.haveinfinitehorizons

import io.flutter.embedding.android.FlutterActivity

Expand Down
1 change: 1 addition & 0 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'package:infinite_horizons/presentation/core/color_schemes.dart';
import 'package:infinite_horizons/presentation/pages/pages.dart';

void main() async {
WidgetsFlutterBinding.ensureInitialized();
await EasyLocalization.ensureInitialized();

runApp(
Expand Down
8 changes: 6 additions & 2 deletions lib/presentation/atoms/button_atom.dart
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,12 @@ class ButtonAtom extends StatelessWidget {
: MaterialStateProperty.all(colorScheme.primaryContainer),
),
icon: Icon(icon),
label: TextAtom(text ?? '',
translate: translate, maxLines: 1, style: textTheme.bodyLarge),
label: TextAtom(
text ?? '',
translate: translate,
maxLines: 1,
style: textTheme.bodyLarge,
),
),
);
} else if (variant == ButtonVariant.secondary) {
Expand Down
70 changes: 37 additions & 33 deletions lib/presentation/pages/intro_page.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:infinite_horizons/domain/study_type_abstract.dart';
import 'package:infinite_horizons/presentation/core/theme_data.dart';
import 'package:infinite_horizons/presentation/molecules/molecules.dart';
import 'package:infinite_horizons/presentation/organisms/organisms.dart';
import 'package:infinite_horizons/presentation/pages/home_page.dart';
Expand Down Expand Up @@ -27,39 +28,42 @@ class _IntroPageState extends State<IntroPage> {
@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,
),
),
);
}
Expand Down
2 changes: 1 addition & 1 deletion linux/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 9ca4da4

Please sign in to comment.