Please Accept #4
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # .gitignore
# Conflicts: # app/build.gradle # app/build/generated/data_binding_base_class_source_out/debug/out/com/example/finema/databinding/TmpFragmentBinding.java # app/build/generated/source/kapt/debug/com/example/finema/DataBinderMapperImpl.java # app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar # app/build/intermediates/data_binding_base_class_log_artifact/debug/out/com.example.finema-binding_classes.json # app/build/intermediates/data_binding_layout_info_type_merge/debug/out/activity_main-layout.xml # app/build/intermediates/data_binding_layout_info_type_merge/debug/out/higher_lower_fragment-layout.xml # app/build/intermediates/data_binding_layout_info_type_merge/debug/out/tmp_fragment-layout.xml # app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex # app/build/intermediates/dex/debug/mergeExtDexDebug/classes2.dex # app/build/intermediates/dex/debug/mergeExtDexDebug/classes3.dex # app/build/intermediates/dex/debug/mergeProjectDexDebug/classes.dex # app/build/intermediates/dex_archive_input_jar_hashes/debug/out # app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json # app/build/intermediates/incremental/debug-mergeJavaRes/merge-state # app/build/intermediates/incremental/debug-mergeNativeLibs/merge-state # app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties # app/build/intermediates/incremental/mergeDebugResources/merger.xml # app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt # app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources # app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 # app/build/intermediates/javac/debug/classes/com/example/finema/DataBinderMapperImpl$InnerBrLookup.class # app/build/intermediates/javac/debug/classes/com/example/finema/DataBinderMapperImpl$InnerLayoutIdLookup.class # app/build/intermediates/javac/debug/classes/com/example/finema/DataBinderMapperImpl.class # app/build/intermediates/javac/debug/classes/com/example/finema/databinding/ActivityMainBinding.class # app/build/intermediates/javac/debug/classes/com/example/finema/databinding/HigherLowerFragmentBinding.class # app/build/intermediates/javac/debug/classes/com/example/finema/databinding/SignInFragmentBinding.class # app/build/intermediates/javac/debug/classes/com/example/finema/databinding/TmpFragmentBinding.class # app/build/intermediates/javac/debug/classes/com/example/finema/databinding/WelcomeFragmentBinding.class # app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt # app/build/intermediates/merged_java_res/debug/out.jar # app/build/intermediates/merged_manifest/debug/out/AndroidManifest.xml # app/build/intermediates/merged_manifests/debug/AndroidManifest.xml # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json # app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json # app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json # app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml # app/build/intermediates/processed_res/debug/out/resources-debug.ap_ # app/build/intermediates/project_dex_archive/debug/out/com/example/finema/DataBinderMapperImpl$InnerBrLookup.dex # app/build/intermediates/project_dex_archive/debug/out/com/example/finema/DataBinderMapperImpl$InnerLayoutIdLookup.dex # app/build/intermediates/project_dex_archive/debug/out/com/example/finema/DataBinderMapperImpl.dex # app/build/intermediates/project_dex_archive/debug/out/com/example/finema/MainActivity.dex # app/build/intermediates/project_dex_archive/debug/out/com/example/finema/api/RetrofitClient.dex # app/build/intermediates/project_dex_archive/debug/out/com/example/finema/databinding/ActivityMainBinding.dex # app/build/intermediates/project_dex_archive/debug/out/com/example/finema/databinding/HigherLowerFragmentBinding.dex # app/build/intermediates/project_dex_archive/debug/out/com/example/finema/databinding/SignInFragmentBinding.dex # app/build/intermediates/project_dex_archive/debug/out/com/example/finema/databinding/TmpFragmentBinding.dex # app/build/intermediates/project_dex_archive/debug/out/com/example/finema/databinding/WelcomeFragmentBinding.dex # app/build/intermediates/project_dex_archive/debug/out/com/example/finema/ui/signIn/SigInFragment$Companion.dex # app/build/intermediates/project_dex_archive/debug/out/com/example/finema/ui/signIn/SigInFragment$firebaseAuthWithGoogle$1.dex # app/build/intermediates/project_dex_archive/debug/out/com/example/finema/ui/signIn/SigInFragment$onViewCreated$1.dex # app/build/intermediates/project_dex_archive/debug/out/com/example/finema/ui/signIn/SigInFragment$onViewCreated$2.dex # app/build/intermediates/project_dex_archive/debug/out/com/example/finema/ui/signIn/SigInFragment$resultContract$1.dex # app/build/intermediates/project_dex_archive/debug/out/com/example/finema/ui/signIn/SigInFragment.dex # app/build/intermediates/project_dex_archive/debug/out/com/example/finema/ui/tmp/TmpFragment.dex # app/build/intermediates/project_dex_archive/debug/out/com/example/finema/ui/tmp/TmpViewModel.dex # app/build/intermediates/res/merged/debug/layout_activity_main.xml.flat # app/build/intermediates/res/merged/debug/layout_higher_lower_fragment.xml.flat # app/build/intermediates/res/merged/debug/layout_tmp_fragment.xml.flat # app/build/intermediates/res/merged/debug/navigation_app_navigation_graph.xml.flat # app/build/intermediates/res/merged/debug/values-night-v8_values-night-v8.arsc.flat # app/build/intermediates/res/merged/debug/values-v21_values-v21.arsc.flat # app/build/intermediates/res/merged/debug/values-v24_values-v24.arsc.flat # app/build/intermediates/res/merged/debug/values_values.arsc.flat # app/build/intermediates/runtime_symbol_list/debug/R.txt # app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt # app/build/kotlin/compileDebugKotlin/build-history.bin # app/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab # app/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream # app/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len # app/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.len # app/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.values.at # app/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab_i # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-attributes.tab # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.keystream # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.len # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.values.at # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-attributes.tab_i # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream.len # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream.len # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.values.at # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab_i # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.len # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.len # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at # app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i # app/build/kotlin/compileDebugKotlin/caches-jvm/lookups/counters.tab # app/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab # app/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream # app/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len # app/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.len # app/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.values.at # app/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab_i # app/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab # app/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream # app/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len # app/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.len # app/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.values.at # app/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab_i # app/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab # app/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.keystream # app/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.keystream.len # app/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.len # app/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.values.at # app/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab_i # app/build/kotlin/compileDebugKotlin/last-build.bin # app/build/kotlin/kaptGenerateStubsDebugKotlin/build-history.bin # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.values.at # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab_i # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-attributes.tab # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.keystream # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.values.at # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-attributes.tab_i # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.values.at # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab_i # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/counters.tab # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.values.at # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab_i # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.values.at # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab_i # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.keystream # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.keystream.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.len # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.values.at # app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab_i # app/build/kotlin/kaptGenerateStubsDebugKotlin/last-build.bin # app/build/outputs/apk/debug/app-debug.apk # app/build/outputs/logs/manifest-merger-debug-report.txt # app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt # app/build/tmp/kapt3/incApCache/debug/apt-cache.bin # app/build/tmp/kapt3/incApCache/debug/classpath-entries.bin # app/build/tmp/kapt3/incApCache/debug/classpath-structure.bin # app/build/tmp/kapt3/incApCache/debug/java-cache.bin # app/build/tmp/kapt3/incrementalData/debug/META-INF/app_debug.kotlin_module # app/build/tmp/kapt3/incrementalData/debug/com/example/finema/ui/signIn/SigInFragment.class # app/build/tmp/kapt3/incrementalData/debug/com/example/finema/ui/tmp/TmpFragment.class # app/build/tmp/kapt3/stubs/debug/com/example/finema/MainActivity.kapt_metadata # app/build/tmp/kapt3/stubs/debug/com/example/finema/api/RetrofitClient.kapt_metadata # app/build/tmp/kapt3/stubs/debug/com/example/finema/api/RetrofitInterface.kapt_metadata # app/build/tmp/kapt3/stubs/debug/com/example/finema/repo/Singleton.kapt_metadata # app/build/tmp/kapt3/stubs/debug/com/example/finema/ui/signIn/SigInFragment.java # app/build/tmp/kapt3/stubs/debug/com/example/finema/ui/signIn/SigInFragment.kapt_metadata # app/build/tmp/kapt3/stubs/debug/com/example/finema/ui/tmp/TmpFragment.java # app/build/tmp/kapt3/stubs/debug/com/example/finema/ui/tmp/TmpFragment.kapt_metadata # app/build/tmp/kapt3/stubs/debug/com/example/finema/ui/tmp/TmpViewModel.kapt_metadata # app/build/tmp/kapt3/stubs/debug/com/example/movie/Model/Genre.kapt_metadata # app/build/tmp/kapt3/stubs/debug/com/example/movie/Model/MovieInfoModel.kapt_metadata # app/build/tmp/kapt3/stubs/debug/com/example/movie/Model/ProductionCompany.kapt_metadata # app/build/tmp/kapt3/stubs/debug/com/example/movie/Model/ProductionCountry.kapt_metadata # app/build/tmp/kapt3/stubs/debug/com/example/movie/Model/SpokenLanguage.kapt_metadata # app/build/tmp/kotlin-classes/debug/META-INF/app_debug.kotlin_module # app/build/tmp/kotlin-classes/debug/com/example/finema/MainActivity.class # app/build/tmp/kotlin-classes/debug/com/example/finema/api/RetrofitClient.class # app/build/tmp/kotlin-classes/debug/com/example/finema/ui/signIn/SigInFragment$Companion.class # app/build/tmp/kotlin-classes/debug/com/example/finema/ui/signIn/SigInFragment$firebaseAuthWithGoogle$1.class # app/build/tmp/kotlin-classes/debug/com/example/finema/ui/signIn/SigInFragment$onViewCreated$1.class # app/build/tmp/kotlin-classes/debug/com/example/finema/ui/signIn/SigInFragment$onViewCreated$2.class # app/build/tmp/kotlin-classes/debug/com/example/finema/ui/signIn/SigInFragment$resultContract$1.class # app/build/tmp/kotlin-classes/debug/com/example/finema/ui/signIn/SigInFragment.class # app/build/tmp/kotlin-classes/debug/com/example/finema/ui/tmp/TmpFragment.class # app/build/tmp/kotlin-classes/debug/com/example/finema/ui/tmp/TmpViewModel.class # app/src/main/java/com/example/finema/MainActivity.kt # app/src/main/java/com/example/finema/api/RetrofitClient.kt # app/src/main/java/com/example/finema/api/RetrofitInterface.kt # app/src/main/java/com/example/finema/ui/signIn/SigInFragment.kt # app/src/main/java/com/example/finema/ui/tmp/TmpFragment.kt # app/src/main/java/com/example/finema/ui/tmp/TmpViewModel.kt # app/src/main/res/layout/tmp_fragment.xml # app/src/main/res/navigation/app_navigation_graph.xml # app/src/main/res/values/strings.xml
# Conflicts: # app/src/main/java/com/example/finema/ui/chooseFavourite/ChooseFavouriteViewModel.kt # app/src/main/java/com/example/finema/ui/tournaments/genres/GenresTournamentVM.kt # app/src/main/java/com/example/finema/ui/tournaments/tournament/TournamentVM.kt # app/src/main/java/com/example/finema/ui/userProfile/ProfileViewModel.kt
# Conflicts: # app/src/main/java/com/example/finema/database/firebase/FirebaseRepository.kt
# Conflicts: # .gitignore # app/build.gradle # app/src/androidTest/java/com/example/finema/ExampleInstrumentedTest.kt # app/src/main/AndroidManifest.xml # app/src/main/res/values-night/themes.xml # app/src/main/res/values/colors.xml # app/src/main/res/values/strings.xml # app/src/main/res/values/themes.xml # app/src/test/java/com/example/finema/ExampleUnitTest.kt # build.gradle # gradle/wrapper/gradle-wrapper.properties # gradlew.bat
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.