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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
198 commits
Select commit Hold shift + click to select a range
d4cb2b5
crap
Alberto195 Apr 30, 2021
524066f
Merge branch 'master' of https://github.com/Alberto195/KLAD
Alberto195 Apr 30, 2021
5831b9e
signIn and BaseClasses elements
Alberto195 Apr 30, 2021
58ece6d
gradle files
Alberto195 May 2, 2021
d01b115
Merge branch 'master' of https://github.com/Alberto195/KLAD
Alberto195 May 2, 2021
6810817
Delete settings.gradle
Alberto195 May 2, 2021
2e799c9
Delete gradlew.bat
Alberto195 May 2, 2021
890dde3
Delete gradlew
Alberto195 May 2, 2021
8aaf6f2
Delete gradle.properties
Alberto195 May 2, 2021
e46bcc8
Delete build.gradle
Alberto195 May 2, 2021
4eb153d
Delete .gitignore
Alberto195 May 2, 2021
048e172
Delete gradle/wrapper directory
Alberto195 May 2, 2021
f6b88ba
Delete app directory
Alberto195 May 2, 2021
0c1f66a
new gradle files
Alberto195 May 2, 2021
9d7d3d2
new gradle files
Alberto195 May 2, 2021
cd530d5
add gardles
Alberto195 May 2, 2021
6de0046
demo thats working
Alberto195 May 2, 2021
afc2d0e
it doesnt work
Alberto195 May 2, 2021
e977cd8
game
Alberto195 May 4, 2021
d4d37e5
доабвил бд, sharedPref, и список турниров по жанрам
May 4, 2021
70764da
test for dima
Alberto195 May 4, 2021
70c00ff
Merge remote-tracking branch 'origin/test' into Database
May 6, 2021
49e97e3
merged with Dima. Without Albert's Retrofit
May 6, 2021
671f66b
demo vers
Alberto195 May 6, 2021
01e2f87
activity_main.xml
GypsyJR777 May 7, 2021
2fc1244
Movie details fragment
GypsyJR777 May 8, 2021
b628c01
Control panel
GypsyJR777 May 8, 2021
78aabfc
Notifications
GypsyJR777 May 8, 2021
391808f
Settings
GypsyJR777 May 8, 2021
ceffac7
tournament done
May 9, 2021
3f2f249
tournament with numberfragment
May 9, 2021
4d4cb97
merged 10.05.2021
May 9, 2021
9470c6b
after merge Tournament with info
May 9, 2021
71ea8c4
bug fixed 1
May 10, 2021
d7c3cda
bug fixed 2
May 10, 2021
d3ea97c
commit
May 10, 2021
891cb57
bug fixed
May 10, 2021
9107482
bug fixed 1
May 10, 2021
151c303
bug fixed 3
May 11, 2021
76b68fa
some fix
May 11, 2021
19c7e45
before recycler change
May 11, 2021
271f0a4
last commit
May 11, 2021
20cc0fc
last commit
May 11, 2021
1743486
new xnl
Alberto195 May 11, 2021
6fa07ff
last last
May 11, 2021
a8b48d5
only 16 films but work
May 12, 2021
63c4ff1
crappy version but work
Alberto195 May 12, 2021
5dd2373
Merge remote-tracking branch 'origin/test' into test
Alberto195 May 12, 2021
9e3b6f6
nbia
Alberto195 May 12, 2021
d6fd491
some fix
May 12, 2021
41ad29c
some fix 1
May 12, 2021
5023a6e
push push
May 12, 2021
2c8dcc1
smth
Alberto195 May 12, 2021
31072fb
new
Alberto195 May 12, 2021
888c1f7
Добавлены TODO по код ревью
May 14, 2021
c517943
Исправлен gitignore
May 14, 2021
5c84a15
idk
Alberto195 May 14, 2021
4da568c
di new hl
Alberto195 May 14, 2021
d507698
firebase
Alberto195 May 15, 2021
d57debf
WorkManager and notification
GypsyJR777 May 15, 2021
9622a5d
eh
Alberto195 May 15, 2021
a83212d
Merge remote-tracking branch 'origin/test' into test
Alberto195 May 15, 2021
6b912a9
немного исправил xml и названия моих фрагментов
May 15, 2021
745c327
Merge remote-tracking branch 'origin/test' into test
Alberto195 May 15, 2021
c91dd5a
higherlower small fix
Alberto195 May 15, 2021
e839ecf
Fix fragment of film's information
GypsyJR777 May 16, 2021
c460ae7
sum minor updates
Alberto195 May 16, 2021
1a5b09f
Merge remote-tracking branch 'origin/test' into test
Alberto195 May 16, 2021
bbeedbd
1
GypsyJR777 May 17, 2021
09fb975
Added TODO and edited gitignore
May 17, 2021
2542044
cleaning git
May 17, 2021
744cecf
Sign in + fix notification
GypsyJR777 May 17, 2021
5e7789e
исправил Navigation и подгрузку жанров в БД
May 18, 2021
ab7e47b
error
Alberto195 May 18, 2021
b42a23f
починил список жанров
May 18, 2021
c94cf46
still error
Alberto195 May 18, 2021
4e87cd6
Merge remote-tracking branch 'origin/test' into test
Alberto195 May 18, 2021
68856f8
blyaaaaaa
Alberto195 May 18, 2021
919e953
Settings with quit
GypsyJR777 May 18, 2021
066bf13
Some strings
GypsyJR777 May 20, 2021
ce3acbe
Closing and opening drawer layout in Activity,
GypsyJR777 May 20, 2021
0275c08
roomtracking error
Alberto195 May 21, 2021
9048036
Merge remote-tracking branch 'origin/test' into test
Alberto195 May 21, 2021
ea5d433
updated koin, GTAdapter
Alberto195 May 21, 2021
df3c377
minor updates
Alberto195 May 21, 2021
b1075d6
sign In update
Alberto195 May 21, 2021
1c48ae7
horrible but workin sign in
Alberto195 May 22, 2021
4942abb
made settings as profile
Alberto195 May 22, 2021
cb08260
New table, inactive favourite fragment, logs in sign in
GypsyJR777 May 22, 2021
cd49126
nonsetfrag
Alberto195 May 23, 2021
fad3bc3
Merge remote-tracking branch 'origin/test' into test
Alberto195 May 23, 2021
2cfde92
что-то
May 18, 2021
49205da
favourite movies fix and clear fav movies feat
Alberto195 May 23, 2021
a4b5026
перенес логику получения списка фильмов во фрагмент турнира.
May 23, 2021
e21a45e
Merge remote-tracking branch 'origin/test' into test
May 23, 2021
fd51a7a
тестовый пуш
May 23, 2021
c17f1a8
добавил немного иконок
May 23, 2021
2bc84f7
shit but work with TournamentVM
May 24, 2021
a3f6bc2
перенес логику из фрагмента турнира во viewmodel. Пока нет возможност…
May 24, 2021
7789981
Favourite fragment with navigation
GypsyJR777 May 25, 2021
bdf1923
Settings fix
GypsyJR777 May 25, 2021
25f3ca6
fix sign in and choose fav frag
Alberto195 May 25, 2021
edd8519
nice
Alberto195 May 25, 2021
57e738b
bad db
GypsyJR777 May 25, 2021
0ec6f45
add to fav buttons working
Alberto195 May 26, 2021
d41c6a4
Merge remote-tracking branch 'origin/test' into test
Alberto195 May 26, 2021
825ee0e
lil fix
Alberto195 May 26, 2021
bb9aac8
Рабочий Турнир по жанрам и категориям
May 27, 2021
a4b5153
Изменил дизайн Tmp Fragment
May 27, 2021
adf2da1
Исправил баг в Navigation
May 27, 2021
2e34037
Merge remote-tracking branch 'origin/test' into test
May 27, 2021
d9a0364
сделал constraint в турнире
May 27, 2021
4a1c232
hz
Alberto195 May 27, 2021
8ab9ba2
Adding favourite movie to the db
GypsyJR777 May 27, 2021
a2d9a72
Merge remote-tracking branch 'origin/test' into test
GypsyJR777 May 28, 2021
0e0753d
favourite movies are done
GypsyJR777 May 28, 2021
0a82bf9
profile
Alberto195 May 28, 2021
a1df389
Merge remote-tracking branch 'origin/test' into test
Alberto195 May 28, 2021
fb68f33
profile
Alberto195 May 28, 2021
5d71755
замерджил
May 27, 2021
6ea65ea
favourite -> choose
GypsyJR777 May 28, 2021
0376205
fix some bugs
May 29, 2021
7ee657e
Merge remote-tracking branch 'origin/test' into test
May 29, 2021
cc4f379
Night mode off
GypsyJR777 May 29, 2021
dc4fc44
Fix bug in favourite
GypsyJR777 May 29, 2021
ea390e8
FlexBox in favourite
GypsyJR777 May 29, 2021
c6d3e9f
Исправил грамматические проблемы в турнире
May 29, 2021
03cb8c9
Merge remote-tracking branch 'origin/test' into test
May 29, 2021
222a357
profile sign in and top/favourite fix
Alberto195 May 29, 2021
fb09a5b
Merge remote-tracking branch 'origin/test' into test
Alberto195 May 29, 2021
39e826d
lil fixies
Alberto195 May 29, 2021
9f1a26c
изменил диалог
May 29, 2021
4a17927
Nice details
GypsyJR777 May 29, 2021
b0404a9
Merge remote-tracking branch 'origin/test' into test
May 29, 2021
318e123
Merge remote-tracking branch 'origin/test' into test
May 29, 2021
9adc58c
исправил диалог!
May 29, 2021
03faea8
Minus dagger and RxJava2 + fix bug in movie details
GypsyJR777 May 31, 2021
4fec4c2
animation bookmark
Alberto195 May 31, 2021
8ac4287
wtf
Alberto195 May 31, 2021
58abcfa
Добавил синхронизацию с БД Firebase. Если пользователь авторизован, т…
May 31, 2021
65f8dbb
Merge remote-tracking branch 'origin/test' into test
May 31, 2021
8d0237c
better sign in
Alberto195 May 31, 2021
8e4c8a2
Merge remote-tracking branch 'origin/test' into test
Alberto195 May 31, 2021
ecdf44d
Небольшой редизайн
Jun 1, 2021
f8e8fde
Ещё немного правок
Jun 1, 2021
7f58d59
smth
Alberto195 Jun 1, 2021
54c1884
Merge remote-tracking branch 'origin/test' into test
Alberto195 Jun 1, 2021
5c0299f
Ещё немного правок
Jun 1, 2021
41210db
avatar activity round
Alberto195 Jun 1, 2021
9d5a213
Ещё немного правок
Jun 1, 2021
d8205f7
guest name stopped disappearing
Alberto195 Jun 1, 2021
65d107d
best sign in
Alberto195 Jun 1, 2021
5572def
Merge remote-tracking branch 'origin/test' into test
Jun 1, 2021
f887574
lil fix
Alberto195 Jun 1, 2021
a05242e
Merge remote-tracking branch 'origin/test' into test
Alberto195 Jun 1, 2021
9e661f2
descrp button and dialog fix
Alberto195 Jun 1, 2021
94441e1
Поправил Категории. Можно выбрать 256 фильмов. Изменил иконку информа…
Jun 2, 2021
1a23237
MovieDetails with loading + dialog's strings in strings.xml
GypsyJR777 Jun 2, 2021
2577687
Merge remote-tracking branch 'origin/test' into test
GypsyJR777 Jun 2, 2021
4d4d820
Заменил картинку при авторизации на легковесную
Jun 2, 2021
55aa9bc
Предупреждение на ХХХ категорию
Jun 2, 2021
534bcf3
Убрал баг с клавиатурой при переходе из поиска в детали фильма
Jun 2, 2021
3a3e74e
pusto
Alberto195 Jun 2, 2021
48ef010
pusto
Alberto195 Jun 2, 2021
d54ce53
пофиксил баг с Firebase
Jun 2, 2021
57308a3
linkt and detekt fix
Alberto195 Jun 7, 2021
5d97cac
Merge remote-tracking branch 'origin/test' into test
Alberto195 Jun 7, 2021
d0b353d
posters to profile and search
Alberto195 Jun 7, 2021
5de5ac5
изменил Tmp
Jun 7, 2021
b4fc37e
Fix drawer menu
GypsyJR777 Jun 7, 2021
4eac02a
Periodic notification
GypsyJR777 Jun 7, 2021
196f9d6
ktlint ok
GypsyJR777 Jun 8, 2021
28f928e
detekt fixes
Alberto195 Jun 8, 2021
dce2113
xml hl colour fix
Alberto195 Jun 8, 2021
ee4a42d
zapuskaetsa
Alberto195 Jun 8, 2021
c61c273
A bit more todo
Jun 8, 2021
8249559
FavouriteAdapter
GypsyJR777 Jun 8, 2021
b81c54e
db bookamrks
Alberto195 Jun 8, 2021
37f97c1
Merge remote-tracking branch 'origin/test' into test
Alberto195 Jun 8, 2021
1949cc4
Right check favourite
GypsyJR777 Jun 9, 2021
af51f6a
Fix some bugs
GypsyJR777 Jun 9, 2021
ae9ff56
Fix favourite fragment
GypsyJR777 Jun 9, 2021
157a0ef
ktlint ok
GypsyJR777 Jun 9, 2021
0aa8fb2
interfaces and tournament let
Alberto195 Jun 9, 2021
0ea51e6
Fix notifications timing
GypsyJR777 Jun 9, 2021
113e38b
Merge remote-tracking branch 'origin/test' into test
Alberto195 Jun 9, 2021
ba059ba
DI apppref
Alberto195 Jun 9, 2021
ae23d05
Merge remote-tracking branch 'origin/test' into test
Alberto195 Jun 9, 2021
23fad03
bookmark fixes
Alberto195 Jun 9, 2021
9b72f4d
совсем немного поменял
Jun 9, 2021
1218ae1
Merge remote-tracking branch 'origin/test' into test
Jun 9, 2021
391f3cb
совсем немного поменял
Jun 9, 2021
1d26d17
fixes
Alberto195 Jun 9, 2021
f9fc90f
Merge remote-tracking branch 'origin/test' into test
Alberto195 Jun 9, 2021
d70155c
fixes
Alberto195 Jun 9, 2021
961627e
Merge remote-tracking branch 'origin/test'
Alberto195 Jun 9, 2021
8bb8258
no build
Alberto195 Jun 9, 2021
5c68bbc
Movie trailer
GypsyJR777 Jun 13, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
!.idea/codeStyles
.DS_Store
/build
/app/build/
/captures
.externalNativeBuild
.cxx

3 changes: 3 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
5 changes: 5 additions & 0 deletions app/.idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions app/.idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions app/CI.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Continius Integration

Это CI для студентческих проектов Технопарка.

## Запуск локально

Для запуска проверки стиля кода необходимо запустить три скрипта:
1. Запустить `./detekt` или `.\detekt.bat`
2. Запустить `./ktlint` или `.\ktlint.bat`
3. Запустить `./checkstyle` или `.\checkstyle.bat`


## Исправление ошибок

В некоторых утилитах есть автоматическое исправление ошибок.
Например, большинство ошибок можно поправить автоформаттером ktlint:

```
./ktlint -F
```
11 changes: 11 additions & 0 deletions app/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Movie App

Приложение для выбора лучшего фильма. Предлагается какое-то кол-во фильмов из одного жанра и пользователь выбирает лучшее посредством турнира.

## Команда авторов

- [Иван Абрамов](https://github.com/Alberto195)
- [Дмитрий Костык](https://github.com/kodzzzima)
- [Иван Цыганов](https://github.com/fatalem0)
- [Иван Демидов](https://github.com/GypsyJR777)

171 changes: 171 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'kotlin-kapt'
id 'androidx.navigation.safeargs'
id 'com.google.gms.google-services'
}
apply plugin: 'kotlin-kapt'
apply plugin: 'kotlin-parcelize'

android {
compileSdkVersion 30
buildToolsVersion "30.0.3"

defaultConfig {
applicationId "com.example.finema"
minSdkVersion 21
targetSdkVersion 30
versionCode 1
versionName "1.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

buildFeatures {
viewBinding true
dataBinding true
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = '1.8'
}
}

ext {
dagger_version = '2.30.1'
appcompat_version = '1.2.0'
lifecycle_version = '2.3.1'
activity_version = '1.3.0-alpha07'
fragment_version = '1.3.3'
nav_version = '2.3.5'
koin_version= "3.0.1"
pagingVersion = "3.0.0"
}

dependencies {

implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'androidx.core:core-ktx:1.3.2'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.material:material:1.3.0'
implementation 'com.google.firebase:firebase-auth:20.0.4'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.android.gms:play-services-ads:20.1.0'
implementation 'com.google.android.gms:play-services-maps:17.0.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'com.google.firebase:firebase-database:20.0.0'
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'

//firebase
implementation 'com.google.firebase:firebase-auth-ktx'
implementation 'com.google.firebase:firebase-firestore-ktx'
implementation 'com.google.firebase:firebase-analytics-ktx'
implementation platform('com.google.firebase:firebase-bom:27.1.0')

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'

//Dagger 2
api "com.google.dagger:dagger:$dagger_version"
kapt "com.google.dagger:dagger-compiler:$dagger_version"
api "com.google.dagger:dagger-android-support:$dagger_version" // if you use the support libraries
kapt "com.google.dagger:dagger-android-processor:$dagger_version"

//Rxjava2
implementation "io.reactivex.rxjava2:rxjava:2.2.10"
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'

//Retrofit + OkHttp3
implementation "com.squareup.okhttp3:okhttp:4.7.2"
implementation "com.squareup.okhttp3:logging-interceptor:4.6.0"
implementation "com.squareup.retrofit2:retrofit:2.9.0"
implementation "com.squareup.retrofit2:converter-gson:2.9.0"
implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
implementation "com.squareup.retrofit2:adapter-rxjava2:2.5.0"

//appcompat
implementation "androidx.appcompat:appcompat:$appcompat_version"
implementation "androidx.appcompat:appcompat-resources:$appcompat_version"

//lifecycle
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
// LiveData
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
// Lifecycles only (without ViewModel or LiveData)
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"

//Activity
implementation "androidx.activity:activity-ktx:$activity_version"
//Fragment
implementation "androidx.fragment:fragment-ktx:$fragment_version"

//navigation
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
implementation "androidx.navigation:navigation-ui-ktx:$nav_version"

implementation 'com.google.gms:google-services:4.3.5'

//retrofit
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'

//signIN
implementation 'com.google.android.gms:play-services-drive:17.0.0'
implementation 'com.google.android.gms:play-services-auth:19.0.0'

//viewmodel
implementation "android.arch.lifecycle:extensions:1.1.1"

//glide
implementation 'com.github.bumptech.glide:glide:4.12.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'

//roomDatabase
implementation 'androidx.room:room-ktx:2.3.0'
kapt "androidx.room:room-compiler:2.3.0"

implementation 'com.google.android.material:material:1.3.0'

implementation 'androidx.preference:preference-ktx:1.1.1'

// Koin main features for Android (Scope,ViewModel ...)
implementation "io.insert-koin:koin-android:$koin_version"
// Koin Android - experimental builder extensions
implementation "io.insert-koin:koin-android-ext:$koin_version"
// Koin for Jetpack WorkManager
implementation "io.insert-koin:koin-androidx-workmanager:$koin_version"
// Koin for Jetpack Compose (unstable version)
implementation "io.insert-koin:koin-androidx-compose:$koin_version"
// Koin for Kotlin Multiplatform
implementation "io.insert-koin:koin-core:$koin_version"
// Koin Test for Kotlin Multiplatform
testImplementation "io.insert-koin:koin-test:$koin_version"
// Koin for JUnit 4
testImplementation "io.insert-koin:koin-test-junit4:$koin_version"
// Koin for JUnit 5
testImplementation "io.insert-koin:koin-test-junit5:$koin_version"
// Koin Extended & experimental features (JVM)
implementation "io.insert-koin:koin-core-ext:$koin_version"

implementation "androidx.paging:paging-runtime-ktx:$pagingVersion"

// WorkManager
implementation "android.arch.work:work-runtime:1.0.1"

//FlexBox
implementation 'com.google.android.flexbox:flexbox:3.0.0'
}
Loading