Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .idea/AndroidProjectSystem.xml

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

4 changes: 2 additions & 2 deletions .idea/assetWizardSettings.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/dbnavigator.xml

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

6 changes: 3 additions & 3 deletions .idea/deploymentTargetSelector.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/fhd1080apk.iml

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

7 changes: 3 additions & 4 deletions .idea/gradle.xml

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

3 changes: 3 additions & 0 deletions .idea/inspectionProfiles/Project_Default.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/other.xml

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

1 change: 0 additions & 1 deletion .idea/vcs.xml

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

50 changes: 1 addition & 49 deletions FEATURES.md
Original file line number Diff line number Diff line change
@@ -1,49 +1 @@
# Knopka.kz Android App Features

## Базовая структура (текущая дата):
- Создана базовая структура проекта
- Настроена навигация (BottomNavigation)
- Настроена тема приложения с Material 3
- Созданы базовые экраны приложения

## Планируемые фичи:

### Навигация:
- [x] BottomNavigation с разделами:
- [x] Главная (home.png)
- [x] Добавить (addchart.png)
- [x] Сообщения (message.png)
- [x] Кабинет (kabinet.png)

### Основной функционал:
- [ ] Главная страница с товарами
- [ ] Добавление объявлений
- [ ] Система сообщений
- [ ] Личный кабинет
- [ ] Избранное

### UI компоненты:
- [ ] ProductCard - карточка товара
- [ ] SearchBar - поиск товаров
- [ ] MessageItem - элемент чата
- [ ] CategorySelector - выбор категории

### Дополнительно:
- [ ] Кэширование данных
- [ ] Push-уведомления о сообщениях
- [ ] Фильтры поиска
- [ ] Загрузка изображений
- [ ] Авторизация/Регистрация

# Журнал изменений

## 🎨 Улучшение интерфейса
- Добавлена анимация загрузки для WebView
- Реализовано кеширование веб-страниц для быстрой навигации

## 🛠 Функциональность

## 🔧 Оптимизация
- Оптимизирована работа WebView через remember для предотвращения пересоздания

## 🔧 Исправление багов
123
Binary file added Screenshots/Screenshot_20250208_165320.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Screenshots/Screenshot_20250208_165342.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Screenshots/Screenshot_20250208_165358.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Screenshots/output.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
74 changes: 47 additions & 27 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {

alias(libs.plugins.hilt)
alias(libs.plugins.google.services)
alias(libs.plugins.firebase.crashlytics)
//alias(libs.plugins.firebase.crashlytics)

id("com.google.devtools.ksp")
}
Expand Down Expand Up @@ -35,7 +35,7 @@ android {
val version = generateVersion()

defaultConfig {
applicationId = "com.knopka.kz"
applicationId = "com.filmhd1080.app"
minSdk = 21
targetSdk = 35

Expand All @@ -52,17 +52,17 @@ android {

signingConfigs {
create("config") {
keyAlias = "knopka"
keyPassword = "knopka"
storeFile = file("keystore/brand57.jks")
storePassword = "brand57"
keyAlias = "release"
keyPassword = "release"
storeFile = file("keystore/keystore.fhd1080apk.jks")
storePassword = "release"
}
}

buildTypes {

getByName("debug"){
applicationIdSuffix = ".debug"
getByName("debug") {
//applicationIdSuffix = ".debug"
signingConfig = signingConfigs.getByName("config")
}

Expand All @@ -85,6 +85,7 @@ android {
}
buildFeatures {
compose = true
buildConfig = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.1"
Expand All @@ -97,30 +98,38 @@ android {
}

dependencies {
implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
implementation("androidx.activity:activity-compose:1.8.2")
implementation(platform("androidx.compose:compose-bom:2024.02.00"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.ui:ui-tooling-preview")
implementation(libs.androidx.material3)



implementation(libs.androidx.appcompat)



implementation(libs.androidx.ui)
implementation(libs.androidx.ui.graphics)
implementation(libs.androidx.ui.tooling.preview)
implementation(libs.androidx.lifecycle.viewmodel.compose)
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1")
implementation(libs.androidx.activity.compose)
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.lifecycle.runtime.ktx)
implementation(libs.androidx.material.icons.extended)
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
implementation(libs.androidx.material3)
implementation(platform("androidx.compose:compose-bom:2025.01.01"))

implementation(project(":wvcore"))
implementation(project(":wvrss"))

// SwipeRefreshLayout
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
implementation(libs.firebase.crashlytics)
implementation(project(":features:webview"))
implementation(libs.androidx.swiperefreshlayout)

//implementation(project(":features:webview"))
implementation(libs.transport.api)

testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
androidTestImplementation(platform("androidx.compose:compose-bom:2024.02.00"))
androidTestImplementation("androidx.test.ext:junit:1.2.1")
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
androidTestImplementation(platform("androidx.compose:compose-bom:2025.01.01"))
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest")
Expand All @@ -134,11 +143,22 @@ dependencies {
ksp(libs.hilt.compiler)

implementation(libs.coil.compose)
implementation("io.coil-kt.coil3:coil-network-ktor2:3.0.4")
implementation("io.coil-kt.coil3:coil-network-ktor3:3.0.4")
implementation(libs.coil.network.ktor2)
implementation(libs.coil.network.ktor3)

implementation(libs.firebase.messaging)
//implementation(libs.onesignal)
implementation(libs.onesignal)

implementation("com.google.firebase:firebase-crashlytics:19.4.0")

// implementation(libs.google.firebase.crashlytics)
// implementation(libs.firebase.crashlytics)

//implementation("io.appmetrica.analytics:analytics:7.2.0")
implementation("io.appmetrica.analytics:analytics:7.7.0")
implementation("io.appmetrica.analytics:push:4.0.0")

implementation(libs.okhttp)
implementation(libs.accompanist.webview)
implementation(libs.google.firebase.crashlytics)
}
Loading