Skip to content
This repository has been archived by the owner on Oct 19, 2022. It is now read-only.

Commit

Permalink
OT-203 Rename app #95
Browse files Browse the repository at this point in the history
  • Loading branch information
Boehrsi authored and florianhaar committed May 16, 2019
1 parent c170e07 commit f35df48
Show file tree
Hide file tree
Showing 96 changed files with 566 additions and 566 deletions.
14 changes: 7 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# Contributing to OX Talk
# Contributing to OX Coi

At first thanks for you interest in helping in the development of OX Talk and COI. Before contributing, please have a look at the following points.
At first thanks for you interest in helping in the development of OX Coi and COI. Before contributing, please have a look at the following points.

## You have a question?
If you have a question regarding usage or implementation details please don't open an issue. First have a look into our [Wiki](https://github.com/open-xchange/ox-talk/wiki). You can also contact us via [coi-dev.org](https://www.coi-dev.org/) or via our [mailing list](mailto:[email protected]). We are always happy to help people, but we have to keep the issue tracker as cleaned up as possible to maintain the overview.
If you have a question regarding usage or implementation details please don't open an issue. First have a look into our [Wiki](https://github.com/open-xchange/ox-coi/wiki). You can also contact us via [coi-dev.org](https://www.coi-dev.org/) or via our [mailing list](mailto:[email protected]). We are always happy to help people, but we have to keep the issue tracker as cleaned up as possible to maintain the overview.

## You found a bug?

If you found a bug please use our GitHub issue tracker. Verify first if the given issue doesn't already exists and after that create an issue with the [bug report template](https://github.com/open-xchange/ox-talk/issues/new?assignees=&labels=&template=bug_report.md). Please input as much information as possible, as this will hugely increase our possibilities to fix issues.
If you found a bug please use our GitHub issue tracker. Verify first if the given issue doesn't already exists and after that create an issue with the [bug report template](https://github.com/open-xchange/ox-coi/issues/new?assignees=&labels=&template=bug_report.md). Please input as much information as possible, as this will hugely increase our possibilities to fix issues.

## You fixed a bug?

We are always happy about every line of contributed code. Please open a pull request and link it against the issue you are fixing. The pull request should contain a description about the fixed problem and the used approach. If possible provide tests for the adjusted code parts. Please adhere to our [coding guidelines](https://github.com/open-xchange/ox-talk/wiki/Coding-Guidelines).
We are always happy about every line of contributed code. Please open a pull request and link it against the issue you are fixing. The pull request should contain a description about the fixed problem and the used approach. If possible provide tests for the adjusted code parts. Please adhere to our [coding guidelines](https://github.com/open-xchange/ox-coi/wiki/Coding-Guidelines).

## You want to suggest a feature?

If you have an idea for a feature use our GitHub issue tracker. First verify that there's no matching feature suggestion present and after that create an issue with the [feature request template](https://github.com/open-xchange/ox-talk/issues/new?assignees=&labels=&template=feature_request.md).
If you have an idea for a feature use our GitHub issue tracker. First verify that there's no matching feature suggestion present and after that create an issue with the [feature request template](https://github.com/open-xchange/ox-coi/issues/new?assignees=&labels=&template=feature_request.md).

## You implemented a feature?

We are always happy about every line of contributed code. Please open a pull request and link it against the issue you implemented. The pull request should contain a description about the given implementation. New features should always be tested. Please adhere to our [coding guidelines](https://github.com/open-xchange/ox-talk/wiki/Coding-Guidelines).
We are always happy about every line of contributed code. Please open a pull request and link it against the issue you implemented. The pull request should contain a description about the given implementation. New features should always be tested. Please adhere to our [coding guidelines](https://github.com/open-xchange/ox-coi/wiki/Coding-Guidelines).
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# OX Talk
# OX Coi

OX Talk is a mail based chat app. This app provides the user interface for an IMAP / SMTP based chat on Android and iOS.
OX Coi is a mail based chat app. This app provides the user interface for an IMAP / SMTP based chat on Android and iOS.

- **Android state:** Currently in development
- **iOS state:** Pending

## Information
- [Documentation](https://github.com/open-xchange/ox-talk/wiki/Developer-Documentation)
- [Documentation](https://github.com/open-xchange/ox-coi/wiki/Developer-Documentation)
- The IMAP / SMTP interactions are managed by the [Flutter Delta Chat Core Plugin](https://github.com/open-xchange/flutter-deltachat-core)

## Requirements
- The latest Flutter stable version is used (if problems occur try the [Flutter Dev Channel](https://github.com/flutter/flutter/wiki/Flutter-build-release-channels))
- The [Flutter Delta Chat Core Plugin](https://github.com/open-xchange/flutter-deltachat-core) needs to be checked out right beside the OX Talk app (the repositories should be located in the same folder) and please follow the requirements given by that project
- The [Flutter Delta Chat Core Plugin](https://github.com/open-xchange/flutter-deltachat-core) needs to be checked out right beside the OX Coi app (the repositories should be located in the same folder) and please follow the requirements given by that project

## Execution
- Build and run the project via your IDE / Flutter CLI
Expand Down
6 changes: 3 additions & 3 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ android {
}

defaultConfig {
applicationId "com.openxchange.oxtalk"
applicationId "com.openxchange.oxcoi"
minSdkVersion 21
targetSdkVersion 28
versionCode flutterVersionCode.toInteger()
Expand All @@ -58,12 +58,12 @@ android {
productFlavors {
stable {
dimension "configuration"
resValue "string", "app_name", "OX Talk"
resValue "string", "app_name", "OX Coi"
}
development {
dimension "configuration"
applicationIdSuffix ".dev"
resValue "string", "app_name", "OX Talk Dev"
resValue "string", "app_name", "OX Coi Dev"
}
}

Expand Down
2 changes: 1 addition & 1 deletion android/app/google-services.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"client_info": {
"mobilesdk_app_id": "1:106809038230:android:9914162a2418a2de",
"android_client_info": {
"package_name": "com.openxchange.oxtalk.dev"
"package_name": "com.openxchange.oxcoi.dev"
}
},
"oauth_client": [
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.openxchange.oxtalk">
package="com.openxchange.oxcoi">

<!-- The INTERNET permission is required for development. Specifically,
flutter needs it to communicate with the running application
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
* for more details.
*/

package com.openxchange.oxtalk;
package com.openxchange.oxcoi;

import android.os.Bundle;
import io.flutter.app.FlutterActivity;
Expand Down
2 changes: 1 addition & 1 deletion documentation/communication-app-plugin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ digraph G {
style = filled,
fontname = "Helvetica-Outline"
];
"OX Talk App (Flutter)" -> "Delta Chat Core Plugin API (Dart)"
"OX Coi App (Flutter)" -> "Delta Chat Core Plugin API (Dart)"
"Delta Chat Core Plugin API (Dart)" -> "Delta Chat Core Plugin Native Android API (Java/Kotlin)"
"Delta Chat Core Plugin API (Dart)" -> "Delta Chat Core Plugin Native iOS API (ObjC/Swift)"
"Delta Chat Core Plugin Native Android API (Java/Kotlin)" -> "Delta Chat Core IMAP/SMTP logic (C)"
Expand Down
4 changes: 2 additions & 2 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
PRODUCT_BUNDLE_IDENTIFIER = com.openxchange.oxTalk;
PRODUCT_BUNDLE_IDENTIFIER = com.openxchange.oxCoi;
PRODUCT_NAME = "$(TARGET_NAME)";
VERSIONING_SYSTEM = "apple-generic";
};
Expand All @@ -403,7 +403,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
PRODUCT_BUNDLE_IDENTIFIER = com.openxchange.oxTalk;
PRODUCT_BUNDLE_IDENTIFIER = com.openxchange.oxCoi;
PRODUCT_NAME = "$(TARGET_NAME)";
VERSIONING_SYSTEM = "apple-generic";
};
Expand Down
2 changes: 1 addition & 1 deletion ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>ox_talk</string>
<string>ox_coi</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
Expand Down
36 changes: 18 additions & 18 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,28 +45,28 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:logging/logging.dart';
import 'package:ox_talk/src/log/log_bloc.dart';
import 'package:ox_talk/src/l10n/localizations.dart';
import 'package:ox_talk/src/log/log_manager.dart';
import 'package:ox_talk/src/login/login.dart';
import 'package:ox_talk/src/main/main_bloc.dart';
import 'package:ox_talk/src/main/main_event.dart';
import 'package:ox_talk/src/main/main_state.dart';
import 'package:ox_talk/src/main/root.dart';
import 'package:ox_talk/src/main/splash.dart';
import 'package:ox_talk/src/navigation/navigation.dart';
import 'package:ox_talk/src/notifications/notification_manager.dart';
import 'package:ox_talk/src/utils/colors.dart';
import 'package:ox_talk/src/widgets/view_switcher.dart';
import 'package:ox_coi/src/log/log_bloc.dart';
import 'package:ox_coi/src/l10n/localizations.dart';
import 'package:ox_coi/src/log/log_manager.dart';
import 'package:ox_coi/src/login/login.dart';
import 'package:ox_coi/src/main/main_bloc.dart';
import 'package:ox_coi/src/main/main_event.dart';
import 'package:ox_coi/src/main/main_state.dart';
import 'package:ox_coi/src/main/root.dart';
import 'package:ox_coi/src/main/splash.dart';
import 'package:ox_coi/src/navigation/navigation.dart';
import 'package:ox_coi/src/notifications/notification_manager.dart';
import 'package:ox_coi/src/utils/colors.dart';
import 'package:ox_coi/src/widgets/view_switcher.dart';


void main() {
LogManager _logManager = LogManager();
_logManager.setup(logToFile: false, logLevel: Level.INFO);
runApp(new OxTalkApp());
runApp(new OxCoiApp());
}

class OxTalkApp extends StatelessWidget {
class OxCoiApp extends StatelessWidget {
final Navigation navigation = Navigation();

@override
Expand All @@ -88,12 +88,12 @@ class OxTalkApp extends StatelessWidget {
}
}

class OxTalk extends StatefulWidget {
class OxCoi extends StatefulWidget {
@override
State<StatefulWidget> createState() => _OxTalkState();
State<StatefulWidget> createState() => _OxCoiState();
}

class _OxTalkState extends State<OxTalk> {
class _OxCoiState extends State<OxCoi> {
MainBloc _mainBloc = MainBloc();

@override
Expand Down
40 changes: 20 additions & 20 deletions lib/src/chat/chat.dart
Original file line number Diff line number Diff line change
Expand Up @@ -47,26 +47,26 @@ import 'package:file_picker/file_picker.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:ox_talk/src/chat/chat_bloc.dart';
import 'package:ox_talk/src/chat/chat_composer_bloc.dart';
import 'package:ox_talk/src/chat/chat_composer_event.dart';
import 'package:ox_talk/src/chat/chat_composer_mixin.dart';
import 'package:ox_talk/src/chat/chat_composer_state.dart';
import 'package:ox_talk/src/chat/chat_event.dart';
import 'package:ox_talk/src/chat/chat_profile_view.dart';
import 'package:ox_talk/src/chat/chat_state.dart';
import 'package:ox_talk/src/l10n/localizations.dart';
import 'package:ox_talk/src/message/message_item.dart';
import 'package:ox_talk/src/message/message_list_bloc.dart';
import 'package:ox_talk/src/message/message_list_event.dart';
import 'package:ox_talk/src/message/message_list_state.dart';
import 'package:ox_talk/src/navigation/navigatable.dart';
import 'package:ox_talk/src/navigation/navigation.dart';
import 'package:ox_talk/src/utils/colors.dart';
import 'package:ox_talk/src/utils/dimensions.dart';
import 'package:ox_talk/src/utils/styles.dart';
import 'package:ox_talk/src/utils/toast.dart';
import 'package:ox_talk/src/widgets/avatar.dart';
import 'package:ox_coi/src/chat/chat_bloc.dart';
import 'package:ox_coi/src/chat/chat_composer_bloc.dart';
import 'package:ox_coi/src/chat/chat_composer_event.dart';
import 'package:ox_coi/src/chat/chat_composer_mixin.dart';
import 'package:ox_coi/src/chat/chat_composer_state.dart';
import 'package:ox_coi/src/chat/chat_event.dart';
import 'package:ox_coi/src/chat/chat_profile_view.dart';
import 'package:ox_coi/src/chat/chat_state.dart';
import 'package:ox_coi/src/l10n/localizations.dart';
import 'package:ox_coi/src/message/message_item.dart';
import 'package:ox_coi/src/message/message_list_bloc.dart';
import 'package:ox_coi/src/message/message_list_event.dart';
import 'package:ox_coi/src/message/message_list_state.dart';
import 'package:ox_coi/src/navigation/navigatable.dart';
import 'package:ox_coi/src/navigation/navigation.dart';
import 'package:ox_coi/src/utils/colors.dart';
import 'package:ox_coi/src/utils/dimensions.dart';
import 'package:ox_coi/src/utils/styles.dart';
import 'package:ox_coi/src/utils/toast.dart';
import 'package:ox_coi/src/widgets/avatar.dart';
import 'package:path/path.dart' as Path;
import 'package:rxdart/rxdart.dart';

Expand Down
12 changes: 6 additions & 6 deletions lib/src/chat/chat_bloc.dart
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ import 'dart:ui';
import 'package:bloc/bloc.dart';
import 'package:delta_chat_core/delta_chat_core.dart';
import 'package:flutter/material.dart';
import 'package:ox_talk/src/chat/chat_event.dart';
import 'package:ox_talk/src/chat/chat_state.dart';
import 'package:ox_talk/src/data/chat_extension.dart';
import 'package:ox_talk/src/data/repository.dart';
import 'package:ox_talk/src/data/repository_manager.dart';
import 'package:ox_talk/src/utils/colors.dart';
import 'package:ox_coi/src/chat/chat_event.dart';
import 'package:ox_coi/src/chat/chat_state.dart';
import 'package:ox_coi/src/data/chat_extension.dart';
import 'package:ox_coi/src/data/repository.dart';
import 'package:ox_coi/src/data/repository_manager.dart';
import 'package:ox_coi/src/utils/colors.dart';

class ChatBloc extends Bloc<ChatEvent, ChatState> {
Repository<Chat> chatRepository = RepositoryManager.get(RepositoryType.chat);
Expand Down
12 changes: 6 additions & 6 deletions lib/src/chat/chat_change_bloc.dart
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ import 'dart:async';

import 'package:bloc/bloc.dart';
import 'package:delta_chat_core/delta_chat_core.dart';
import 'package:ox_talk/src/chat/chat_change_event.dart';
import 'package:ox_talk/src/chat/chat_change_state.dart';
import 'package:ox_talk/src/data/chat_message_repository.dart';
import 'package:ox_talk/src/data/contact_repository.dart';
import 'package:ox_talk/src/data/repository.dart';
import 'package:ox_talk/src/data/repository_manager.dart';
import 'package:ox_coi/src/chat/chat_change_event.dart';
import 'package:ox_coi/src/chat/chat_change_state.dart';
import 'package:ox_coi/src/data/chat_message_repository.dart';
import 'package:ox_coi/src/data/contact_repository.dart';
import 'package:ox_coi/src/data/repository.dart';
import 'package:ox_coi/src/data/repository_manager.dart';

class ChatChangeBloc extends Bloc<ChatChangeEvent, ChatChangeState> {
Repository<ChatMsg> _messageListRepository;
Expand Down
8 changes: 4 additions & 4 deletions lib/src/chat/chat_composer_bloc.dart
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ import 'dart:io';
import 'package:bloc/bloc.dart';
import 'package:flutter_sound/flutter_sound.dart';
import 'package:image_picker/image_picker.dart';
import 'package:ox_talk/src/chat/chat_composer_event.dart';
import 'package:ox_talk/src/chat/chat_composer_state.dart';
import 'package:ox_talk/src/utils/date.dart';
import 'package:ox_talk/src/utils/security.dart';
import 'package:ox_coi/src/chat/chat_composer_event.dart';
import 'package:ox_coi/src/chat/chat_composer_state.dart';
import 'package:ox_coi/src/utils/date.dart';
import 'package:ox_coi/src/utils/security.dart';
import 'package:path/path.dart';
import 'package:path_provider/path_provider.dart';
import 'package:permission_handler/permission_handler.dart';
Expand Down
6 changes: 3 additions & 3 deletions lib/src/chat/chat_composer_mixin.dart
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@

import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:ox_talk/src/l10n/localizations.dart';
import 'package:ox_talk/src/utils/colors.dart';
import 'package:ox_talk/src/utils/dimensions.dart';
import 'package:ox_coi/src/l10n/localizations.dart';
import 'package:ox_coi/src/utils/colors.dart';
import 'package:ox_coi/src/utils/dimensions.dart';

enum ComposerModeType {
compose,
Expand Down
30 changes: 15 additions & 15 deletions lib/src/chat/chat_create.dart
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,21 @@

import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:ox_talk/src/chat/chat_create_group_participants.dart';
import 'package:ox_talk/src/contact/contact_change.dart';
import 'package:ox_talk/src/contact/contact_item.dart';
import 'package:ox_talk/src/contact/contact_list_bloc.dart';
import 'package:ox_talk/src/contact/contact_list_event.dart';
import 'package:ox_talk/src/contact/contact_list_state.dart';
import 'package:ox_talk/src/contact/contact_search_controller_mixin.dart';
import 'package:ox_talk/src/data/contact_repository.dart';
import 'package:ox_talk/src/l10n/localizations.dart';
import 'package:ox_talk/src/navigation/navigatable.dart';
import 'package:ox_talk/src/navigation/navigation.dart';
import 'package:ox_talk/src/utils/colors.dart';
import 'package:ox_talk/src/utils/dimensions.dart';
import 'package:ox_talk/src/utils/styles.dart';
import 'package:ox_talk/src/widgets/search_field.dart';
import 'package:ox_coi/src/chat/chat_create_group_participants.dart';
import 'package:ox_coi/src/contact/contact_change.dart';
import 'package:ox_coi/src/contact/contact_item.dart';
import 'package:ox_coi/src/contact/contact_list_bloc.dart';
import 'package:ox_coi/src/contact/contact_list_event.dart';
import 'package:ox_coi/src/contact/contact_list_state.dart';
import 'package:ox_coi/src/contact/contact_search_controller_mixin.dart';
import 'package:ox_coi/src/data/contact_repository.dart';
import 'package:ox_coi/src/l10n/localizations.dart';
import 'package:ox_coi/src/navigation/navigatable.dart';
import 'package:ox_coi/src/navigation/navigation.dart';
import 'package:ox_coi/src/utils/colors.dart';
import 'package:ox_coi/src/utils/dimensions.dart';
import 'package:ox_coi/src/utils/styles.dart';
import 'package:ox_coi/src/widgets/search_field.dart';

class ChatCreate extends StatefulWidget {
@override
Expand Down
Loading

0 comments on commit f35df48

Please sign in to comment.