Yimaru/Yimaru-Mobile
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Yimaru:4cf063dce0125c0f29578805d7a7a32d125d6f5e
Branches Tags
Yimaru:main
Yimaru:develop
Yimaru:ios
..
compare: Yimaru:456a3712a52492a817edadbca66e521eda790c25
Branches Tags
Yimaru:develop
Yimaru:ios
Yimaru:main

No commits in common. "4cf063dce0125c0f29578805d7a7a32d125d6f5e" and "456a3712a52492a817edadbca66e521eda790c25" have entirely different histories.
4cf063dce0 ... 456a3712a5

5 changed files with 10 additions and 8 deletions
Show Stats Expand all files Collapse all files

2
android/app/src/main/AndroidManifest.xml
View File

@ -4,6 +4,8 @@
android:name="android.hardware.camera" android:name="android.hardware.camera"
android:required="false" /> android:required="false" />
<uses-permission android:name="android.permission.CAMERA"/>
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
<application <application
android:label="Yimaru Academy" android:label="Yimaru Academy"
android:name="${applicationName}" android:name="${applicationName}"

2
lib/main.dart
View File

@ -23,7 +23,7 @@ Future<void> main() async {
EasyLocalization( EasyLocalization(
supportedLocales: const [ supportedLocales: const [
Locale('en'), Locale('en'),
Locale('አማ'), Locale('am'),
], ],
path: 'assets/translations', path: 'assets/translations',
startLocale: const Locale('en'), startLocale: const Locale('en'),

4
lib/services/localization_service.dart
View File

@ -59,8 +59,8 @@ notifyListeners();
} }
Future<void> setAmharicLanguage(BuildContext context) async { Future<void> setAmharicLanguage(BuildContext context) async {
await context.setLocale(const Locale('አማ')); await context.setLocale(const Locale('am'));
await _secureService.setString('language', 'አማ'); await _secureService.setString('language', 'am');
notifyListeners(); notifyListeners();
} }

8
lib/ui/views/onboarding/screens/gender_form_screen.dart
View File

@ -98,14 +98,14 @@ class GenderFormScreen extends ViewModelWidget<OnboardingViewModel> {
Widget _buildAgeGroups(OnboardingViewModel viewModel) => ListView.builder( Widget _buildAgeGroups(OnboardingViewModel viewModel) => ListView.builder(
shrinkWrap: true, shrinkWrap: true,
itemCount: viewModel.selectedLanguage['code'] == 'አማ' itemCount: viewModel.selectedLanguage['code'] == 'am'
? viewModel.gendersAm.length ? viewModel.gendersAm.length
: viewModel.gendersEn.length, : viewModel.gendersEn.length,
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
itemBuilder: (context, index) => _buildAgeGroup( itemBuilder: (context, index) => _buildAgeGroup(
title:viewModel.selectedLanguage['code'] == 'አማ' ? viewModel.gendersAm[index]:viewModel.gendersEn[index], title:viewModel.selectedLanguage['code'] == 'am' ? viewModel.gendersAm[index]:viewModel.gendersEn[index],
selected: viewModel.isSelectedGender(viewModel.selectedLanguage['code'] == 'አማ' ? viewModel.gendersAm[index]: viewModel.gendersEn[index]), selected: viewModel.isSelectedGender(viewModel.selectedLanguage['code'] == 'am' ? viewModel.gendersAm[index]: viewModel.gendersEn[index]),
onTap: () => viewModel.setSelectedGender(viewModel.selectedLanguage['code'] == 'አማ' ? viewModel.gendersAm[index]: viewModel.gendersEn[index]), onTap: () => viewModel.setSelectedGender(viewModel.selectedLanguage['code'] == 'am' ? viewModel.gendersAm[index]: viewModel.gendersEn[index]),
), ),
); );

2
pubspec.yaml
View File

@ -1,5 +1,5 @@
name: yimaru_app name: yimaru_app
version: 0.1.21+23 version: 0.1.20+22
publish_to: 'none' publish_to: 'none'
description: A new Flutter project. description: A new Flutter project.