Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Please Accept #4

Open
wants to merge 198 commits into
base: master
Choose a base branch
from
Open

Please Accept #4

wants to merge 198 commits into from

Commits on Apr 30, 2021

  1. crap

    @Alberto195
    Alberto195 committed Apr 30, 2021
    Configuration menu
    Copy the full SHA
    d4cb2b5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/Alberto195/KLAD

    @Alberto195
    Alberto195 committed Apr 30, 2021
    Configuration menu
    Copy the full SHA
    524066f View commit details
    Browse the repository at this point in the history

  3. signIn and BaseClasses elements

    @Alberto195
    Alberto195 committed Apr 30, 2021
    Configuration menu
    Copy the full SHA
    5831b9e View commit details
    Browse the repository at this point in the history

Commits on May 2, 2021

  1. gradle files

    @Alberto195
    Alberto195 committed May 2, 2021
    Configuration menu
    Copy the full SHA
    58ece6d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/Alberto195/KLAD 

    # Conflicts:
#	.gitignore
    @Alberto195
    Alberto195 committed May 2, 2021
    Configuration menu
    Copy the full SHA
    d01b115 View commit details
    Browse the repository at this point in the history

  3. Delete settings.gradle

    @Alberto195
    Alberto195 authored May 2, 2021
    Configuration menu
    Copy the full SHA
    6810817 View commit details
    Browse the repository at this point in the history

  4. Delete gradlew.bat

    @Alberto195
    Alberto195 authored May 2, 2021
    Configuration menu
    Copy the full SHA
    2e799c9 View commit details
    Browse the repository at this point in the history

  5. Delete gradlew

    @Alberto195
    Alberto195 authored May 2, 2021
    Configuration menu
    Copy the full SHA
    890dde3 View commit details
    Browse the repository at this point in the history

  6. Delete gradle.properties

    @Alberto195
    Alberto195 authored May 2, 2021
    Configuration menu
    Copy the full SHA
    8aaf6f2 View commit details
    Browse the repository at this point in the history

  7. Delete build.gradle

    @Alberto195
    Alberto195 authored May 2, 2021
    Configuration menu
    Copy the full SHA
    e46bcc8 View commit details
    Browse the repository at this point in the history

  8. Delete .gitignore

    @Alberto195
    Alberto195 authored May 2, 2021
    Configuration menu
    Copy the full SHA
    4eb153d View commit details
    Browse the repository at this point in the history

  9. Delete gradle/wrapper directory

    @Alberto195
    Alberto195 authored May 2, 2021
    Configuration menu
    Copy the full SHA
    048e172 View commit details
    Browse the repository at this point in the history

  10. Delete app directory

    @Alberto195
    Alberto195 authored May 2, 2021
    Configuration menu
    Copy the full SHA
    f6b88ba View commit details
    Browse the repository at this point in the history

  11. new gradle files

    @Alberto195
    Alberto195 committed May 2, 2021
    Configuration menu
    Copy the full SHA
    0c1f66a View commit details
    Browse the repository at this point in the history

  12. new gradle files

    @Alberto195
    Alberto195 committed May 2, 2021
    Configuration menu
    Copy the full SHA
    9d7d3d2 View commit details
    Browse the repository at this point in the history

  13. add gardles

    @Alberto195
    Alberto195 committed May 2, 2021
    Configuration menu
    Copy the full SHA
    cd530d5 View commit details
    Browse the repository at this point in the history

  14. demo thats working

    @Alberto195
    Alberto195 committed May 2, 2021
    Configuration menu
    Copy the full SHA
    6de0046 View commit details
    Browse the repository at this point in the history

  15. it doesnt work

    @Alberto195
    Alberto195 committed May 2, 2021
    Configuration menu
    Copy the full SHA
    afc2d0e View commit details
    Browse the repository at this point in the history

Commits on May 4, 2021

  1. game

    @Alberto195
    Alberto195 committed May 4, 2021
    Configuration menu
    Copy the full SHA
    e977cd8 View commit details
    Browse the repository at this point in the history

  2. доабвил бд, sharedPref, и список турниров по жанрам

    Дмитрий Костык committed May 4, 2021
    Configuration menu
    Copy the full SHA
    d4d37e5 View commit details
    Browse the repository at this point in the history

  3. test for dima

    @Alberto195
    Alberto195 committed May 4, 2021
    Configuration menu
    Copy the full SHA
    70764da View commit details
    Browse the repository at this point in the history

Commits on May 6, 2021

  1. Merge remote-tracking branch 'origin/test' into Database 

    # 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
    Дмитрий Костык committed May 6, 2021
    Configuration menu
    Copy the full SHA
    70c00ff View commit details
    Browse the repository at this point in the history

  2. merged with Dima. Without Albert's Retrofit

    Дмитрий Костык committed May 6, 2021
    Configuration menu
    Copy the full SHA
    49e97e3 View commit details
    Browse the repository at this point in the history

  3. demo vers

    @Alberto195
    Alberto195 committed May 6, 2021
    Configuration menu
    Copy the full SHA
    671f66b View commit details
    Browse the repository at this point in the history

Commits on May 7, 2021

  1. activity_main.xml

    @GypsyJR777
    GypsyJR777 committed May 7, 2021
    Configuration menu
    Copy the full SHA
    01e2f87 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2021

  1. Movie details fragment

    @GypsyJR777
    GypsyJR777 committed May 8, 2021
    Configuration menu
    Copy the full SHA
    2fc1244 View commit details
    Browse the repository at this point in the history

  2. Control panel

    @GypsyJR777
    GypsyJR777 committed May 8, 2021
    Configuration menu
    Copy the full SHA
    b628c01 View commit details
    Browse the repository at this point in the history

  3. Notifications

    @GypsyJR777
    GypsyJR777 committed May 8, 2021
    Configuration menu
    Copy the full SHA
    78aabfc View commit details
    Browse the repository at this point in the history

  4. Settings

    @GypsyJR777
    GypsyJR777 committed May 8, 2021
    Configuration menu
    Copy the full SHA
    391808f View commit details
    Browse the repository at this point in the history

Commits on May 9, 2021

  1. tournament done

    Дмитрий Костык committed May 9, 2021
    Configuration menu
    Copy the full SHA
    ceffac7 View commit details
    Browse the repository at this point in the history

  2. tournament with numberfragment

    Дмитрий Костык committed May 9, 2021
    Configuration menu
    Copy the full SHA
    3f2f249 View commit details
    Browse the repository at this point in the history

  3. merged 10.05.2021

    Дмитрий Костык committed May 9, 2021
    Configuration menu
    Copy the full SHA
    4d4cb97 View commit details
    Browse the repository at this point in the history

  4. after merge Tournament with info

    Дмитрий Костык committed May 9, 2021
    Configuration menu
    Copy the full SHA
    9470c6b View commit details
    Browse the repository at this point in the history

Commits on May 10, 2021

  1. bug fixed 1

    Дмитрий Костык committed May 10, 2021
    Configuration menu
    Copy the full SHA
    71ea8c4 View commit details
    Browse the repository at this point in the history

  2. bug fixed 2

    Дмитрий Костык committed May 10, 2021
    Configuration menu
    Copy the full SHA
    d7c3cda View commit details
    Browse the repository at this point in the history

  3. commit

    Дмитрий Костык committed May 10, 2021
    Configuration menu
    Copy the full SHA
    d3ea97c View commit details
    Browse the repository at this point in the history

  4. bug fixed

    Дмитрий Костык committed May 10, 2021
    Configuration menu
    Copy the full SHA
    891cb57 View commit details
    Browse the repository at this point in the history

  5. bug fixed 1

    Дмитрий Костык committed May 10, 2021
    Configuration menu
    Copy the full SHA
    9107482 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2021

  1. bug fixed 3

    Дмитрий Костык committed May 11, 2021
    Configuration menu
    Copy the full SHA
    151c303 View commit details
    Browse the repository at this point in the history

  2. some fix

    Дмитрий Костык committed May 11, 2021
    Configuration menu
    Copy the full SHA
    76b68fa View commit details
    Browse the repository at this point in the history

  3. before recycler change

    Дмитрий Костык committed May 11, 2021
    Configuration menu
    Copy the full SHA
    19c7e45 View commit details
    Browse the repository at this point in the history

  4. last commit

    Дмитрий Костык committed May 11, 2021
    Configuration menu
    Copy the full SHA
    271f0a4 View commit details
    Browse the repository at this point in the history

  5. last commit

    Дмитрий Костык committed May 11, 2021
    Configuration menu
    Copy the full SHA
    20cc0fc View commit details
    Browse the repository at this point in the history

  6. new xnl

    @Alberto195
    Alberto195 committed May 11, 2021
    Configuration menu
    Copy the full SHA
    1743486 View commit details
    Browse the repository at this point in the history

  7. last last

    Дмитрий Костык committed May 11, 2021
    Configuration menu
    Copy the full SHA
    6fa07ff View commit details
    Browse the repository at this point in the history

Commits on May 12, 2021

  1. only 16 films but work

    Дмитрий Костык committed May 12, 2021
    Configuration menu
    Copy the full SHA
    a8b48d5 View commit details
    Browse the repository at this point in the history

  2. crappy version but work

    @Alberto195
    Alberto195 committed May 12, 2021
    Configuration menu
    Copy the full SHA
    63c4ff1 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/test' into test 

    # Conflicts:
#	app/src/main/java/com/example/finema/ui/tournaments/TournamentGenresFragment.kt
#	app/src/main/java/com/example/finema/ui/tournaments/TournamentGenresVM.kt
    @Alberto195
    Alberto195 committed May 12, 2021
    Configuration menu
    Copy the full SHA
    5dd2373 View commit details
    Browse the repository at this point in the history

  4. nbia

    @Alberto195
    Alberto195 committed May 12, 2021
    Configuration menu
    Copy the full SHA
    9e3b6f6 View commit details
    Browse the repository at this point in the history

  5. some fix

    Дмитрий Костык committed May 12, 2021
    Configuration menu
    Copy the full SHA
    d6fd491 View commit details
    Browse the repository at this point in the history

  6. some fix 1

    Дмитрий Костык committed May 12, 2021
    Configuration menu
    Copy the full SHA
    41ad29c View commit details
    Browse the repository at this point in the history

  7. push push

    Дмитрий Костык committed May 12, 2021
    Configuration menu
    Copy the full SHA
    5023a6e View commit details
    Browse the repository at this point in the history

  8. smth

    @Alberto195
    Alberto195 committed May 12, 2021
    Configuration menu
    Copy the full SHA
    2c8dcc1 View commit details
    Browse the repository at this point in the history

  9. new

    @Alberto195
    Alberto195 committed May 12, 2021
    Configuration menu
    Copy the full SHA
    31072fb View commit details
    Browse the repository at this point in the history

Commits on May 14, 2021

  1. Добавлены TODO по код ревью

    kiltonik committed May 14, 2021
    Configuration menu
    Copy the full SHA
    888c1f7 View commit details
    Browse the repository at this point in the history

  2. Исправлен gitignore

    kiltonik committed May 14, 2021
    Configuration menu
    Copy the full SHA
    c517943 View commit details
    Browse the repository at this point in the history

  3. idk

    @Alberto195
    Alberto195 committed May 14, 2021
    Configuration menu
    Copy the full SHA
    5c84a15 View commit details
    Browse the repository at this point in the history

  4. di new hl

    @Alberto195
    Alberto195 committed May 14, 2021
    Configuration menu
    Copy the full SHA
    4da568c View commit details
    Browse the repository at this point in the history

Commits on May 15, 2021

  1. firebase

    @Alberto195
    Alberto195 committed May 15, 2021
    Configuration menu
    Copy the full SHA
    d507698 View commit details
    Browse the repository at this point in the history

  2. WorkManager and notification

    @GypsyJR777
    GypsyJR777 committed May 15, 2021
    Configuration menu
    Copy the full SHA
    d57debf View commit details
    Browse the repository at this point in the history

  3. eh

    @Alberto195
    Alberto195 committed May 15, 2021
    Configuration menu
    Copy the full SHA
    9622a5d View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/test' into test 

    # Conflicts:
#	app/build.gradle
    @Alberto195
    Alberto195 committed May 15, 2021
    Configuration menu
    Copy the full SHA
    a83212d View commit details
    Browse the repository at this point in the history

  5. немного исправил xml и названия моих фрагментов

    Дмитрий Костык committed May 15, 2021
    Configuration menu
    Copy the full SHA
    6b912a9 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/test' into test 

    # Conflicts:
#	app/src/main/java/com/example/finema/util/AppModule.kt
    @Alberto195
    Alberto195 committed May 15, 2021
    Configuration menu
    Copy the full SHA
    745c327 View commit details
    Browse the repository at this point in the history

  7. higherlower small fix

    @Alberto195
    Alberto195 committed May 15, 2021
    Configuration menu
    Copy the full SHA
    c91dd5a View commit details
    Browse the repository at this point in the history

Commits on May 16, 2021

  1. Fix fragment of film's information

    @GypsyJR777
    GypsyJR777 committed May 16, 2021
    Configuration menu
    Copy the full SHA
    e839ecf View commit details
    Browse the repository at this point in the history

  2. sum minor updates

    @Alberto195
    Alberto195 committed May 16, 2021
    Configuration menu
    Copy the full SHA
    c460ae7 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/test' into test 

    # Conflicts:
#	app/src/main/java/com/example/finema/ui/movieDetail/MovieDetailsFragment.kt
#	app/src/main/java/com/example/finema/util/Coroutines.kt
    @Alberto195
    Alberto195 committed May 16, 2021
    Configuration menu
    Copy the full SHA
    1a5b09f View commit details
    Browse the repository at this point in the history

Commits on May 17, 2021

  1. 1

    @GypsyJR777
    GypsyJR777 committed May 17, 2021
    Configuration menu
    Copy the full SHA
    bbeedbd View commit details
    Browse the repository at this point in the history

  2. Added TODO and edited gitignore

    kiltonik committed May 17, 2021
    Configuration menu
    Copy the full SHA
    09fb975 View commit details
    Browse the repository at this point in the history

  3. cleaning git

    kiltonik committed May 17, 2021
    Configuration menu
    Copy the full SHA
    2542044 View commit details
    Browse the repository at this point in the history

  4. Sign in + fix notification

    @GypsyJR777
    GypsyJR777 committed May 17, 2021
    Configuration menu
    Copy the full SHA
    744cecf View commit details
    Browse the repository at this point in the history

Commits on May 18, 2021

  1. исправил Navigation и подгрузку жанров в БД

    Дмитрий Костык committed May 18, 2021
    Configuration menu
    Copy the full SHA
    5e7789e View commit details
    Browse the repository at this point in the history

  2. error

    @Alberto195
    Alberto195 committed May 18, 2021
    Configuration menu
    Copy the full SHA
    ab7e47b View commit details
    Browse the repository at this point in the history

  3. починил список жанров

    Дмитрий Костык committed May 18, 2021
    Configuration menu
    Copy the full SHA
    b42a23f View commit details
    Browse the repository at this point in the history

  4. still error

    @Alberto195
    Alberto195 committed May 18, 2021
    Configuration menu
    Copy the full SHA
    c94cf46 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/test' into test 

    # Conflicts:
#	app/src/main/java/com/example/finema/ui/signIn/SigInFragment.kt
#	app/src/main/java/com/example/finema/ui/signIn/SignInViewModel.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/java/com/example/finema/ui/tournaments/genres/GenresTournamentVM.kt
    @Alberto195
    Alberto195 committed May 18, 2021
    Configuration menu
    Copy the full SHA
    4e87cd6 View commit details
    Browse the repository at this point in the history

  6. blyaaaaaa

    @Alberto195
    Alberto195 committed May 18, 2021
    Configuration menu
    Copy the full SHA
    68856f8 View commit details
    Browse the repository at this point in the history

  7. Settings with quit

    @GypsyJR777
    GypsyJR777 committed May 18, 2021
    Configuration menu
    Copy the full SHA
    919e953 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2021

  1. Some strings

    @GypsyJR777
    GypsyJR777 committed May 20, 2021
    Configuration menu
    Copy the full SHA
    066bf13 View commit details
    Browse the repository at this point in the history

  2. Closing and opening drawer layout in Activity,

    @GypsyJR777
    GypsyJR777 committed May 20, 2021
    Configuration menu
    Copy the full SHA
    ce3acbe View commit details
    Browse the repository at this point in the history

Commits on May 21, 2021

  1. roomtracking error

    @Alberto195
    Alberto195 committed May 21, 2021
    Configuration menu
    Copy the full SHA
    0275c08 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/test' into test

    @Alberto195
    Alberto195 committed May 21, 2021
    Configuration menu
    Copy the full SHA
    9048036 View commit details
    Browse the repository at this point in the history

  3. updated koin, GTAdapter

    @Alberto195
    Alberto195 committed May 21, 2021
    Configuration menu
    Copy the full SHA
    ea5d433 View commit details
    Browse the repository at this point in the history

  4. minor updates

    @Alberto195
    Alberto195 committed May 21, 2021
    Configuration menu
    Copy the full SHA
    df3c377 View commit details
    Browse the repository at this point in the history

  5. sign In update

    @Alberto195
    Alberto195 committed May 21, 2021
    Configuration menu
    Copy the full SHA
    b1075d6 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2021

  1. horrible but workin sign in

    @Alberto195
    Alberto195 committed May 22, 2021
    Configuration menu
    Copy the full SHA
    1c48ae7 View commit details
    Browse the repository at this point in the history

  2. made settings as profile

    @Alberto195
    Alberto195 committed May 22, 2021
    Configuration menu
    Copy the full SHA
    4942abb View commit details
    Browse the repository at this point in the history

  3. New table, inactive favourite fragment, logs in sign in

    @GypsyJR777
    GypsyJR777 committed May 22, 2021
    Configuration menu
    Copy the full SHA
    cb08260 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2021

  1. nonsetfrag

    @Alberto195
    Alberto195 committed May 23, 2021
    Configuration menu
    Copy the full SHA
    cd49126 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/test' into test 

    # Conflicts:
#	app/src/main/java/com/example/finema/util/AppModule.kt
#	app/src/main/res/layout/profile_fragment.xml
    @Alberto195
    Alberto195 committed May 23, 2021
    Configuration menu
    Copy the full SHA
    fad3bc3 View commit details
    Browse the repository at this point in the history

  3. что-то

    Дмитрий Костык committed May 23, 2021
    Configuration menu
    Copy the full SHA
    2cfde92 View commit details
    Browse the repository at this point in the history

  4. favourite movies fix and clear fav movies feat

    @Alberto195
    Alberto195 committed May 23, 2021
    Configuration menu
    Copy the full SHA
    49205da View commit details
    Browse the repository at this point in the history

  5. перенес логику получения списка фильмов во фрагмент турнира.

    Дмитрий Костык committed May 23, 2021
    Configuration menu
    Copy the full SHA
    a4b5026 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/test' into test 

    # Conflicts:
#	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/dex_archive_input_jar_hashes/debug/out
#	app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json
#	app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
#	app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#	app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
#	app/build/intermediates/javac/debug/classes/com/example/finema/databinding/ActivityMainBinding.class
#	app/build/intermediates/javac/debug/classes/com/example/finema/databinding/FragmentTournamentDuoBindingImpl.class
#	app/build/intermediates/javac/debug/classes/com/example/finema/databinding/FragmentTournamentGenresBindingImpl.class
#	app/build/intermediates/javac/debug/classes/com/example/finema/databinding/GenreItemBinding.class
#	app/build/intermediates/javac/debug/classes/com/example/finema/databinding/HigherLowerFragmentBinding.class
#	app/build/intermediates/javac/debug/classes/com/example/finema/databinding/MovieDetailsFragmentBindingImpl.class
#	app/build/intermediates/javac/debug/classes/com/example/finema/databinding/MovieItemBindingImpl.class
#	app/build/intermediates/javac/debug/classes/com/example/finema/databinding/NavHeaderBindingImpl.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/processed_res/debug/out/resources-debug.ap_
#	app/build/intermediates/project_dex_archive/debug/out/com/example/finema/MainActivity$onCreate$2.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/database/room/RoomRepository.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/FragmentTournamentDuoBindingImpl.dex
#	app/build/intermediates/project_dex_archive/debug/out/com/example/finema/databinding/FragmentTournamentGenresBindingImpl.dex
#	app/build/intermediates/project_dex_archive/debug/out/com/example/finema/databinding/GenreItemBinding.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/MovieDetailsFragmentBindingImpl.dex
#	app/build/intermediates/project_dex_archive/debug/out/com/example/finema/databinding/MovieItemBindingImpl.dex
#	app/build/intermediates/project_dex_archive/debug/out/com/example/finema/databinding/NavHeaderBindingImpl.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/movieDetail/MovieDetailsViewModel.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.dex
#	app/build/intermediates/res/merged/debug/xml_settings.xml.flat
#	app/build/intermediates/runtime_symbol_list/debug/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.values.at
#	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.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.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.values.at
#	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/proto.tab
#	app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
#	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.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.values.at
#	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.values.at
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-attributes.tab
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.values.at
#	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.values.at
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at
#	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.values.at
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.s
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at
#	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.values.at
#	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/tmp/kapt3/incApCache/debug/classpath-structure.bin
#	app/build/tmp/kapt3/incApCache/debug/java-cache.bin
#	app/build/tmp/kapt3/stubs/debug/com/example/finema/MainActivity.kapt_metadata
#	app/build/tmp/kapt3/stubs/debug/com/example/finema/database/room/RoomDataBase.kapt_metadata
#	app/build/tmp/kapt3/stubs/debug/com/example/finema/database/room/RoomRepository.kapt_metadata
#	app/build/tmp/kapt3/stubs/debug/com/example/finema/ui/movieDetail/MovieDetailsFragment.kapt_metadata
#	app/build/tmp/kapt3/stubs/debug/com/example/finema/ui/signIn/SigInFragment.kapt_metadata
#	app/build/tmp/kotlin-classes/debug/com/example/finema/MainActivity$onCreate$2.class
#	app/build/tmp/kotlin-classes/debug/com/example/finema/MainActivity.class
#	app/build/tmp/kotlin-classes/debug/com/example/finema/database/room/RoomRepository.class
#	app/build/tmp/kotlin-classes/debug/com/example/finema/ui/movieDetail/MovieDetailsViewModel.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.class
    Дмитрий Костык committed May 23, 2021
    Configuration menu
    Copy the full SHA
    e21a45e View commit details
    Browse the repository at this point in the history

  7. тестовый пуш

    Дмитрий Костык committed May 23, 2021
    Configuration menu
    Copy the full SHA
    fd51a7a View commit details
    Browse the repository at this point in the history

  8. добавил немного иконок

    Дмитрий Костык committed May 23, 2021
    Configuration menu
    Copy the full SHA
    c17f1a8 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2021

  1. shit but work with TournamentVM

    Дмитрий Костык committed May 24, 2021
    Configuration menu
    Copy the full SHA
    2bc84f7 View commit details
    Browse the repository at this point in the history

  2. перенес логику из фрагмента турнира во viewmodel. Пока нет возможност… 

    …и выбирать жанр, но это можно пулить
    Дмитрий Костык committed May 24, 2021
    Configuration menu
    Copy the full SHA
    a3f6bc2 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2021

  1. Favourite fragment with navigation

    @GypsyJR777
    GypsyJR777 committed May 25, 2021
    Configuration menu
    Copy the full SHA
    7789981 View commit details
    Browse the repository at this point in the history

  2. Settings fix

    @GypsyJR777
    GypsyJR777 committed May 25, 2021
    Configuration menu
    Copy the full SHA
    bdf1923 View commit details
    Browse the repository at this point in the history

  3. fix sign in and choose fav frag

    @Alberto195
    Alberto195 committed May 25, 2021
    Configuration menu
    Copy the full SHA
    25f3ca6 View commit details
    Browse the repository at this point in the history

  4. nice

    @Alberto195
    Alberto195 committed May 25, 2021
    Configuration menu
    Copy the full SHA
    edd8519 View commit details
    Browse the repository at this point in the history

  5. bad db

    @GypsyJR777
    GypsyJR777 committed May 25, 2021
    Configuration menu
    Copy the full SHA
    57e738b View commit details
    Browse the repository at this point in the history

Commits on May 26, 2021

  1. add to fav buttons working

    @Alberto195
    Alberto195 committed May 26, 2021
    Configuration menu
    Copy the full SHA
    0ec6f45 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/test' into test

    @Alberto195
    Alberto195 committed May 26, 2021
    Configuration menu
    Copy the full SHA
    d41c6a4 View commit details
    Browse the repository at this point in the history

  3. lil fix

    @Alberto195
    Alberto195 committed May 26, 2021
    Configuration menu
    Copy the full SHA
    825ee0e View commit details
    Browse the repository at this point in the history

Commits on May 27, 2021

  1. Рабочий Турнир по жанрам и категориям

    Дмитрий Костык committed May 27, 2021
    Configuration menu
    Copy the full SHA
    bb9aac8 View commit details
    Browse the repository at this point in the history

  2. Изменил дизайн Tmp Fragment

    Дмитрий Костык committed May 27, 2021
    Configuration menu
    Copy the full SHA
    a4b5153 View commit details
    Browse the repository at this point in the history

  3. Исправил баг в Navigation

    Дмитрий Костык committed May 27, 2021
    Configuration menu
    Copy the full SHA
    adf2da1 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/test' into test 

    # Conflicts:
#	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/dex_archive_input_jar_hashes/debug/out
#	app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json
#	app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
#	app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#	app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
#	app/build/intermediates/javac/debug/classes/com/example/finema/databinding/ActivityMainBinding.class
#	app/build/intermediates/javac/debug/classes/com/example/finema/databinding/FragmentTournamentGenresBindingImpl.class
#	app/build/intermediates/javac/debug/classes/com/example/finema/databinding/GenreItemBinding.class
#	app/build/intermediates/javac/debug/classes/com/example/finema/databinding/HigherLowerFragmentBinding.class
#	app/build/intermediates/javac/debug/classes/com/example/finema/databinding/MovieDetailsFragmentBinding.class
#	app/build/intermediates/javac/debug/classes/com/example/finema/databinding/MovieDetailsFragmentBindingImpl.class
#	app/build/intermediates/javac/debug/classes/com/example/finema/databinding/MovieItemBindingImpl.class
#	app/build/intermediates/javac/debug/classes/com/example/finema/databinding/NavHeaderBindingImpl.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/processed_res/debug/out/resources-debug.ap_
#	app/build/intermediates/project_dex_archive/debug/out/com/example/finema/MainActivity$onCreate$2.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/MoviesRepository$getGenres$2.dex
#	app/build/intermediates/project_dex_archive/debug/out/com/example/finema/api/MoviesRepository$getMovieDetails$2.dex
#	app/build/intermediates/project_dex_archive/debug/out/com/example/finema/api/MoviesRepository$getMovies$2.dex
#	app/build/intermediates/project_dex_archive/debug/out/com/example/finema/api/MoviesRepository$getMoviesWithGenre$2.dex
#	app/build/intermediates/project_dex_archive/debug/out/com/example/finema/api/MoviesRepository.dex
#	app/build/intermediates/project_dex_archive/debug/out/com/example/finema/database/room/RoomRepository.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/FragmentTournamentGenresBindingImpl.dex
#	app/build/intermediates/project_dex_archive/debug/out/com/example/finema/databinding/GenreItemBinding.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/MovieDetailsFragmentBinding.dex
#	app/build/intermediates/project_dex_archive/debug/out/com/example/finema/databinding/MovieDetailsFragmentBindingImpl.dex
#	app/build/intermediates/project_dex_archive/debug/out/com/example/finema/databinding/MovieItemBindingImpl.dex
#	app/build/intermediates/project_dex_archive/debug/out/com/example/finema/databinding/NavHeaderBindingImpl.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$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.dex
#	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.values.at
#	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/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.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/proto.tab
#	app/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
#	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.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.values.at
#	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.values.at
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-attributes.tab
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-attributes.tab.values.at
#	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.values.at
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab
#	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.values.at
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.s
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab
#	app/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at
#	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.values.at
#	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/tmp/kapt3/incApCache/debug/apt-cache.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/com/example/finema/api/MoviesRepository.class
#	app/build/tmp/kapt3/stubs/debug/com/example/finema/api/MoviesRepository.java
#	app/build/tmp/kapt3/stubs/debug/com/example/finema/api/MoviesRepository.kapt_metadata
#	app/build/tmp/kapt3/stubs/debug/com/example/finema/database/room/RoomRepository.kapt_metadata
#	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.kapt_metadata
#	app/build/tmp/kotlin-classes/debug/com/example/finema/MainActivity$onCreate$2.class
#	app/build/tmp/kotlin-classes/debug/com/example/finema/MainActivity.class
#	app/build/tmp/kotlin-classes/debug/com/example/finema/api/MoviesRepository$getGenres$2.class
#	app/build/tmp/kotlin-classes/debug/com/example/finema/api/MoviesRepository$getMovieDetails$2.class
#	app/build/tmp/kotlin-classes/debug/com/example/finema/api/MoviesRepository$getMovies$2.class
#	app/build/tmp/kotlin-classes/debug/com/example/finema/api/MoviesRepository$getMoviesWithGenre$2.class
#	app/build/tmp/kotlin-classes/debug/com/example/finema/api/MoviesRepository.class
#	app/build/tmp/kotlin-classes/debug/com/example/finema/database/room/RoomRepository.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.class
#	app/src/main/java/com/example/finema/api/IMoviesRepository.kt
#	app/src/main/java/com/example/finema/api/MoviesApi.kt
#	app/src/main/java/com/example/finema/api/MoviesRepository.kt
#	app/src/main/java/com/example/finema/database/DatabaseRepository.kt
#	app/src/main/java/com/example/finema/database/room/RoomRepository.kt
#	app/src/main/res/values/strings.xml
    Дмитрий Костык committed May 27, 2021
    Configuration menu
    Copy the full SHA
    2e34037 View commit details
    Browse the repository at this point in the history

  5. сделал constraint в турнире

    Дмитрий Костык committed May 27, 2021
    Configuration menu
    Copy the full SHA
    d9a0364 View commit details
    Browse the repository at this point in the history

  6. hz

    @Alberto195
    Alberto195 committed May 27, 2021
    Configuration menu
    Copy the full SHA
    4a1c232 View commit details
    Browse the repository at this point in the history

  7. Adding favourite movie to the db

    @GypsyJR777
    GypsyJR777 committed May 27, 2021
    Configuration menu
    Copy the full SHA
    8ab9ba2 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2021

  1. Merge remote-tracking branch 'origin/test' into test 

    # Conflicts:
#	app/src/main/java/com/example/finema/database/room/RoomRepository.kt
    @GypsyJR777
    GypsyJR777 committed May 28, 2021
    Configuration menu
    Copy the full SHA
    a2d9a72 View commit details
    Browse the repository at this point in the history

  2. favourite movies are done

    @GypsyJR777
    GypsyJR777 committed May 28, 2021
    Configuration menu
    Copy the full SHA
    0e0753d View commit details
    Browse the repository at this point in the history

  3. profile

    @Alberto195
    Alberto195 committed May 28, 2021
    Configuration menu
    Copy the full SHA
    0a82bf9 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/test' into test 

    # Conflicts:
#	app/src/main/java/com/example/finema/ui/movieDetail/MovieDetailsFragment.kt
    @Alberto195
    Alberto195 committed May 28, 2021
    Configuration menu
    Copy the full SHA
    a1df389 View commit details
    Browse the repository at this point in the history

  5. profile

    @Alberto195
    Alberto195 committed May 28, 2021
    Configuration menu
    Copy the full SHA
    fb68f33 View commit details
    Browse the repository at this point in the history

  6. замерджил

    Дмитрий Костык committed May 28, 2021
    Configuration menu
    Copy the full SHA
    5d71755 View commit details
    Browse the repository at this point in the history

  7. favourite -> choose

    @GypsyJR777
    GypsyJR777 committed May 28, 2021
    Configuration menu
    Copy the full SHA
    6ea65ea View commit details
    Browse the repository at this point in the history

Commits on May 29, 2021

  1. fix some bugs

    Дмитрий Костык committed May 29, 2021
    Configuration menu
    Copy the full SHA
    0376205 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/test' into test 

    # Conflicts:
#	app/src/main/res/navigation/app_navigation_graph.xml
    Дмитрий Костык committed May 29, 2021
    Configuration menu
    Copy the full SHA
    7ee657e View commit details
    Browse the repository at this point in the history

  3. Night mode off

    @GypsyJR777
    GypsyJR777 committed May 29, 2021
    Configuration menu
    Copy the full SHA
    cc4f379 View commit details
    Browse the repository at this point in the history

  4. Fix bug in favourite

    @GypsyJR777
    GypsyJR777 committed May 29, 2021
    Configuration menu
    Copy the full SHA
    dc4fc44 View commit details
    Browse the repository at this point in the history

  5. FlexBox in favourite

    @GypsyJR777
    GypsyJR777 committed May 29, 2021
    Configuration menu
    Copy the full SHA
    ea390e8 View commit details
    Browse the repository at this point in the history

  6. Исправил грамматические проблемы в турнире

    Дмитрий Костык committed May 29, 2021
    Configuration menu
    Copy the full SHA
    c6d3e9f View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/test' into test

    Дмитрий Костык committed May 29, 2021
    Configuration menu
    Copy the full SHA
    03cb8c9 View commit details
    Browse the repository at this point in the history

  8. profile sign in and top/favourite fix

    @Alberto195
    Alberto195 committed May 29, 2021
    Configuration menu
    Copy the full SHA
    222a357 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/test' into test

    @Alberto195
    Alberto195 committed May 29, 2021
    Configuration menu
    Copy the full SHA
    fb09a5b View commit details
    Browse the repository at this point in the history

  10. lil fixies

    @Alberto195
    Alberto195 committed May 29, 2021
    Configuration menu
    Copy the full SHA
    39e826d View commit details
    Browse the repository at this point in the history

  11. изменил диалог

    Дмитрий Костык committed May 29, 2021
    Configuration menu
    Copy the full SHA
    9f1a26c View commit details
    Browse the repository at this point in the history

  12. Nice details

    @GypsyJR777
    GypsyJR777 committed May 29, 2021
    Configuration menu
    Copy the full SHA
    4a17927 View commit details
    Browse the repository at this point in the history

  13. Merge remote-tracking branch 'origin/test' into test

    Дмитрий Костык committed May 29, 2021
    Configuration menu
    Copy the full SHA
    b0404a9 View commit details
    Browse the repository at this point in the history

  14. Merge remote-tracking branch 'origin/test' into test

    Дмитрий Костык committed May 29, 2021
    Configuration menu
    Copy the full SHA
    318e123 View commit details
    Browse the repository at this point in the history

  15. исправил диалог!

    Дмитрий Костык committed May 29, 2021
    Configuration menu
    Copy the full SHA
    9adc58c View commit details
    Browse the repository at this point in the history

Commits on May 31, 2021

  1. Minus dagger and RxJava2 + fix bug in movie details

    @GypsyJR777
    GypsyJR777 committed May 31, 2021
    Configuration menu
    Copy the full SHA
    03faea8 View commit details
    Browse the repository at this point in the history

  2. animation bookmark

    @Alberto195
    Alberto195 committed May 31, 2021
    Configuration menu
    Copy the full SHA
    4fec4c2 View commit details
    Browse the repository at this point in the history

  3. wtf

    @Alberto195
    Alberto195 committed May 31, 2021
    Configuration menu
    Copy the full SHA
    8ac4287 View commit details
    Browse the repository at this point in the history

  4. Добавил синхронизацию с БД Firebase. Если пользователь авторизован, т… 

    …о кроме сохранения в ROOM, всё идет ещё и в Firebase. При выходе из приложения все данные очищаются, но тк пользователь авторизован, всё остается в Firebase и при авторизации данные копируются в Room. Если пользователь гость, то всё стирается с концами.

До сих пор есть баг с диалоговым окном при входе
    Дмитрий Костык committed May 31, 2021
    Configuration menu
    Copy the full SHA
    58abcfa View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/test' into test 

    # Conflicts:
#	app/src/main/java/com/example/finema/ui/movieDetail/MovieDetailsFragment.kt
    Дмитрий Костык committed May 31, 2021
    Configuration menu
    Copy the full SHA
    65f8dbb View commit details
    Browse the repository at this point in the history

  6. better sign in

    @Alberto195
    Alberto195 committed May 31, 2021
    Configuration menu
    Copy the full SHA
    8d0237c View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/test' into test 

    # Conflicts:
#	app/src/main/java/com/example/finema/repositories/Contract.kt
#	app/src/main/java/com/example/finema/ui/settings/SettingsFragment.kt
#	app/src/main/java/com/example/finema/ui/settings/SettingsViewModel.kt
#	app/src/main/java/com/example/finema/ui/signIn/SigInFragment.kt
#	app/src/main/java/com/example/finema/ui/signIn/SignInViewModel.kt
    @Alberto195
    Alberto195 committed May 31, 2021
    Configuration menu
    Copy the full SHA
    8e4c8a2 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2021

  1. Небольшой редизайн

    Дмитрий Костык committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    ecdf44d View commit details
    Browse the repository at this point in the history

  2. Ещё немного правок

    Дмитрий Костык committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    f8e8fde View commit details
    Browse the repository at this point in the history

  3. smth

    @Alberto195
    Alberto195 committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    7f58d59 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/test' into test

    @Alberto195
    Alberto195 committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    54c1884 View commit details
    Browse the repository at this point in the history

  5. Ещё немного правок

    Дмитрий Костык committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    5c0299f View commit details
    Browse the repository at this point in the history

  6. avatar activity round

    @Alberto195
    Alberto195 committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    41210db View commit details
    Browse the repository at this point in the history

  7. Ещё немного правок

    Дмитрий Костык committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    9d5a213 View commit details
    Browse the repository at this point in the history

  8. guest name stopped disappearing

    @Alberto195
    Alberto195 committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    d8205f7 View commit details
    Browse the repository at this point in the history

  9. best sign in

    @Alberto195
    Alberto195 committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    65d107d View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'origin/test' into test

    Дмитрий Костык committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    5572def View commit details
    Browse the repository at this point in the history

  11. lil fix

    @Alberto195
    Alberto195 committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    f887574 View commit details
    Browse the repository at this point in the history

  12. Merge remote-tracking branch 'origin/test' into test

    @Alberto195
    Alberto195 committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    a05242e View commit details
    Browse the repository at this point in the history

  13. descrp button and dialog fix

    @Alberto195
    Alberto195 committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    9e661f2 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2021

  1. Поправил Категории. Можно выбрать 256 фильмов. Изменил иконку информа… 

    …ции во время турнира
    Дмитрий Костык committed Jun 2, 2021
    Configuration menu
    Copy the full SHA
    94441e1 View commit details
    Browse the repository at this point in the history

  2. MovieDetails with loading + dialog's strings in strings.xml

    @GypsyJR777
    GypsyJR777 committed Jun 2, 2021
    Configuration menu
    Copy the full SHA
    1a23237 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/test' into test

    @GypsyJR777
    GypsyJR777 committed Jun 2, 2021
    Configuration menu
    Copy the full SHA
    2577687 View commit details
    Browse the repository at this point in the history

  4. Заменил картинку при авторизации на легковесную

    Дмитрий Костык committed Jun 2, 2021
    Configuration menu
    Copy the full SHA
    4d4d820 View commit details
    Browse the repository at this point in the history

  5. Предупреждение на ХХХ категорию

    Дмитрий Костык committed Jun 2, 2021
    Configuration menu
    Copy the full SHA
    55aa9bc View commit details
    Browse the repository at this point in the history

  6. Убрал баг с клавиатурой при переходе из поиска в детали фильма

    Дмитрий Костык committed Jun 2, 2021
    Configuration menu
    Copy the full SHA
    534bcf3 View commit details
    Browse the repository at this point in the history

  7. pusto

    @Alberto195
    Alberto195 committed Jun 2, 2021
    Configuration menu
    Copy the full SHA
    3a3e74e View commit details
    Browse the repository at this point in the history

  8. pusto

    @Alberto195
    Alberto195 committed Jun 2, 2021
    Configuration menu
    Copy the full SHA
    48ef010 View commit details
    Browse the repository at this point in the history

  9. пофиксил баг с Firebase

    Дмитрий Костык committed Jun 2, 2021
    Configuration menu
    Copy the full SHA
    d54ce53 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2021

  1. linkt and detekt fix

    @Alberto195
    Alberto195 committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    57308a3 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/test' into test

    @Alberto195
    Alberto195 committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    5d97cac View commit details
    Browse the repository at this point in the history

  3. posters to profile and search

    @Alberto195
    Alberto195 committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    d0b353d View commit details
    Browse the repository at this point in the history

  4. изменил Tmp

    Дмитрий Костык committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    5de5ac5 View commit details
    Browse the repository at this point in the history

  5. Fix drawer menu

    @GypsyJR777
    GypsyJR777 committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    b4fc37e View commit details
    Browse the repository at this point in the history

  6. Periodic notification

    @GypsyJR777
    GypsyJR777 committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    4eac02a View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2021

  1. ktlint ok

    @GypsyJR777
    GypsyJR777 committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    196f9d6 View commit details
    Browse the repository at this point in the history

  2. detekt fixes

    @Alberto195
    Alberto195 committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    28f928e View commit details
    Browse the repository at this point in the history

  3. xml hl colour fix

    @Alberto195
    Alberto195 committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    dce2113 View commit details
    Browse the repository at this point in the history

  4. zapuskaetsa

    @Alberto195
    Alberto195 committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    ee4a42d View commit details
    Browse the repository at this point in the history

  5. A bit more todo

    kiltonik committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    c61c273 View commit details
    Browse the repository at this point in the history

  6. FavouriteAdapter

    @GypsyJR777
    GypsyJR777 committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    8249559 View commit details
    Browse the repository at this point in the history

  7. db bookamrks

    @Alberto195
    Alberto195 committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    b81c54e View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'origin/test' into test

    @Alberto195
    Alberto195 committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    37f97c1 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2021

  1. Right check favourite

    @GypsyJR777
    GypsyJR777 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    1949cc4 View commit details
    Browse the repository at this point in the history

  2. Fix some bugs

    @GypsyJR777
    GypsyJR777 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    af51f6a View commit details
    Browse the repository at this point in the history

  3. Fix favourite fragment

    @GypsyJR777
    GypsyJR777 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    ae9ff56 View commit details
    Browse the repository at this point in the history

  4. ktlint ok

    @GypsyJR777
    GypsyJR777 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    157a0ef View commit details
    Browse the repository at this point in the history

  5. interfaces and tournament let

    @Alberto195
    Alberto195 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    0aa8fb2 View commit details
    Browse the repository at this point in the history

  6. Fix notifications timing

    @GypsyJR777
    GypsyJR777 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    0ea51e6 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/test' into test 

    # 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
    @Alberto195
    Alberto195 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    113e38b View commit details
    Browse the repository at this point in the history

  8. DI apppref

    @Alberto195
    Alberto195 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    ba059ba View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/test' into test

    @Alberto195
    Alberto195 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    ae23d05 View commit details
    Browse the repository at this point in the history

  10. bookmark fixes

    @Alberto195
    Alberto195 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    23fad03 View commit details
    Browse the repository at this point in the history

  11. совсем немного поменял

    Дмитрий Костык committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    9b72f4d View commit details
    Browse the repository at this point in the history

  12. Merge remote-tracking branch 'origin/test' into test

    Дмитрий Костык committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    1218ae1 View commit details
    Browse the repository at this point in the history

  13. совсем немного поменял

    Дмитрий Костык committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    391f3cb View commit details
    Browse the repository at this point in the history

  14. fixes

    @Alberto195
    Alberto195 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    1d26d17 View commit details
    Browse the repository at this point in the history

  15. Merge remote-tracking branch 'origin/test' into test 

    # Conflicts:
#	app/src/main/java/com/example/finema/database/firebase/FirebaseRepository.kt
    @Alberto195
    Alberto195 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    f9fc90f View commit details
    Browse the repository at this point in the history

  16. fixes

    @Alberto195
    Alberto195 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    d70155c View commit details
    Browse the repository at this point in the history

  17. Merge remote-tracking branch 'origin/test' 

    # 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
    @Alberto195
    Alberto195 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    961627e View commit details
    Browse the repository at this point in the history

  18. no build

    @Alberto195
    Alberto195 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    8bb8258 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2021

  1. Movie trailer

    @GypsyJR777
    GypsyJR777 committed Jun 13, 2021
    Configuration menu
    Copy the full SHA
    5c68bbc View commit details
    Browse the repository at this point in the history