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.

Sign up for GitHub

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

chore(recipients-app): Bump android versions and dependencies #959

Closed
wants to merge 2 commits into from
Closed

chore(recipients-app): Bump android versions and dependencies #959

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e66857
Bump android versions and dependencies
MDikkii Nov 30, 2024
4b7c871
Remove todo, bump java compatibility version
MDikkii Nov 30, 2024
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
11 changes: 11 additions & 0 deletions recipients_app/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ if (keystorePropertiesFile.exists()) {
android {
compileSdkVersion 34

namespace "org.socialincome.app"

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
Expand Down Expand Up @@ -78,6 +80,15 @@ android {
dimension "environment"
}
}

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

kotlinOptions {
jvmTarget = "1.8"
}
}

flutter {
Expand Down
2 changes: 1 addition & 1 deletion recipients_app/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions recipients_app/android/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.0" apply false
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
id "com.android.application" version "8.3.0" apply false
id "org.jetbrains.kotlin.android" version "1.9.25" apply false
KarinBerg marked this conversation as resolved.
Show resolved Hide resolved
// TODO(Verena): update to 4.4.0 once https://github.com/firebase/flutterfire/discussions/8691 is fixed
id "com.google.gms.google-services" version "4.3.15" apply false
}
Expand Down
16 changes: 10 additions & 6 deletions recipients_app/lib/kri_intl.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,8 +413,7 @@ class KriCupertinoLocalizations extends GlobalCupertinoLocalizations {
required super.singleDigitSecondFormat,
});

static const LocalizationsDelegate<CupertinoLocalizations> delegate =
_KriCupertinoLocalizationsDelegate();
static const LocalizationsDelegate<CupertinoLocalizations> delegate = _KriCupertinoLocalizationsDelegate();

@override
String datePickerYear(int yearIndex) => yearIndex.toString();
Expand Down Expand Up @@ -459,8 +458,7 @@ class KriCupertinoLocalizations extends GlobalCupertinoLocalizations {
DatePickerDateOrder get datePickerDateOrder => DatePickerDateOrder.mdy;

@override
DatePickerDateTimeOrder get datePickerDateTimeOrder =>
DatePickerDateTimeOrder.date_time_dayPeriod;
DatePickerDateTimeOrder get datePickerDateTimeOrder => DatePickerDateTimeOrder.date_time_dayPeriod;

@override
String get anteMeridiemAbbreviation => "AM";
Expand Down Expand Up @@ -664,8 +662,7 @@ class KriMaterialLocalizations extends GlobalMaterialLocalizations {
required super.twoDigitZeroPaddedFormat,
});

static const LocalizationsDelegate<MaterialLocalizations> delegate =
_KriMaterialLocalizationsDelegate();
static const LocalizationsDelegate<MaterialLocalizations> delegate = _KriMaterialLocalizationsDelegate();

// #docregion Getters
@override
Expand Down Expand Up @@ -1134,4 +1131,11 @@ class KriMaterialLocalizations extends GlobalMaterialLocalizations {

@override
String get shareButtonLabel => "Share...";

@override
String get clearButtonTooltip => "Clear text";

@override
// TODO: implement selectedDateLabel
String get selectedDateLabel => "Selected";
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Implement the selectedDateLabel method

The TODO comment indicates incomplete implementation. The current placeholder value "Selected" should be translated to Krio language to maintain consistency with other translations in the file.

Would you like me to help implement the proper Krio translation for this label? I can also create a GitHub issue to track this task.

}
4 changes: 2 additions & 2 deletions recipients_app/lib/ui/buttons/button_outlined_big.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ class ButtonOutlinedBig extends StatelessWidget {
height: _buttonHeight,
child: OutlinedButton(
style: Theme.of(context).outlinedButtonTheme.style?.copyWith(
backgroundColor: MaterialStateProperty.all(Colors.white),
side: MaterialStateProperty.all(
backgroundColor: WidgetStateProperty.all(Colors.white),
side: WidgetStateProperty.all(
const BorderSide(
color: AppColors.primaryColor,
width: 2,
Expand Down
12 changes: 6 additions & 6 deletions recipients_app/lib/ui/buttons/button_small.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ class ButtonSmall extends StatelessWidget {
child: ElevatedButton(
style: Theme.of(context).elevatedButtonTheme.style?.copyWith(
backgroundColor:
MaterialStateProperty.all(Colors.transparent),
foregroundColor: MaterialStateProperty.all(color),
shape: MaterialStateProperty.all(
WidgetStateProperty.all(Colors.transparent),
foregroundColor: WidgetStateProperty.all(color),
shape: WidgetStateProperty.all(
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(AppSizes.radiusLarge),
side: BorderSide(
Expand All @@ -56,9 +56,9 @@ class ButtonSmall extends StatelessWidget {
height: 26,
child: ElevatedButton(
style: Theme.of(context).elevatedButtonTheme.style?.copyWith(
backgroundColor: MaterialStateProperty.all(color),
foregroundColor: MaterialStateProperty.all(Colors.white),
shape: MaterialStateProperty.all(
backgroundColor: WidgetStateProperty.all(color),
foregroundColor: WidgetStateProperty.all(Colors.white),
shape: WidgetStateProperty.all(
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(AppSizes.radiusLarge),
),
Expand Down
Loading
Loading