Merge branch 'upstream/master' into okSMS_v3.9.4
# Conflicts: # README.md # build.gradle # domain/src/main/java/com/moez/QKSMS/util/Preferences.kt # presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt # presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt # presentation/src/main/java/com/moez/QKSMS/common/util/BillingManager.kt # presentation/src/main/java/com/moez/QKSMS/common/util/Colors.kt # presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt # presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt # presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt # presentation/src/main/java/com/moez/QKSMS/common/widget/TextInputDialog.kt # presentation/src/main/java/com/moez/QKSMS/feature/compose/AttachmentAdapter.kt # presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt # presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt # presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt # presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/DetailedChipView.kt # presentation/src/main/java/com/moez/QKSMS/feature/compose/part/FileBinder.kt # presentation/src/main/java/com/moez/QKSMS/feature/compose/part/VCardBinder.kt # presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt # presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt # presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt # presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt # presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt # presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt # presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt # presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt # presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt # presentation/src/main/java/com/moez/QKSMS/feature/themepicker/HSVPickerView.kt # presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemeAdapter.kt # presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerController.kt # presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt # presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerState.kt # presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerModule.kt # presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt # presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt # presentation/src/main/res/layout/compose_activity.xml # presentation/src/main/res/layout/conversation_info_controller.xml # presentation/src/main/res/layout/drawer_view.xml # presentation/src/main/res/layout/hsv_picker_view.xml # presentation/src/main/res/layout/message_list_item_out.xml # presentation/src/main/res/menu/main.xml # presentation/src/main/res/values-ar/strings.xml # presentation/src/main/res/values-bn/strings.xml # presentation/src/main/res/values-de/strings.xml # presentation/src/main/res/values-el/strings.xml # presentation/src/main/res/values-fa/strings.xml # presentation/src/main/res/values-fi/strings.xml # presentation/src/main/res/values-fr/strings.xml # presentation/src/main/res/values-hi/strings.xml # presentation/src/main/res/values-it/strings.xml # presentation/src/main/res/values-iw/strings.xml # presentation/src/main/res/values-ja/strings.xml # presentation/src/main/res/values-ko/strings.xml # presentation/src/main/res/values-night/themes.xml # presentation/src/main/res/values-nl/strings.xml # presentation/src/main/res/values-ru/strings.xml # presentation/src/main/res/values-sk/strings.xml # presentation/src/main/res/values-sr/strings.xml # presentation/src/main/res/values-tl/strings.xml # presentation/src/main/res/values-tr/strings.xml # presentation/src/main/res/values-uk/strings.xml # presentation/src/main/res/values-v27/themes.xml # presentation/src/main/res/values-vi/strings.xml # presentation/src/main/res/values-zh-rCN/strings.xml # presentation/src/main/res/values-zh/strings.xml # presentation/src/main/res/values/colors.xml # presentation/src/main/res/values/themes.xml
Loading
Please register or sign in to comment