Code

Please Accept#4

Code

Open

Alberto195 wants to merge 198 commits intovk-education:mastervk-education/KLAD:masterfrom Alberto195:masterAlberto195/KLAD:masterCopy head branch name to clipboard

+7,982-1

Commits

Commits on Apr 30, 2021

• crap

  Alberto195

  committed
  d4cb2b5

  Copy full SHA for d4cb2b5

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

  Alberto195

  committed
  524066f

  Copy full SHA for 524066f

• signIn and BaseClasses elements

  Alberto195

  committed
  5831b9e

  Copy full SHA for 5831b9e

Commits on May 2, 2021

• gradle files

  Alberto195

  committed
  58ece6d

  Copy full SHA for 58ece6d

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

  Show description for d01b115
  Alberto195

  committed
  d01b115

  Copy full SHA for d01b115

• Delete settings.gradle

  Alberto195

  authored
  6810817

  Copy full SHA for 6810817

• Delete gradlew.bat

  Alberto195

  authored
  2e799c9

  Copy full SHA for 2e799c9

• Delete gradlew

  Alberto195

  authored
  890dde3

  Copy full SHA for 890dde3

• Delete gradle.properties

  Alberto195

  authored
  8aaf6f2

  Copy full SHA for 8aaf6f2

• Delete build.gradle

  Alberto195

  authored
  e46bcc8

  Copy full SHA for e46bcc8

• Delete .gitignore

  Alberto195

  authored
  4eb153d

  Copy full SHA for 4eb153d

• Delete gradle/wrapper directory

  Alberto195

  authored
  048e172

  Copy full SHA for 048e172

• Delete app directory

  Alberto195

  authored
  f6b88ba

  Copy full SHA for f6b88ba

• new gradle files

  Alberto195

  committed
  0c1f66a

  Copy full SHA for 0c1f66a

• new gradle files

  Alberto195

  committed
  9d7d3d2

  Copy full SHA for 9d7d3d2

• add gardles

  Alberto195

  committed
  cd530d5

  Copy full SHA for cd530d5

• demo thats working

  Alberto195

  committed
  6de0046

  Copy full SHA for 6de0046

• it doesnt work

  Alberto195

  committed
  afc2d0e

  Copy full SHA for afc2d0e

Commits on May 4, 2021

• game

  Alberto195

  committed
  e977cd8

  Copy full SHA for e977cd8

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

  

  Дмитрий Костык

  committed
  d4d37e5

  Copy full SHA for d4d37e5

• test for dima

  Alberto195

  committed
  70764da

  Copy full SHA for 70764da

Commits on May 6, 2021

• Merge remote-tracking branch 'origin/test' into Database

  Show description for 70c00ff
  

  Дмитрий Костык

  committed
  70c00ff

  Copy full SHA for 70c00ff

• merged with Dima. Without Albert's Retrofit

  

  Дмитрий Костык

  committed
  49e97e3

  Copy full SHA for 49e97e3

• demo vers

  Alberto195

  committed
  671f66b

  Copy full SHA for 671f66b

Commits on May 7, 2021

• activity_main.xml

  GypsyJR777

  committed
  01e2f87

  Copy full SHA for 01e2f87

Commits on May 8, 2021

• Movie details fragment

  GypsyJR777

  committed
  2fc1244

  Copy full SHA for 2fc1244

• Control panel

  GypsyJR777

  committed
  b628c01

  Copy full SHA for b628c01

• Notifications

  GypsyJR777

  committed
  78aabfc

  Copy full SHA for 78aabfc

• Settings

  GypsyJR777

  committed
  391808f

  Copy full SHA for 391808f

Commits on May 9, 2021

• tournament done

  

  Дмитрий Костык

  committed
  ceffac7

  Copy full SHA for ceffac7

• tournament with numberfragment

  

  Дмитрий Костык

  committed
  3f2f249

  Copy full SHA for 3f2f249

• merged 10.05.2021

  

  Дмитрий Костык

  committed
  4d4cb97

  Copy full SHA for 4d4cb97

• after merge Tournament with info

  

  Дмитрий Костык

  committed
  9470c6b

  Copy full SHA for 9470c6b

Commits on May 10, 2021

• bug fixed 1

  

  Дмитрий Костык

  committed
  71ea8c4

  Copy full SHA for 71ea8c4

• bug fixed 2

  

  Дмитрий Костык

  committed
  d7c3cda

  Copy full SHA for d7c3cda

• commit

  

  Дмитрий Костык

  committed
  d3ea97c

  Copy full SHA for d3ea97c

• bug fixed

  

  Дмитрий Костык

  committed
  891cb57

  Copy full SHA for 891cb57

• bug fixed 1

  

  Дмитрий Костык

  committed
  9107482

  Copy full SHA for 9107482

Commits on May 11, 2021

• bug fixed 3

  

  Дмитрий Костык

  committed
  151c303

  Copy full SHA for 151c303

• some fix

  

  Дмитрий Костык

  committed
  76b68fa

  Copy full SHA for 76b68fa

• before recycler change

  

  Дмитрий Костык

  committed
  19c7e45

  Copy full SHA for 19c7e45

• last commit

  

  Дмитрий Костык

  committed
  271f0a4

  Copy full SHA for 271f0a4

• last commit

  

  Дмитрий Костык

  committed
  20cc0fc

  Copy full SHA for 20cc0fc

• new xnl

  Alberto195

  committed
  1743486

  Copy full SHA for 1743486

• last last

  

  Дмитрий Костык

  committed
  6fa07ff

  Copy full SHA for 6fa07ff

Commits on May 12, 2021

• only 16 films but work

  

  Дмитрий Костык

  committed
  a8b48d5

  Copy full SHA for a8b48d5

• crappy version but work

  Alberto195

  committed
  63c4ff1

  Copy full SHA for 63c4ff1

• Merge remote-tracking branch 'origin/test' into test

  Show description for 5dd2373
  Alberto195

  committed
  5dd2373

  Copy full SHA for 5dd2373

• nbia

  Alberto195

  committed
  9e3b6f6

  Copy full SHA for 9e3b6f6

• some fix

  

  Дмитрий Костык

  committed
  d6fd491

  Copy full SHA for d6fd491

• some fix 1

  

  Дмитрий Костык

  committed
  41ad29c

  Copy full SHA for 41ad29c

• push push

  

  Дмитрий Костык

  committed
  5023a6e

  Copy full SHA for 5023a6e

• smth

  Alberto195

  committed
  2c8dcc1

  Copy full SHA for 2c8dcc1

• new

  Alberto195

  committed
  31072fb

  Copy full SHA for 31072fb

Commits on May 14, 2021

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

  

  kiltonik

  committed
  888c1f7

  Copy full SHA for 888c1f7

• Исправлен gitignore

  

  kiltonik

  committed
  c517943

  Copy full SHA for c517943

• idk

  Alberto195

  committed
  5c84a15

  Copy full SHA for 5c84a15

• di new hl

  Alberto195

  committed
  4da568c

  Copy full SHA for 4da568c

Commits on May 15, 2021

• firebase

  Alberto195

  committed
  d507698

  Copy full SHA for d507698

• WorkManager and notification

  GypsyJR777

  committed
  d57debf

  Copy full SHA for d57debf

• eh

  Alberto195

  committed
  9622a5d

  Copy full SHA for 9622a5d

• Merge remote-tracking branch 'origin/test' into test

  Show description for a83212d
  Alberto195

  committed
  a83212d

  Copy full SHA for a83212d

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

  

  Дмитрий Костык

  committed
  6b912a9

  Copy full SHA for 6b912a9

• Merge remote-tracking branch 'origin/test' into test

  Show description for 745c327
  Alberto195

  committed
  745c327

  Copy full SHA for 745c327

• higherlower small fix

  Alberto195

  committed
  c91dd5a

  Copy full SHA for c91dd5a

Commits on May 16, 2021

• Fix fragment of film's information

  GypsyJR777

  committed
  e839ecf

  Copy full SHA for e839ecf

• sum minor updates

  Alberto195

  committed
  c460ae7

  Copy full SHA for c460ae7

• Merge remote-tracking branch 'origin/test' into test

  Show description for 1a5b09f
  Alberto195

  committed
  1a5b09f

  Copy full SHA for 1a5b09f

Commits on May 17, 2021

• 1

  GypsyJR777

  committed
  bbeedbd

  Copy full SHA for bbeedbd

• Added TODO and edited gitignore

  

  kiltonik

  committed
  09fb975

  Copy full SHA for 09fb975

• cleaning git

  

  kiltonik

  committed
  2542044

  Copy full SHA for 2542044

• Sign in + fix notification

  GypsyJR777

  committed
  744cecf

  Copy full SHA for 744cecf

Commits on May 18, 2021

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

  

  Дмитрий Костык

  committed
  5e7789e

  Copy full SHA for 5e7789e

• error

  Alberto195

  committed
  ab7e47b

  Copy full SHA for ab7e47b

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

  

  Дмитрий Костык

  committed
  b42a23f

  Copy full SHA for b42a23f

• still error

  Alberto195

  committed
  c94cf46

  Copy full SHA for c94cf46

• Merge remote-tracking branch 'origin/test' into test

  Show description for 4e87cd6
  Alberto195

  committed
  4e87cd6

  Copy full SHA for 4e87cd6

• blyaaaaaa

  Alberto195

  committed
  68856f8

  Copy full SHA for 68856f8

• Settings with quit

  GypsyJR777

  committed
  919e953

  Copy full SHA for 919e953

Commits on May 20, 2021

• Some strings

  GypsyJR777

  committed
  066bf13

  Copy full SHA for 066bf13

• Closing and opening drawer layout in Activity,

  GypsyJR777

  committed
  ce3acbe

  Copy full SHA for ce3acbe

Commits on May 21, 2021

• roomtracking error

  Alberto195

  committed
  0275c08

  Copy full SHA for 0275c08

• Merge remote-tracking branch 'origin/test' into test

  Alberto195

  committed
  9048036

  Copy full SHA for 9048036

• updated koin, GTAdapter

  Alberto195

  committed
  ea5d433

  Copy full SHA for ea5d433

• minor updates

  Alberto195

  committed
  df3c377

  Copy full SHA for df3c377

• sign In update

  Alberto195

  committed
  b1075d6

  Copy full SHA for b1075d6

Commits on May 22, 2021

• horrible but workin sign in

  Alberto195

  committed
  1c48ae7

  Copy full SHA for 1c48ae7

• made settings as profile

  Alberto195

  committed
  4942abb

  Copy full SHA for 4942abb

• New table, inactive favourite fragment, logs in sign in

  GypsyJR777

  committed
  cb08260

  Copy full SHA for cb08260

Commits on May 23, 2021

• nonsetfrag

  Alberto195

  committed
  cd49126

  Copy full SHA for cd49126

• Merge remote-tracking branch 'origin/test' into test

  Show description for fad3bc3
  Alberto195

  committed
  fad3bc3

  Copy full SHA for fad3bc3

• что-то

  

  Дмитрий Костык

  committed
  2cfde92

  Copy full SHA for 2cfde92

• favourite movies fix and clear fav movies feat

  Alberto195

  committed
  49205da

  Copy full SHA for 49205da

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

  

  Дмитрий Костык

  committed
  a4b5026

  Copy full SHA for a4b5026

• Merge remote-tracking branch 'origin/test' into test

  Show description for e21a45e
  

  Дмитрий Костык

  committed
  e21a45e

  Copy full SHA for e21a45e

• тестовый пуш

  

  Дмитрий Костык

  committed
  fd51a7a

  Copy full SHA for fd51a7a

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

  

  Дмитрий Костык

  committed
  c17f1a8

  Copy full SHA for c17f1a8

Commits on May 24, 2021

• shit but work with TournamentVM

  

  Дмитрий Костык

  committed
  2bc84f7

  Copy full SHA for 2bc84f7

• перенес логику из фрагмента турнира во viewmodel. Пока нет возможности выбирать жанр, но это можно пулить

  

  Дмитрий Костык

  committed
  a3f6bc2

  Copy full SHA for a3f6bc2

Commits on May 25, 2021

• Favourite fragment with navigation

  GypsyJR777

  committed
  7789981

  Copy full SHA for 7789981

• Settings fix

  GypsyJR777

  committed
  bdf1923

  Copy full SHA for bdf1923

• fix sign in and choose fav frag

  Alberto195

  committed
  25f3ca6

  Copy full SHA for 25f3ca6

• nice

  Alberto195

  committed
  edd8519

  Copy full SHA for edd8519

• bad db

  GypsyJR777

  committed
  57e738b

  Copy full SHA for 57e738b

Commits on May 26, 2021

• add to fav buttons working

  Alberto195

  committed
  0ec6f45

  Copy full SHA for 0ec6f45

• Merge remote-tracking branch 'origin/test' into test

  Alberto195

  committed
  d41c6a4

  Copy full SHA for d41c6a4

• lil fix

  Alberto195

  committed
  825ee0e

  Copy full SHA for 825ee0e

Commits on May 27, 2021

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

  

  Дмитрий Костык

  committed
  bb9aac8

  Copy full SHA for bb9aac8

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

  

  Дмитрий Костык

  committed
  a4b5153

  Copy full SHA for a4b5153

• Исправил баг в Navigation

  

  Дмитрий Костык

  committed
  adf2da1

  Copy full SHA for adf2da1

• Merge remote-tracking branch 'origin/test' into test

  Show description for 2e34037
  

  Дмитрий Костык

  committed
  2e34037

  Copy full SHA for 2e34037

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

  

  Дмитрий Костык

  committed
  d9a0364

  Copy full SHA for d9a0364

• hz

  Alberto195

  committed
  4a1c232

  Copy full SHA for 4a1c232

• Adding favourite movie to the db

  GypsyJR777

  committed
  8ab9ba2

  Copy full SHA for 8ab9ba2

Commits on May 28, 2021

• Merge remote-tracking branch 'origin/test' into test

  Show description for a2d9a72
  GypsyJR777

  committed
  a2d9a72

  Copy full SHA for a2d9a72

• favourite movies are done

  GypsyJR777

  committed
  0e0753d

  Copy full SHA for 0e0753d

• profile

  Alberto195

  committed
  0a82bf9

  Copy full SHA for 0a82bf9

• Merge remote-tracking branch 'origin/test' into test

  Show description for a1df389
  Alberto195

  committed
  a1df389

  Copy full SHA for a1df389

• profile

  Alberto195

  committed
  fb68f33

  Copy full SHA for fb68f33

• замерджил

  

  Дмитрий Костык

  committed
  5d71755

  Copy full SHA for 5d71755

• favourite -> choose

  GypsyJR777

  committed
  6ea65ea

  Copy full SHA for 6ea65ea

Commits on May 29, 2021

• fix some bugs

  

  Дмитрий Костык

  committed
  0376205

  Copy full SHA for 0376205

• Merge remote-tracking branch 'origin/test' into test

  Show description for 7ee657e
  

  Дмитрий Костык

  committed
  7ee657e

  Copy full SHA for 7ee657e

• Night mode off

  GypsyJR777

  committed
  cc4f379

  Copy full SHA for cc4f379

• Fix bug in favourite

  GypsyJR777

  committed
  dc4fc44

  Copy full SHA for dc4fc44

• FlexBox in favourite

  GypsyJR777

  committed
  ea390e8

  Copy full SHA for ea390e8

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

  

  Дмитрий Костык

  committed
  c6d3e9f

  Copy full SHA for c6d3e9f

• Merge remote-tracking branch 'origin/test' into test

  

  Дмитрий Костык

  committed
  03cb8c9

  Copy full SHA for 03cb8c9

• profile sign in and top/favourite fix

  Alberto195

  committed
  222a357

  Copy full SHA for 222a357

• Merge remote-tracking branch 'origin/test' into test

  Alberto195

  committed
  fb09a5b

  Copy full SHA for fb09a5b

• lil fixies

  Alberto195

  committed
  39e826d

  Copy full SHA for 39e826d

• изменил диалог

  

  Дмитрий Костык

  committed
  9f1a26c

  Copy full SHA for 9f1a26c

• Nice details

  GypsyJR777

  committed
  4a17927

  Copy full SHA for 4a17927

• Merge remote-tracking branch 'origin/test' into test

  

  Дмитрий Костык

  committed
  b0404a9

  Copy full SHA for b0404a9

• Merge remote-tracking branch 'origin/test' into test

  

  Дмитрий Костык

  committed
  318e123

  Copy full SHA for 318e123

• исправил диалог!

  

  Дмитрий Костык

  committed
  9adc58c

  Copy full SHA for 9adc58c

Commits on May 31, 2021

• Minus dagger and RxJava2 + fix bug in movie details

  GypsyJR777

  committed
  03faea8

  Copy full SHA for 03faea8

• animation bookmark

  Alberto195

  committed
  4fec4c2

  Copy full SHA for 4fec4c2

• wtf

  Alberto195

  committed
  8ac4287

  Copy full SHA for 8ac4287

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

  Show description for 58abcfa
  

  Дмитрий Костык

  committed
  58abcfa

  Copy full SHA for 58abcfa

• Merge remote-tracking branch 'origin/test' into test

  Show description for 65f8dbb
  

  Дмитрий Костык

  committed
  65f8dbb

  Copy full SHA for 65f8dbb

• better sign in

  Alberto195

  committed
  8d0237c

  Copy full SHA for 8d0237c

• Merge remote-tracking branch 'origin/test' into test

  Show description for 8e4c8a2
  Alberto195

  committed
  8e4c8a2

  Copy full SHA for 8e4c8a2

Commits on Jun 1, 2021

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

  

  Дмитрий Костык

  committed
  ecdf44d

  Copy full SHA for ecdf44d

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

  

  Дмитрий Костык

  committed
  f8e8fde

  Copy full SHA for f8e8fde

• smth

  Alberto195

  committed
  7f58d59

  Copy full SHA for 7f58d59

• Merge remote-tracking branch 'origin/test' into test

  Alberto195

  committed
  54c1884

  Copy full SHA for 54c1884

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

  

  Дмитрий Костык

  committed
  5c0299f

  Copy full SHA for 5c0299f

• avatar activity round

  Alberto195

  committed
  41210db

  Copy full SHA for 41210db

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

  

  Дмитрий Костык

  committed
  9d5a213

  Copy full SHA for 9d5a213

• guest name stopped disappearing

  Alberto195

  committed
  d8205f7

  Copy full SHA for d8205f7

• best sign in

  Alberto195

  committed
  65d107d

  Copy full SHA for 65d107d

• Merge remote-tracking branch 'origin/test' into test

  

  Дмитрий Костык

  committed
  5572def

  Copy full SHA for 5572def

• lil fix

  Alberto195

  committed
  f887574

  Copy full SHA for f887574

• Merge remote-tracking branch 'origin/test' into test

  Alberto195

  committed
  a05242e

  Copy full SHA for a05242e

• descrp button and dialog fix

  Alberto195

  committed
  9e661f2

  Copy full SHA for 9e661f2

Commits on Jun 2, 2021

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

  

  Дмитрий Костык

  committed
  94441e1

  Copy full SHA for 94441e1

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

  GypsyJR777

  committed
  1a23237

  Copy full SHA for 1a23237

• Merge remote-tracking branch 'origin/test' into test

  GypsyJR777

  committed
  2577687

  Copy full SHA for 2577687

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

  

  Дмитрий Костык

  committed
  4d4d820

  Copy full SHA for 4d4d820

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

  

  Дмитрий Костык

  committed
  55aa9bc

  Copy full SHA for 55aa9bc

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

  

  Дмитрий Костык

  committed
  534bcf3

  Copy full SHA for 534bcf3

• pusto

  Alberto195

  committed
  3a3e74e

  Copy full SHA for 3a3e74e

• pusto

  Alberto195

  committed
  48ef010

  Copy full SHA for 48ef010

• пофиксил баг с Firebase

  

  Дмитрий Костык

  committed
  d54ce53

  Copy full SHA for d54ce53

Commits on Jun 7, 2021

• linkt and detekt fix

  Alberto195

  committed
  57308a3

  Copy full SHA for 57308a3

• Merge remote-tracking branch 'origin/test' into test

  Alberto195

  committed
  5d97cac

  Copy full SHA for 5d97cac

• posters to profile and search

  Alberto195

  committed
  d0b353d

  Copy full SHA for d0b353d

• изменил Tmp

  

  Дмитрий Костык

  committed
  5de5ac5

  Copy full SHA for 5de5ac5

• Fix drawer menu

  GypsyJR777

  committed
  b4fc37e

  Copy full SHA for b4fc37e

• Periodic notification

  GypsyJR777

  committed
  4eac02a

  Copy full SHA for 4eac02a

Commits on Jun 8, 2021

• ktlint ok

  GypsyJR777

  committed
  196f9d6

  Copy full SHA for 196f9d6

• detekt fixes

  Alberto195

  committed
  28f928e

  Copy full SHA for 28f928e

• xml hl colour fix

  Alberto195

  committed
  dce2113

  Copy full SHA for dce2113

• zapuskaetsa

  Alberto195

  committed
  ee4a42d

  Copy full SHA for ee4a42d

• A bit more todo

  

  kiltonik

  committed
  c61c273

  Copy full SHA for c61c273

• FavouriteAdapter

  GypsyJR777

  committed
  8249559

  Copy full SHA for 8249559

• db bookamrks

  Alberto195

  committed
  b81c54e

  Copy full SHA for b81c54e

• Merge remote-tracking branch 'origin/test' into test

  Alberto195

  committed
  37f97c1

  Copy full SHA for 37f97c1

Commits on Jun 9, 2021

• Right check favourite

  GypsyJR777

  committed
  1949cc4

  Copy full SHA for 1949cc4

• Fix some bugs

  GypsyJR777

  committed
  af51f6a

  Copy full SHA for af51f6a

• Fix favourite fragment

  GypsyJR777

  committed
  ae9ff56

  Copy full SHA for ae9ff56

• ktlint ok

  GypsyJR777

  committed
  157a0ef

  Copy full SHA for 157a0ef

• interfaces and tournament let

  Alberto195

  committed
  0aa8fb2

  Copy full SHA for 0aa8fb2

• Fix notifications timing

  GypsyJR777

  committed
  0ea51e6

  Copy full SHA for 0ea51e6

• Merge remote-tracking branch 'origin/test' into test

  Show description for 113e38b
  Alberto195

  committed
  113e38b

  Copy full SHA for 113e38b

• DI apppref

  Alberto195

  committed
  ba059ba

  Copy full SHA for ba059ba

• Merge remote-tracking branch 'origin/test' into test

  Alberto195

  committed
  ae23d05

  Copy full SHA for ae23d05

• bookmark fixes

  Alberto195

  committed
  23fad03

  Copy full SHA for 23fad03

• совсем немного поменял

  

  Дмитрий Костык

  committed
  9b72f4d

  Copy full SHA for 9b72f4d

• Merge remote-tracking branch 'origin/test' into test

  

  Дмитрий Костык

  committed
  1218ae1

  Copy full SHA for 1218ae1

• совсем немного поменял

  

  Дмитрий Костык

  committed
  391f3cb

  Copy full SHA for 391f3cb

• fixes

  Alberto195

  committed
  1d26d17

  Copy full SHA for 1d26d17

• Merge remote-tracking branch 'origin/test' into test

  Show description for f9fc90f
  Alberto195

  committed
  f9fc90f

  Copy full SHA for f9fc90f

• fixes

  Alberto195

  committed
  d70155c

  Copy full SHA for d70155c

• Merge remote-tracking branch 'origin/test'

  Show description for 961627e
  Alberto195

  committed
  961627e

  Copy full SHA for 961627e

• no build

  Alberto195

  committed
  8bb8258

  Copy full SHA for 8bb8258

Commits on Jun 13, 2021

• Movie trailer

  GypsyJR777

  committed
  5c68bbc

  Copy full SHA for 5c68bbc