Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #57

Merged
merged 16 commits into from
Sep 16, 2023
Merged

Dev #57

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .dccache
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"/Users/talrub/rotary/rotary_nl_rye/web/index.html":[3705,1650963650963.4424,"b2ac83858bbd4bdc9cbc6a82ca7a3bf5a41709124ce9db3aade8a2b312a6b89a"],"/Users/talrub/rotary/rotary_nl_rye/ios/Runner/AppDelegate.swift":[583,1654453496707.3093,"b7521c2d70dfa951933a293260aa8f67e2452e940c6903efce9a48fc1c2ca07e"],"/Users/talrub/rotary/rotary_nl_rye/ios/Runner/Runner-Bridging-Header.h":[38,1650963650933.3184,"1a8d11d01d1cc92c650c9c9ed35299240052d4683a15a719a2315ef44185e074"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/debug/AndroidManifest.xml":[333,1650963650854.6165,"e2f194e9999af270c007e8708182d5038607e0bfaf661cf01335dced5d47eab7"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/AndroidManifest.xml":[4773,1664639716249.3142,"12f48db6170735afea7ba3621d60a3fe70e6da8b660c097207b94131c1255257"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/profile/AndroidManifest.xml":[333,1650963650864.5076,"e2f194e9999af270c007e8708182d5038607e0bfaf661cf01335dced5d47eab7"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/drawable/launch_background.xml":[319,1664699212763.1885,"8065ccfb0fb675646763888aa3ecc9e701223774cbb4263cedc0214a061169a0"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/drawable-anydpi/home.xml":[361,1650963650855.9844,"059f6c29f0f6894e69d941576fb3f35eaf6afb20507186da2233fdfe446f9052"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/drawable-night/launch_background.xml":[319,1664699212763.959,"8065ccfb0fb675646763888aa3ecc9e701223774cbb4263cedc0214a061169a0"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/drawable-night-v21/launch_background.xml":[319,1664699212765.2368,"8065ccfb0fb675646763888aa3ecc9e701223774cbb4263cedc0214a061169a0"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/drawable-v21/launch_background.xml":[319,1664699212764.6663,"8065ccfb0fb675646763888aa3ecc9e701223774cbb4263cedc0214a061169a0"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/values/styles.xml":[1238,1664699212770.794,"3cc1fadaa4995c174272af75c8d699dfacddf582b46e680ad6abfb59e5a086b9"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/values-night/styles.xml":[1190,1664699212771.8809,"0bbcf838e3af2bc6b1ef8d7a971f835520429c0e9007eb013c293c0074cb3067"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/values-v31/styles.xml":[985,1664699212768.9136,"0900ae2ca7e7e09125541ec9d65285ecc8a44c0145bc9e20570f4b4ca9afa9d4"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/kotlin/com/example/rotary_nl_rye/Application.kt":[552,1652982898958.404,"c7c4bc8a16184651c5be2aae6bf8252c9d152c382bee0dcccc82d8de97aab6c5"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/kotlin/com/example/rotary_nl_rye/MainActivity.kt":[130,1650963650855.6948,"5473d58de65ecdfef006ccda1ef37c401e918190515dab3fff1e178cb7c9c209"]}
{"/Users/talrub/rotary/rotary_nl_rye/web/index.html":[3705,1650963650963.4424,"b2ac83858bbd4bdc9cbc6a82ca7a3bf5a41709124ce9db3aade8a2b312a6b89a"],"/Users/talrub/rotary/rotary_nl_rye/ios/Runner/AppDelegate.swift":[583,1678305465757.2583,"b7521c2d70dfa951933a293260aa8f67e2452e940c6903efce9a48fc1c2ca07e"],"/Users/talrub/rotary/rotary_nl_rye/ios/Runner/Runner-Bridging-Header.h":[38,1650963650933.3184,"1a8d11d01d1cc92c650c9c9ed35299240052d4683a15a719a2315ef44185e074"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/debug/AndroidManifest.xml":[333,1650963650854.6165,"e2f194e9999af270c007e8708182d5038607e0bfaf661cf01335dced5d47eab7"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/AndroidManifest.xml":[4773,1664639716249.3142,"12f48db6170735afea7ba3621d60a3fe70e6da8b660c097207b94131c1255257"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/profile/AndroidManifest.xml":[333,1650963650864.5076,"e2f194e9999af270c007e8708182d5038607e0bfaf661cf01335dced5d47eab7"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/drawable/launch_background.xml":[321,1664699379289.0466,"42b8d099f0a6d79e90a67949d7a655c09458c734aa1bd8c4d7c73a79b28397ea"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/drawable-anydpi/home.xml":[361,1650963650855.9844,"059f6c29f0f6894e69d941576fb3f35eaf6afb20507186da2233fdfe446f9052"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/drawable-night/launch_background.xml":[321,1664699379289.912,"42b8d099f0a6d79e90a67949d7a655c09458c734aa1bd8c4d7c73a79b28397ea"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/drawable-night-v21/launch_background.xml":[321,1664699379291.3127,"42b8d099f0a6d79e90a67949d7a655c09458c734aa1bd8c4d7c73a79b28397ea"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/drawable-v21/launch_background.xml":[321,1664699379290.7395,"42b8d099f0a6d79e90a67949d7a655c09458c734aa1bd8c4d7c73a79b28397ea"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/values/styles.xml":[1312,1678539581853.32,"b52cbb6263a82204886cef542e19271a68673d48b2ce1cbfc088d77cd34b2f6d"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/values-night/styles.xml":[1264,1678539581855.5444,"0c1941d70fcf4157824c0321892f064183c579583576fe2dd7710e0f5c05d320"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/res/values-v31/styles.xml":[985,1664699379295.0557,"0900ae2ca7e7e09125541ec9d65285ecc8a44c0145bc9e20570f4b4ca9afa9d4"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/kotlin/com/example/rotary_nl_rye/Application.kt":[552,1652982898958.404,"c7c4bc8a16184651c5be2aae6bf8252c9d152c382bee0dcccc82d8de97aab6c5"],"/Users/talrub/rotary/rotary_nl_rye/android/app/src/main/kotlin/com/example/rotary_nl_rye/MainActivity.kt":[130,1650963650855.6948,"5473d58de65ecdfef006ccda1ef37c401e918190515dab3fff1e178cb7c9c209"]}
147 changes: 125 additions & 22 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,115 @@
// def localProperties = new Properties()
// def localPropertiesFile = rootProject.file('local.properties')
// if (localPropertiesFile.exists()) {
// localPropertiesFile.withReader('UTF-8') { reader ->
// localProperties.load(reader)
// }
// }

// def flutterRoot = localProperties.getProperty('flutter.sdk')
// if (flutterRoot == null) {
// throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
// }

// def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
// if (flutterVersionCode == null) {
// flutterVersionCode = '1'
// }

// def flutterVersionName = localProperties.getProperty('flutter.versionName')
// if (flutterVersionName == null) {
// flutterVersionName = '1.0'
// }

// def keystoreProperties = new Properties()
// def keystorePropertiesFile = rootProject.file('key.properties')
// if (keystorePropertiesFile.exists()) {
// keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
// }



// apply plugin: 'com.android.application'
// apply plugin: 'kotlin-android'
// apply plugin:'com.google.gms.google-services'
// apply plugin: 'com.google.firebase.crashlytics'
// apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

// android {
// compileSdkVersion 33

// compileOptions {
// sourceCompatibility JavaVersion.VERSION_1_8
// targetCompatibility JavaVersion.VERSION_1_8
// }

// kotlinOptions {
// jvmTarget = '1.8'
// }

// sourceSets {
// main.java.srcDirs += 'src/main/kotlin'
// }

// defaultConfig {
// // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
// applicationId "com.caelitechnologies.rotary_nl_rye"
// minSdkVersion 23
// targetSdkVersion 31
// // TODO before release ensure to shrink file size and delete multiDex (https://developer.android.com/studio/build/multidex)
// multiDexEnabled true
// versionCode flutterVersionCode.toInteger()
// versionName flutterVersionName
// }

// signingConfigs {
// release {
// keyAlias keystoreProperties['keyAlias']
// keyPassword keystoreProperties['keyPassword']
// storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
// storePassword keystoreProperties['storePassword']
// }
// }
// buildTypes {
// debug{
// signingConfig signingConfigs.debug
// }
// profile {
// signingConfig signingConfigs.debug
// }
// release {
// // TODO: Add your own signing config for the release build.
// // Signing with the debug keys for now, so `flutter run --release` works.
// signingConfig signingConfigs.release
// // signingConfig signingConfigs.debug
// minifyEnabled false
// shrinkResources false
// firebaseCrashlytics {
// mappingFileUploadEnabled false
// }
// }
// }
// buildToolsVersion '30.0.3'
// }

// flutter {
// source '../..'
// }

// dependencies {
// implementation "androidx.multidex:multidex:2.0.1"
// implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
// // // Required for firebase messaging
// // implementation 'com.google.firebase:firebase-messaging:20.1.6'
// }


plugins {
id "com.android.application"
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
}

def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
Expand All @@ -6,11 +118,6 @@ if (localPropertiesFile.exists()) {
}
}

def flutterRoot = localProperties.getProperty('flutter.sdk')
if (flutterRoot == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}

def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
if (flutterVersionCode == null) {
flutterVersionCode = '1'
Expand All @@ -29,14 +136,13 @@ if (keystorePropertiesFile.exists()) {



apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin:'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
apply plugin: 'com.google.gms.google-services'

android {
compileSdkVersion 33
namespace "com.caelitechnologies.rotary_nl_rye"
compileSdkVersion flutter.compileSdkVersion
ndkVersion flutter.ndkVersion

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand All @@ -54,23 +160,24 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.caelitechnologies.rotary_nl_rye"
minSdkVersion 23
targetSdkVersion 31
// TODO before release ensure to shrink file size and delete multiDex (https://developer.android.com/studio/build/multidex)
multiDexEnabled true
// 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
}

signingConfigs {
signingConfigs {
release {
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
storePassword keystoreProperties['storePassword']
}
}
buildTypes {

buildTypes {
debug{
signingConfig signingConfigs.debug
}
Expand All @@ -87,9 +194,8 @@ android {
firebaseCrashlytics {
mappingFileUploadEnabled false
}
}
}
buildToolsVersion '30.0.3'
}
}
}

flutter {
Expand All @@ -98,7 +204,4 @@ flutter {

dependencies {
implementation "androidx.multidex:multidex:2.0.1"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
// // Required for firebase messaging
// implementation 'com.google.firebase:firebase-messaging:20.1.6'
}
2 changes: 1 addition & 1 deletion android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.rotary_nl_rye">
package="com.caelitechnologies.rotary_nl_rye">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
6 changes: 4 additions & 2 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.rotary_nl_rye">
package="com.caelitechnologies.rotary_nl_rye">
<uses-permission
android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<queries>
<!-- If your app opens https URLs -->
<intent>
Expand Down Expand Up @@ -41,7 +43,7 @@
</queries>
<application
android:label="Rotary Youth Exchange NL"
android:name=".Application"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher">
<!-- Add custom icon to the notifications -->
<meta-data
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Generated file.
//
// If you wish to remove Flutter's multidex support, delete this entire file.
//
// Modifications to this file should be done in a copy under a different name
// as this file may be regenerated.

package io.flutter.app;

import android.app.Application;
import android.content.Context;
import androidx.annotation.CallSuper;
import androidx.multidex.MultiDex;

/**
* Extension of {@link android.app.Application}, adding multidex support.
*/
public class FlutterMultiDexApplication extends Application {
@Override
@CallSuper
protected void attachBaseContext(Context base) {
super.attachBaseContext(base);
MultiDex.install(this);
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.rotary_nl_rye
package com.caelitechnologies.rotary_nl_rye
import io.flutter.app.FlutterApplication
import io.flutter.plugin.common.PluginRegistry
import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.rotary_nl_rye
package com.caelitechnologies.rotary_nl_rye

import io.flutter.embedding.android.FlutterActivity

Expand Down
Binary file modified android/app/src/main/res/drawable-hdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/drawable-mdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/drawable-night-v21/background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/drawable-night/background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/drawable-v21/background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/drawable-xhdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/drawable-xxhdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/drawable/background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions android/app/src/main/res/values-night-v31/styles.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
Flutter UI initializes, as well as behind your Flutter UI while its
running.
This Theme is only used starting with V2 of Flutter's Android embedding. -->
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
<item name="android:windowBackground">?android:colorBackground</item>
</style>
</resources>
1 change: 1 addition & 0 deletions android/app/src/main/res/values-night/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<item name="android:windowBackground">@drawable/launch_background</item>
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values-v31/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<item name="android:windowBackground">@drawable/launch_background</item>
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/profile/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.rotary_nl_rye">
package="com.caelitechnologies.rotary_nl_rye">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
27 changes: 16 additions & 11 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,36 +1,41 @@
buildscript {
ext.kotlin_version = '1.6.10'
ext.kotlin_version = '1.7.10'
repositories {
google()
// jcenter()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:4.2.2'

// dependencies {
// classpath 'com.android.tools.build:gradle:4.2.2'
// classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// classpath 'com.google.gms:google-services:4.3.13'
// classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
// }

dependencies {
classpath 'com.android.tools.build:gradle:7.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.13'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
classpath 'com.google.gms:google-services:4.3.15'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
}
}

allprojects {
repositories {
google()
mavenCentral()
jcenter()
}
tasks.withType(JavaCompile) {
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
}
}

rootProject.buildDir = '../build'
subprojects {
project.buildDir = "${rootProject.buildDir}/${project.name}"
}
subprojects {
project.evaluationDependsOn(':app')
}

task clean(type: Delete) {
tasks.register("clean", Delete) {
delete rootProject.buildDir
}
5 changes: 2 additions & 3 deletions android/gradle/wrapper/gradle-wrapper.properties
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Sun May 30 14:21:41 GMT+05:30 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
Loading