mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-22 01:15:54 +03:00
72aa4bb999
Change-Id: I01e7b61adf9444e6894232235ee71ac8295b00ab Conflicts: library/ui-styles/src/main/res/color/bottom_navigation_icon_tint_selector.xml library/ui-styles/src/main/res/drawable/splash.xml library/ui-styles/src/main/res/values/theme_light.xml matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/accountdata/RoomAccountDataTypes.kt vector/src/main/AndroidManifest.xml vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt vector/src/main/res/drawable/ic_attachment.xml vector/src/main/res/drawable/ic_insert_emoji.xml vector/src/main/res/drawable/ic_keyboard.xml vector/src/main/res/layout/composer_layout.xml vector/src/main/res/layout/composer_layout_constraint_set_compact.xml vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml vector/src/main/res/layout/fragment_home_detail.xml vector/src/main/res/layout/fragment_login_server_url_form.xml vector/src/main/res/layout/fragment_user_list.xml vector/src/main/res/layout/item_bottom_sheet_message_preview.xml vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml vector/src/main/res/layout/item_room.xml vector/src/main/res/layout/item_space_beta_header.xml vector/src/main/res/layout/item_suggested_room.xml vector/src/main/res/layout/item_timeline_event_redacted_stub.xml vector/src/main/res/layout/item_timeline_event_text_message_stub.xml vector/src/main/res/values/styles_riot.xml
21 lines
302 B
Text
21 lines
302 B
Text
*.iml
|
|
.gradle
|
|
/local.properties
|
|
# idea files: exclude everything except dictionnaries
|
|
.idea/caches
|
|
.idea/libraries
|
|
.idea/inspectionProfiles
|
|
.idea/*.xml
|
|
.DS_Store
|
|
/build
|
|
/captures
|
|
.externalNativeBuild
|
|
|
|
/tmp
|
|
/fastlane/private
|
|
/fastlane/report.xml
|
|
|
|
ktlint
|
|
|
|
.tmp_unpatched_strings
|
|
.tmp_new_patched_strings
|