Skip to content

Commit

Permalink
feat: changes
Browse files Browse the repository at this point in the history
  • Loading branch information
BerkSpar committed Sep 20, 2024
2 parents 0852fd7 + 82ff3da commit 1669dad
Show file tree
Hide file tree
Showing 17 changed files with 196 additions and 39 deletions.
Binary file modified .DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion .flutter-plugins-dependencies

Large diffs are not rendered by default.

84 changes: 84 additions & 0 deletions .github/workflows/CI_STORE_DEPLOY_ANDROID.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
## Github Actions CI workflow to deploy to Internal testing in the Play Store
name: CI_STORE_DEPLOY_ANDROID

on:
# Run this workflow when any new code is pushed into the main branch
push:
branches: [main]

jobs:
store_deploy_android:
name: android store release
runs-on: ubuntu-latest
env:
# Setup env variables that will be used throughout the workflow
JAVA_VERSION: 12.0
FLUTTER_VERSION: 3.24.0
AAB_PATH: build/app/outputs/bundle/release/app-release.aab
KEYSTORE_PATH: android/upload-keystore.jks
KEY_PROPS_PATH: android/key.properties
SERVICE_ACCOUNT_PATH: store_credentials.json
PACKAGE_NAME: com.example.hub_finder
steps:
# Checkout repository codebase
- name: Checkout the code
uses: actions/checkout@v3

# Setup Java in the VM
- name: Setup Java to compile the Android project
uses: actions/setup-java@v2
with:
distribution: "zulu"
java-version: ${{ env.JAVA_VERSION }}

# Setup Flutter in the VM
- name: Setup Flutter
uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}

# Decode Android env variables
- name: Decode Android keystore
run: echo "${{ secrets.ANDROID_KEYSTORE }}" | base64 --decode > ${{ env.KEYSTORE_PATH }}

- name: Decode Android key properties
run: echo "${{ secrets.ANDROID_KEY_PROPERTIES }}" | base64 --decode > ${{ env.KEY_PROPS_PATH }}

# Decode Android release Service Account
- name: Decode Android Service Account
run: echo "${{ secrets.PRODUCTION_CREDENTIAL_FILE }}" | base64 --decode > ${{ env.SERVICE_ACCOUNT_PATH }}

# Run flutter commands
- name: Run flutter pub get
run: flutter pub get

- name: 📦 Install dependencies
run: flutter pub get

- name: 🕵️ Analyze to check for bad Dart/Flutter practices
run: flutter analyze

- name: 📉 Run all app tests
run: flutter test

# Build Android Bundle release file
- name: Build aab
run: |
flutter build appbundle
--release
# Upload generated aab to project artifacts
- name: Upload generated aab to the artifacts
uses: actions/upload-artifact@master
with:
name: aab-stores
path: { { env.AAB_PATH } }

# Deploy bundle to Google Play internal testing
- name: Deploy to Play Store (Internal testing)
uses: r0adkll/upload-google-play@v1
with:
serviceAccountJson: { { env.SERVICE_ACCOUNT_PATH } }
packageName: { { env.PACKAGE_NAME } }
releaseFiles: { { env.AAB_PATH } }
track: internal
87 changes: 87 additions & 0 deletions .github/workflows/build_ipa.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
name: "[DEV] Build and Publish iOS"
on: workflow_dispatch

jobs:
# Build job
build:
runs-on: [self-hosted, macOS]
steps:
# Checks-out our repository under $GITHUB_WORKSPACE, so our job can access it
- name: Checkout repository
uses: actions/checkout@v2

# Install the Apple certificate and provisioning profile
- name: Install the Apple certificate and provisioning profile
env:
BUILD_CERTIFICATE_BASE64: ${{ secrets.APPSTORE_CERT_BASE64 }}
P12_PASSWORD: ${{ secrets.APPSTORE_CERT_PASSWORD }}
BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.MOBILEPROVISION_BASE64 }}
KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
run: |
# create variables
CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision
KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
# import certificate and provisioning profile from secrets
echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH
echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode --output $PP_PATH
# create temporary keychain
security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
# import certificate to keychain
security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
security list-keychain -d user -s $KEYCHAIN_PATH
# apply provisioning profile
mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
# Install flutter
- name: Flutter get
uses: subosito/flutter-action@v1
with:
flutter-version: '3.19.6'

# Install your project's dependencies
- run: flutter pub get

# Build and sign the ipa using a single flutter command
- name: Building IPA
run: flutter build ipa --release --export-options-plist=ios/Runner/ExportOptions.plist

# Collect the file and upload as artifact
- name: collect ipa artifacts
uses: actions/upload-artifact@v2
with:
name: release-ipa
# Path to the release files
path: build/ios/ipa/*.ipa

# Important! Cleanup: remove the certificate and provisioning profile from the runner!
- name: Clean up keychain and provisioning profile
if: ${{ always() }}
run: |
security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
rm ~/Library/MobileDevice/Provisioning\ Profiles/build_pp.mobileprovision
# Release job, upload the ipa to Firebase App Distribution
release:
name: Release ipa to Firebase
needs: [ build ]
runs-on: ubuntu-latest
steps:

# Retrieve ipa file from GitHub artifacts
- uses: actions/checkout@v2
- name: Get release-ipa from artifacts
uses: actions/download-artifact@v2
with:
name: release-ipa

# Upload ipa file to Fiebase
# - name: Upload artifact to Firebase App Distribution
# uses: wzieba/Firebase-Distribution-Github-Action@v1
# with:
# appId: ${{secrets.FIREBASE_IOS_APP_ID}}
# token: ${{secrets.FIREBASE_TOKEN}}
# groups: ios-developers
# file: {your_app_name}.ipa
4 changes: 0 additions & 4 deletions .overcommit.yml

This file was deleted.

5 changes: 0 additions & 5 deletions hooks/run-tests.sh

This file was deleted.

Binary file modified ios/.DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>11.0</string>
<string>12.0</string>
</dict>
</plist>
7 changes: 7 additions & 0 deletions ios/Localizable.xcstrings
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"sourceLanguage" : "en",
"strings" : {

},
"version" : "1.0"
}
4 changes: 2 additions & 2 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ SPEC CHECKSUMS:
FirebaseRemoteConfig: bbd42790a4e84fde6aab7eae810b608e7b5c0bf6
FirebaseSessions: f90fe9212ee2818641eda051c0835c9c4e30d9ae
FirebaseSharedSwift: 62e248642c0582324d0390706cadd314687c116b
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
Google-Mobile-Ads-SDK: e81e8b009a182dc8dd14951782efdbb30a5e4510
google_mobile_ads: 035df0d095e1a196b52e3c91534d0718d3dacf98
Expand All @@ -309,4 +309,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 7be2f5f74864d463a8ad433546ed1de7e0f29aef

COCOAPODS: 1.14.3
COCOAPODS: 1.15.2
13 changes: 9 additions & 4 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
F7C880E82BF1968900B0B0B6 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = F7C880E72BF1968900B0B0B6 /* Localizable.xcstrings */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -67,6 +68,7 @@
B52470B4ADB288C354CBA968 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C973E37A587097DDC4A3E67B /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
F71AA592E20984E59A9BD7C9 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
F7C880E72BF1968900B0B0B6 /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Localizable.xcstrings; sourceTree = "<group>"; };
F7F24DE62B1F9B8700A3BBA3 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -125,6 +127,7 @@
97C146E51CF9000F007C117D = {
isa = PBXGroup;
children = (
F7C880E72BF1968900B0B0B6 /* Localizable.xcstrings */,
9740EEB11CF90186004384FC /* Flutter */,
97C146F01CF9000F007C117D /* Runner */,
97C146EF1CF9000F007C117D /* Products */,
Expand Down Expand Up @@ -222,7 +225,7 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 1430;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
331C8080294A63A400263BE5 = {
Expand All @@ -243,6 +246,7 @@
knownRegions = (
en,
Base,
"pt-BR",
);
mainGroup = 97C146E51CF9000F007C117D;
productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
Expand All @@ -269,6 +273,7 @@
files = (
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
F7C880E82BF1968900B0B0B6 /* Localizable.xcstrings in Resources */,
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
3A832E26BEBD5F69D72879CD /* GoogleService-Info.plist in Resources */,
Expand Down Expand Up @@ -501,7 +506,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
Expand Down Expand Up @@ -638,7 +643,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -687,7 +692,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ios/Runner/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import UIKit
import Flutter
import flutter_local_notifications

@UIApplicationMain
@main
@objc class AppDelegate: FlutterAppDelegate {

override func application(
Expand Down
2 changes: 2 additions & 0 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ void main() async {

AppAd.showAd = await LocalStorageService().showAds();

AppAd.showAd = false;

await Firebase.initializeApp(
options: DefaultFirebaseOptions.currentPlatform,
);
Expand Down
18 changes: 0 additions & 18 deletions lib/pages/home/widgets/home_page_content.dart
Original file line number Diff line number Diff line change
Expand Up @@ -94,24 +94,6 @@ class _HomePageContentState extends State<HomePageContent> {
searchController: widget.controller.searchController,
hintText: 'Type the user name',
),
// SizedBox(height: 8),
// Observer(builder: (context) {
// if (widget.controller.myRewardedAd == null) {
// return Container();
// }

// return ElevatedButton(
// onPressed: () {
// widget.controller.myRewardedAd!.show(
// onUserEarnedReward: (ad, item) async {
// await widget.controller.onUserEarnedReward(ad, item);
// this.setState(() {});
// },
// );
// },
// child: Text('Remove ads'),
// );
// }),
SizedBox(height: 24),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import 'package:firebase_analytics/firebase_analytics.dart';
import 'package:flutter/material.dart';
import 'package:hub_finder/pages/onboarding/onboarding_controller.dart';
import 'package:hub_finder/shared/core/app_colors.dart';
import 'package:flutter_animate/flutter_animate.dart';

class OnboardingPageQuestions extends StatefulWidget {
final OnboardingController controller;
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Find user, repos and organizations in your phone.

publish_to: "none"

version: 1.5.0+28
version: 2.0.0+30

environment:
sdk: ">=2.17.0 <3.0.0"
Expand Down

0 comments on commit 1669dad

Please sign in to comment.