Skip to content

Commit b66be06

Browse files
refactor: 🔨 Use chatview_utils for data models & utils
- Updated minimum SDK version to `3.4.0` - Moved these models: `chat_controller.dart`, `message.dart`, `chat_user.dart`, `reaction.dart`, `reply_message.dart`, `suggestion_item_config.dart`, `suggestion_item_data.dart` - Moved these enums: `MessageType`, `TypeWriterStatus`, `MessageStatus`, `ChatViewState`, `ImageType`
1 parent 4b22f75 commit b66be06

38 files changed

+59
-759
lines changed

.github/workflows/web-example-release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ jobs:
2727
- name: Flutter action
2828
uses: subosito/[email protected]
2929
with:
30-
flutter-version: '3.24.3'
30+
flutter-version: '3.22.0'
3131
cache: true
32-
cache-key: 'flutter-macos-stable-3.24.3-apple'
33-
cache-path: '${{ runner.tool_cache }}/flutter/macos-stable-3.24.3-apple'
34-
pub-cache-key: 'flutter-pub-macos-stable-3.24.3-apple'
32+
cache-key: 'flutter-macos-stable-3.22.0-apple'
33+
cache-path: '${{ runner.tool_cache }}/flutter/macos-stable-3.22.0-apple'
34+
pub-cache-key: 'flutter-pub-macos-stable-3.22.0-apple'
3535
- name: Setup Pages
3636
uses: actions/configure-pages@v5
3737
- name: Project Clean Up

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
## [2.4.1] (unreleased)
22

3+
* **Important**: Updated minimum SDK version to `3.4.0`
4+
* **Refactor**: Use `chatview_utils` for data models & utils
35
* **Fix**: [317](https://github.com/SimformSolutionsPvtLtd/flutter_chatview/issues/317) Link Preview
46
is attempted even after adding disableLinkPreview: true
57

example/assets/images/simform.png

12.7 KB
Loading

example/lib/data.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:chatview/chatview.dart';
22

33
class Data {
44
static const profileImage =
5-
"https://raw.githubusercontent.com/SimformSolutionsPvtLtd/flutter_showcaseview/master/example/assets/simform.png";
5+
"https://github.com/SimformSolutionsPvtLtd/flutter_chatview/blob/main/example/assets/images/simform.png?raw=true";
66
static final messageList = [
77
Message(
88
id: '1',

example/lib/main.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ class _ChatScreenState extends State<ChatScreen> {
3838
final _chatController = ChatController(
3939
initialMessageList: Data.messageList,
4040
scrollController: ScrollController(),
41-
currentUser: ChatUser(
41+
currentUser: const ChatUser(
4242
id: '1',
4343
name: 'Flutter',
4444
profilePhoto: Data.profileImage,
4545
),
46-
otherUsers: [
46+
otherUsers: const [
4747
ChatUser(
4848
id: '2',
4949
name: 'Simform',

example/pubspec.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ publish_to: 'none'
66
version: 1.0.0+1
77

88
environment:
9-
sdk: '>=3.0.0-0 <4.0.0'
9+
sdk: '>=3.4.0 <4.0.0'
1010

1111
dependencies:
1212
flutter:
@@ -22,3 +22,5 @@ dev_dependencies:
2222

2323
flutter:
2424
uses-material-design: true
25+
assets:
26+
- assets/images/

lib/chatview.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ export 'src/widgets/chat_view.dart';
2626
export 'src/models/models.dart';
2727
export 'src/widgets/chat_view_appbar.dart';
2828
export 'src/values/enumeration.dart';
29-
export 'src/controller/chat_controller.dart';
3029
export 'src/values/typedefs.dart';
30+
export 'package:chatview_utils/chatview_utils.dart';
3131
export 'package:audio_waveforms/audio_waveforms.dart'
3232
show
3333
WaveStyle,

lib/src/controller/chat_controller.dart

Lines changed: 0 additions & 176 deletions
This file was deleted.

lib/src/extensions/extensions.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ extension ValidateString on String {
9494
child: ProfileImageWidget(
9595
imageUrl: user?.profilePhoto,
9696
imageType: user?.imageType,
97-
defaultAvatarImage: user?.defaultAvatarImage ?? profileImage,
97+
defaultAvatarImage: user?.defaultAvatarImage ?? Constants.profileImage,
9898
circleRadius: profileCircleRadius ?? 8,
9999
assetImageErrorBuilder: user?.assetImageErrorBuilder,
100100
networkImageErrorBuilder: user?.networkImageErrorBuilder,

lib/src/models/config_models/message_configuration.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2020
* SOFTWARE.
2121
*/
22+
import 'package:chatview_utils/chatview_utils.dart';
2223
import 'package:chatview/src/models/models.dart';
2324
import 'package:flutter/material.dart';
2425

lib/src/models/config_models/profile_circle_configuration.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
*/
2222
import 'package:flutter/material.dart';
2323

24-
import '../../../chatview.dart';
25-
import '../../utils/constants/constants.dart';
24+
import 'package:chatview_utils/chatview_utils.dart';
2625

2726
class ProfileCircleConfiguration {
2827
/// Used to give padding to profile circle.
@@ -69,7 +68,7 @@ class ProfileCircleConfiguration {
6968
this.circleRadius,
7069
this.onAvatarLongPress,
7170
this.imageType = ImageType.network,
72-
this.defaultAvatarImage = profileImage,
71+
this.defaultAvatarImage = Constants.profileImage,
7372
this.networkImageErrorBuilder,
7473
this.assetImageErrorBuilder,
7574
this.networkImageProgressIndicatorBuilder,

lib/src/models/config_models/reply_popup_configuration.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
* SOFTWARE.
2121
*/
2222
import 'package:flutter/material.dart';
23+
import 'package:chatview_utils/chatview_utils.dart';
2324

2425
import '../../values/typedefs.dart';
25-
import '../data_models/message.dart';
2626

2727
class ReplyPopupConfiguration {
2828
/// Used for giving background color to reply snack-bar.

lib/src/models/config_models/reply_suggestions_config.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import 'package:chatview/src/models/data_models/suggestion_item_data.dart';
21
import 'package:flutter/material.dart';
2+
import 'package:chatview_utils/chatview_utils.dart';
33

44
import '../../values/enumeration.dart';
5-
import 'suggestion_item_config.dart';
65
import 'suggestion_list_config.dart';
76

87
class ReplySuggestionsConfig {

lib/src/models/config_models/send_message_configuration.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import 'package:audio_waveforms/audio_waveforms.dart';
2424
import 'package:flutter/material.dart';
2525
import 'package:flutter/services.dart';
26+
import 'package:chatview_utils/chatview_utils.dart';
2627
import 'package:image_picker/image_picker.dart';
2728

28-
import '../../values/enumeration.dart';
2929
import '../../values/typedefs.dart';
3030

3131
class SendMessageConfiguration {

lib/src/models/config_models/suggestion_item_config.dart

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)