-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into #57-add-introduction-to-shorebird
- Loading branch information
Showing
20 changed files
with
785 additions
and
239 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| name: Build | ||
|
|
||
| on: | ||
| push: | ||
| branches: [main] | ||
| pull_request: | ||
| branches: [main] | ||
|
|
||
| env: | ||
| FLUTTER_VERSION: "3" | ||
| JAVA_VERSION: "11" | ||
|
|
||
| jobs: | ||
| build-android: | ||
| name: Build Android | ||
| runs-on: macos-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - name: Set up Java | ||
| uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: "adopt" | ||
| java-version: ${{ env.JAVA_VERSION }} | ||
| - name: Set up Flutter | ||
| uses: subosito/flutter-action@v2 | ||
| with: | ||
| flutter-version: ${{ env.FLUTTER_VERSION }} | ||
| - name: Create .env | ||
| run: | | ||
| echo "FRONT_ADDRESS=https://taxi.sparcs.org" > .env | ||
| echo "BACK_ADDRESS=https://taxi.sparcs.org" >> .env | ||
| - name: Create key.properties | ||
| run: | | ||
| echo "UPLOAD_STORE_FILE=../ci.jks" > android/key.properties | ||
| echo "UPLOAD_STORE_PASSWORD=123456" >> android/key.properties | ||
| echo "UPLOAD_KEY_PASSWORD=123456" >> android/key.properties | ||
| echo "UPLOAD_KEY_ALIAS=ci" >> android/key.properties | ||
| - name: Create google-services.json | ||
| run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' | base64 --decode > android/app/google-services.json | ||
| - name: Install dependencies | ||
| run: flutter pub get | ||
| - name: Build APK | ||
| run: flutter build apk --release | ||
|
|
||
| build-ios: | ||
| name: Build iOS | ||
| runs-on: macos-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - name: Set up Flutter | ||
| uses: subosito/flutter-action@v2 | ||
| with: | ||
| flutter-version: ${{ env.FLUTTER_VERSION }} | ||
| - name: Create .env | ||
| run: | | ||
| echo "FRONT_ADDRESS=https://taxi.sparcs.org" > .env | ||
| echo "BACK_ADDRESS=https://taxi.sparcs.org" >> .env | ||
| - name: Create GoogleService-Info.plist | ||
| run: echo '${{ secrets.GOOGLE_SERVICE_INFO_PLIST }}' | base64 --decode > ios/Runner/GoogleService-Info.plist | ||
| - name: Install dependencies | ||
| run: flutter pub get | ||
| - name: Build iOS | ||
| run: flutter build ios --release --no-codesign |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,3 +11,4 @@ GeneratedPluginRegistrant.java | |
| key.properties | ||
| **/*.keystore | ||
| **/*.jks | ||
| !/ci.jks | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <paths xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <cache-path name="image" path="/"/> | ||
| </paths> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,173 @@ | ||
| import 'package:flutter/material.dart'; | ||
| import 'package:google_fonts/google_fonts.dart'; | ||
|
|
||
| //primaryColor 지정 (색상코드: #6E3647) | ||
| final Map<int, Color> primaryColor1 = { | ||
| 50: const Color.fromRGBO(110, 54, 120, .1), | ||
| 100: const Color.fromRGBO(110, 54, 120, .2), | ||
| 200: const Color.fromRGBO(110, 54, 120, .3), | ||
| 300: const Color.fromRGBO(110, 54, 120, .4), | ||
| 400: const Color.fromRGBO(110, 54, 120, .5), | ||
| 500: const Color.fromRGBO(110, 54, 120, .6), | ||
| 600: const Color.fromRGBO(110, 54, 120, .7), | ||
| 700: const Color.fromRGBO(110, 54, 120, .8), | ||
| 800: const Color.fromRGBO(110, 54, 120, .9), | ||
| 900: const Color.fromRGBO(110, 54, 120, 1), | ||
| }; | ||
| final MaterialColor taxiPrimaryMaterialColor = | ||
| MaterialColor(0xFF6E3678, primaryColor1); | ||
| const Color taxiPrimaryColor = Color(0xFF6E3678); | ||
| const Color taxiMainBackgroundColor = Colors.white; | ||
| const Color toastBackgroundColor = Colors.white; | ||
| const Color toastTextColor = Colors.black; | ||
| const Color notiColor = Color(0x66C8C8C8); | ||
| final Color dialogBarrierColor = Colors.black.withOpacity(0.6); | ||
|
|
||
| double devicePixelRatio = 3.0; | ||
| const double taxiDialogPadding = 15.0; | ||
| const double taxiNotificationPadding = 20.0; | ||
| final defaultDialogUpperTitlePadding = | ||
| Padding(padding: EdgeInsets.symmetric(vertical: 36.0 / devicePixelRatio)); | ||
|
|
||
| final defaultDialogMedianTitlePadding = | ||
| Padding(padding: EdgeInsets.all(6 / devicePixelRatio)); | ||
|
|
||
| final defaultDialogLowerTitlePadding = | ||
| Padding(padding: EdgeInsets.symmetric(vertical: 24 / devicePixelRatio)); | ||
|
|
||
| final defaultDialogVerticalMedianButtonPadding = Padding( | ||
| padding: | ||
| EdgeInsets.symmetric(horizontal: taxiDialogPadding / devicePixelRatio)); | ||
|
|
||
| final defaultDialogLowerButtonPadding = Padding( | ||
| padding: | ||
| EdgeInsets.only(bottom: (taxiDialogPadding / 2) / devicePixelRatio)); | ||
|
|
||
| final defaultDialogPadding = | ||
| Padding(padding: EdgeInsets.all(taxiDialogPadding / devicePixelRatio)); | ||
|
|
||
| final defaultDialogButtonSize = Size(147.50, 35); | ||
|
|
||
| final defaultDialogButtonInnerPadding = EdgeInsets.only(top: 9, bottom: 9); | ||
|
|
||
| final defaultDialogButtonBorderRadius = BorderRadius.circular(8.0); | ||
|
|
||
| final defaultTaxiMarginDouble = 20.0; | ||
|
|
||
| final defaultTaxiMargin = | ||
| EdgeInsets.symmetric(horizontal: defaultTaxiMarginDouble); | ||
|
|
||
| const defaultNotificationButtonSize = Size(90, 25); | ||
| const defaultNotificationButtonInnerPadding = | ||
| EdgeInsets.symmetric(horizontal: 15.0, vertical: 2.0); | ||
| final defaultNotificationButtonBorderRadius = BorderRadius.circular(30.0); | ||
| final defaultNotificatonOutlinedButtonStyle = OutlinedButton.styleFrom( | ||
| minimumSize: Size.zero, | ||
| fixedSize: defaultNotificationButtonSize, | ||
| padding: defaultNotificationButtonInnerPadding, | ||
| backgroundColor: taxiPrimaryMaterialColor, | ||
| shape: RoundedRectangleBorder( | ||
| borderRadius: defaultNotificationButtonBorderRadius, | ||
| side: const BorderSide(color: Colors.black), | ||
| ), | ||
| ); // TODO: ThemeData에 있는 OutlinedButtonThemeData 분리 | ||
|
|
||
| ThemeData taxiTheme() { | ||
| final base = ThemeData( | ||
| primarySwatch: taxiPrimaryMaterialColor, | ||
| primaryColor: const Color(0xFF6E3678), | ||
|
|
||
| //dialog 테마 | ||
| dialogTheme: DialogTheme( | ||
| shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15)), | ||
| backgroundColor: Colors.white, | ||
| actionsPadding: const EdgeInsets.all(10.0), | ||
| surfaceTintColor: Colors.black, | ||
| ), | ||
| dialogBackgroundColor: Colors.white, | ||
|
|
||
| //dialog 버튼 | ||
| elevatedButtonTheme: ElevatedButtonThemeData( | ||
| style: ElevatedButton.styleFrom( | ||
| elevation: 0.5, | ||
| fixedSize: defaultDialogButtonSize, | ||
| padding: defaultDialogButtonInnerPadding, | ||
| backgroundColor: const Color.fromARGB(255, 238, 238, 238), | ||
| shape: RoundedRectangleBorder( | ||
| borderRadius: defaultDialogButtonBorderRadius, | ||
| ), | ||
| ), | ||
| ), | ||
| outlinedButtonTheme: OutlinedButtonThemeData( | ||
| style: OutlinedButton.styleFrom( | ||
| fixedSize: defaultDialogButtonSize, | ||
| padding: defaultDialogButtonInnerPadding, | ||
| backgroundColor: taxiPrimaryMaterialColor, | ||
| shape: RoundedRectangleBorder( | ||
| borderRadius: defaultDialogButtonBorderRadius, | ||
| side: const BorderSide(color: Colors.black), | ||
| ), | ||
| ), | ||
| ), | ||
| bannerTheme: MaterialBannerThemeData( | ||
| backgroundColor: Colors.white, | ||
| ), | ||
|
|
||
| //텍스트 테마 | ||
| textTheme: const TextTheme( | ||
| //Dialog 제목 | ||
| titleSmall: TextStyle( | ||
| fontFamily: 'NanumSquare', | ||
| color: Color(0xFF323232), | ||
| fontSize: 16, | ||
| fontWeight: FontWeight.w400), | ||
|
|
||
| //Dialog 상세 설명 | ||
| bodySmall: TextStyle( | ||
| fontFamily: 'NanumSquare_acB', | ||
| color: Color(0xFF888888), | ||
| fontSize: 10, | ||
| fontWeight: FontWeight.w700), | ||
|
|
||
| //Dialog Outlined 버튼 텍스트 | ||
| labelLarge: TextStyle( | ||
| fontFamily: 'NanumSquare_acB', | ||
| color: Color(0xFFEEEEEE), | ||
| fontSize: 14, | ||
| fontWeight: FontWeight.w700), | ||
|
|
||
| //Dialog Elevated 버튼 텍스트 | ||
| labelMedium: TextStyle( | ||
| fontFamily: 'NanumSquare', | ||
| color: Color.fromARGB(255, 129, 129, 129), | ||
| fontSize: 14, | ||
| fontWeight: FontWeight.w400), | ||
| labelSmall: TextStyle( | ||
| color: Color(0xFFEEEEEE), | ||
| fontFamily: 'NanumSquare_acB', | ||
| fontSize: 12, | ||
| fontWeight: FontWeight.w700, | ||
| letterSpacing: 0.4, | ||
| ), | ||
| ), | ||
|
|
||
| bottomNavigationBarTheme: BottomNavigationBarThemeData( | ||
| type: BottomNavigationBarType.fixed, | ||
| backgroundColor: Colors.white, | ||
| selectedItemColor: Color(0xFF6E3678), | ||
| selectedLabelStyle: TextStyle( | ||
| fontFamily: 'NanumSquare', | ||
| fontSize: 12, | ||
| fontWeight: FontWeight.w700, | ||
| letterSpacing: 0.4, | ||
| ), | ||
| unselectedLabelStyle: TextStyle( | ||
| fontFamily: 'NanumSquare', | ||
| fontSize: 12, | ||
| fontWeight: FontWeight.w700, | ||
| letterSpacing: 0.4, | ||
| ), | ||
| ), | ||
| ); | ||
| return base; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.