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

Develop front #127

Merged
merged 9 commits into from
May 3, 2024
Merged
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: 2 additions & 0 deletions front/capstone_front/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -146,3 +146,5 @@ app.*.symbols
**/lib/firebase_options.dart
**/android/app/google-services.json
**/ios/firebase_app_id_file.json
**/firebase.json
**/ios/Runner/GoogleService-Info.plist
9 changes: 6 additions & 3 deletions front/capstone_front/android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
plugins {
id "com.android.application"
id "com.android.application"
// START: FlutterFire Configuration
id 'com.google.gms.google-services'
// END: FlutterFire Configuration
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
}
Expand All @@ -23,7 +26,7 @@ if (flutterVersionName == null) {
}

android {
namespace "com.example.capstone_front"
namespace "com.foreign.kookmin"
compileSdk flutter.compileSdkVersion
ndkVersion flutter.ndkVersion

Expand All @@ -42,7 +45,7 @@ android {

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.example.capstone_front"
applicationId "com.foreign.kookmin"
// 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 21
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
android:value="2" />
</application>
<!-- Required to query activities that can process text, see:
https://developer.android.com/training/package-visibility?hl=en and
https://developer.android.com/training/package="com.foreign.kookmin">
https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.

In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.capstone_front
package com.foreign.kookmin

import io.flutter.embedding.android.FlutterActivity

Expand Down
3 changes: 3 additions & 0 deletions front/capstone_front/android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ pluginManagement {
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.0" apply false
// START: FlutterFire Configuration
id "com.google.gms.google-services" version "4.3.15" apply false
// END: FlutterFire Configuration
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
}

Expand Down
Binary file added front/capstone_front/assets/audio/sample.wav
Binary file not shown.
18 changes: 17 additions & 1 deletion front/capstone_front/assets/translations/ko-KR.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,23 @@
"example_sentence": "예문",
"custom_sentence": "커스텀",
"permission_allow_notice": "음성 녹음 권한을 허용해야 발음 연습을 이용할 수 있습니다",
"hint_custom_example": "연습하고 싶은 문장을 입력해주세요"
"hint_custom_example": "연습하고 싶은 문장을 입력해주세요",
"guide": "녹음을 진행하고 결과를 확인하세요",
"record": "버튼을 눌러 녹음 시작",
"complete": "녹음 완료",
"pause": "일시 정지",
"resume": "이어서 진행",
"my_speech": "나의 발음",
"re_record": "다시 녹음",
"get_result": "결과 확인",
"result": " 분석 결과 ",
"accuracy": "정확도 점수",
"fluency": "유창성 점수",
"completeness": "완성도 점수",
"result_detail": "상세 분석 결과",
"wrong_speech": "잘못된 발음",
"omission": "생략",
"insertion": "삽입"
},
"chatbotScreen": {
"chatbot": "챗봇",
Expand Down
30 changes: 0 additions & 30 deletions front/capstone_front/ios/Runner/GoogleService-Info.plist

This file was deleted.

1 change: 1 addition & 0 deletions front/capstone_front/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import 'package:capstone_front/screens/signup/singup_password_screen.dart';
import 'package:capstone_front/screens/speech_practice/speech_practice_screen.dart';
import 'package:capstone_front/screens/speech_practice/speech_screen.dart';
import 'package:capstone_front/screens/speech_practice/speech_example_sentences/speech_select_sentence_screen.dart';
import 'package:capstone_front/screens/speech_practice/utils/recorder_screen.dart';
import 'package:capstone_front/utils/page_animation.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:firebase_core/firebase_core.dart';
Expand Down
12 changes: 12 additions & 0 deletions front/capstone_front/lib/models/speech_model.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
class SpeechModel {
double paragraphAccuracy;
double paragraphCompleteness;
double paragraphFluency;
List<dynamic> wordList;

SpeechModel.fromJson(Map<String, dynamic> json)
: paragraphAccuracy = json['paragraphAccuracy'],
paragraphCompleteness = json['paragraphCompleteness'],
paragraphFluency = json['paragraphFluency'],
wordList = json['wordList'];
}
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class _HelperWriteScreenState extends State<QnaWriteScreen> {
IconButton(
onPressed: () async {
if (_currentPhotos >= _maxPhotos) {
makeToast("최대 $_maxPhotos개의 사진만 가능합니다");
makeToast("$_maxPhotos의 사진만 가능합니다");
} else {
if (_maxPhotos - _currentPhotos < 2) {
var image = await picker.pickImage(
Expand All @@ -135,16 +135,10 @@ class _HelperWriteScreenState extends State<QnaWriteScreen> {
multiImages = await picker.pickMultiImage(
limit: _maxPhotos - _currentPhotos,
);
if (_currentPhotos + multiImages.length >
4) {
makeToast(
"최대 $_maxPhotos개의 사진만 가능합니다. 다시 선택해주세요.");
} else {
setState(() {
images.addAll(multiImages);
_currentPhotos += multiImages.length;
});
}
setState(() {
images.addAll(multiImages);
_currentPhotos += multiImages.length;
});
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class _SpeechCustomSentenceScreenState
child: TextField(
keyboardType: TextInputType.multiline,
minLines: 2,
maxLines: 2,
maxLines: 5,
maxLength: 40,
controller: _textController,
textInputAction: TextInputAction.newline,
Expand Down
Loading