From 7a5d6bbaf88ac9a72e8a5fdfa4ba7b35f0665576 Mon Sep 17 00:00:00 2001 From: Lain Iwakura Date: Sat, 9 Aug 2025 17:38:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B2=D0=B0=D1=8F=20=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D1=81=D0=B8=D1=8F=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=B0=D1=8F=20=D0=A1=D0=9E=D0=91=D0=98=D0=A0=D0=90=D0=95=D0=A2?= =?UTF-8?q?=D0=A1=D0=AF=20=D0=B1=D1=80=D0=B0=D1=82=D1=8C=D1=8F!!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 15 + .idea/.gitignore | 3 + .idea/misc.xml | 607 ++++++++++++++++++ .idea/vcs.xml | 4 + app/.gitignore | 1 + app/build.gradle.kts | 74 +++ app/proguard-rules.pro | 21 + .../mobilemkch/ExampleInstrumentedTest.kt | 24 + app/src/main/AndroidManifest.xml | 39 ++ .../com/mkfunproj/mobilemkch/MainActivity.kt | 37 ++ .../mkfunproj/mobilemkch/data/ApiClient.kt | 199 ++++++ .../com/mkfunproj/mobilemkch/data/Cache.kt | 52 ++ .../com/mkfunproj/mobilemkch/data/Cookies.kt | 27 + .../mobilemkch/data/FavoritesStore.kt | 43 ++ .../com/mkfunproj/mobilemkch/data/Models.kt | 50 ++ .../mobilemkch/data/NetworkMonitor.kt | 29 + .../mkfunproj/mobilemkch/data/Repository.kt | 61 ++ .../mobilemkch/data/SettingsStore.kt | 87 +++ .../mobilemkch/data/SubscriptionsStore.kt | 44 ++ .../com/mkfunproj/mobilemkch/ui/AppRoot.kt | 118 ++++ .../mobilemkch/ui/screens/AddCommentScreen.kt | 97 +++ .../mobilemkch/ui/screens/BoardsScreen.kt | 116 ++++ .../ui/screens/CreateThreadScreen.kt | 102 +++ .../mobilemkch/ui/screens/FavoritesScreen.kt | 67 ++ .../mobilemkch/ui/screens/SettingsScreen.kt | 149 +++++ .../ui/screens/ThreadDetailScreen.kt | 130 ++++ .../mobilemkch/ui/screens/ThreadsScreen.kt | 199 ++++++ .../mkfunproj/mobilemkch/ui/theme/Shape.kt | 7 + .../mkfunproj/mobilemkch/ui/theme/Theme.kt | 31 + .../com/mkfunproj/mobilemkch/ui/theme/Type.kt | 5 + .../mkfunproj/mobilemkch/util/ImageUtil.kt | 39 ++ .../mobilemkch/util/NotificationHelper.kt | 45 ++ .../mobilemkch/workers/ThreadsCheckWorker.kt | 32 + .../res/drawable/ic_launcher_background.xml | 170 +++++ .../res/drawable/ic_launcher_foreground.xml | 30 + app/src/main/res/drawable/ic_notification.xml | 10 + .../main/res/mipmap-anydpi/ic_launcher.xml | 6 + .../res/mipmap-anydpi/ic_launcher_round.xml | 6 + app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes app/src/main/res/values-night/themes.xml | 4 + app/src/main/res/values/colors.xml | 10 + app/src/main/res/values/strings.xml | 4 + app/src/main/res/values/themes.xml | 4 + app/src/main/res/xml/backup_rules.xml | 13 + .../main/res/xml/data_extraction_rules.xml | 19 + .../mkfunproj/mobilemkch/ExampleUnitTest.kt | 17 + build.gradle.kts | 5 + gradle.properties | 23 + gradle/libs.versions.toml | 57 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 185 ++++++ gradlew.bat | 89 +++ settings.gradle.kts | 23 + 63 files changed, 3235 insertions(+) create mode 100644 .gitignore create mode 100644 .idea/.gitignore create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml create mode 100644 app/.gitignore create mode 100644 app/build.gradle.kts create mode 100644 app/proguard-rules.pro create mode 100644 app/src/androidTest/java/com/mkfunproj/mobilemkch/ExampleInstrumentedTest.kt create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/MainActivity.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/data/ApiClient.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/data/Cache.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/data/Cookies.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/data/FavoritesStore.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/data/Models.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/data/NetworkMonitor.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/data/Repository.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/data/SettingsStore.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/data/SubscriptionsStore.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/ui/AppRoot.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/AddCommentScreen.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/BoardsScreen.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/CreateThreadScreen.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/FavoritesScreen.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/SettingsScreen.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/ThreadDetailScreen.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/ThreadsScreen.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/ui/theme/Shape.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/ui/theme/Theme.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/ui/theme/Type.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/util/ImageUtil.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/util/NotificationHelper.kt create mode 100644 app/src/main/java/com/mkfunproj/mobilemkch/workers/ThreadsCheckWorker.kt create mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/ic_notification.xml create mode 100644 app/src/main/res/mipmap-anydpi/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-anydpi/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/values-night/themes.xml create mode 100644 app/src/main/res/values/colors.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/themes.xml create mode 100644 app/src/main/res/xml/backup_rules.xml create mode 100644 app/src/main/res/xml/data_extraction_rules.xml create mode 100644 app/src/test/java/com/mkfunproj/mobilemkch/ExampleUnitTest.kt create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..9e9ba09 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,607 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..d843f34 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..62b4a1f --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,74 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.serialization) + alias(libs.plugins.kotlin.compose) +} + +android { + namespace = "com.mkfunproj.mobilemkch" + compileSdk = 35 + + defaultConfig { + applicationId = "com.mkfunproj.mobilemkch" + minSdk = 31 + targetSdk = 35 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlinOptions { + jvmTarget = "17" + } + + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.6.11" + } +} + +dependencies { + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.appcompat) + implementation(libs.material) + implementation(platform(libs.compose.bom)) + implementation(libs.compose.ui) + implementation(libs.compose.ui.tooling.preview) + implementation(libs.compose.material3) + implementation(libs.compose.foundation) + implementation(libs.compose.material) + implementation(libs.compose.material.icons.extended) + implementation(libs.activity.compose) + implementation(libs.navigation.compose) + implementation(libs.lifecycle.runtime.ktx) + implementation(libs.lifecycle.viewmodel.ktx) + implementation(libs.lifecycle.viewmodel.compose) + implementation(libs.retrofit) + implementation(libs.retrofit.converter.scalars) + implementation(libs.okhttp) + implementation(libs.okhttp.logging) + implementation(libs.serialization.json) + implementation(libs.coil.compose) + implementation(libs.datastore.preferences) + implementation(libs.work.runtime.ktx) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/androidTest/java/com/mkfunproj/mobilemkch/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/mkfunproj/mobilemkch/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..6613480 --- /dev/null +++ b/app/src/androidTest/java/com/mkfunproj/mobilemkch/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.mkfunproj.mobilemkch + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.mkfunproj.mobilemkch", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..05b9f7b --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/MainActivity.kt b/app/src/main/java/com/mkfunproj/mobilemkch/MainActivity.kt new file mode 100644 index 0000000..5df7966 --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/MainActivity.kt @@ -0,0 +1,37 @@ +package com.mkfunproj.mobilemkch + +import android.os.Bundle +import androidx.work.ExistingPeriodicWorkPolicy +import androidx.work.PeriodicWorkRequestBuilder +import androidx.work.WorkManager +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.runtime.getValue +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.ui.Modifier +import com.mkfunproj.mobilemkch.ui.AppRoot +import com.mkfunproj.mobilemkch.ui.theme.MobileMkchTheme +import com.mkfunproj.mobilemkch.workers.ThreadsCheckWorker +import java.util.concurrent.TimeUnit + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + val request = PeriodicWorkRequestBuilder(15, TimeUnit.MINUTES).build() + WorkManager.getInstance(this).enqueueUniquePeriodicWork("mkch_threads_check", ExistingPeriodicWorkPolicy.UPDATE, request) + setContent { + val settingsStore = com.mkfunproj.mobilemkch.data.SettingsStore(this) + val settings by settingsStore.data.collectAsState(initial = com.mkfunproj.mobilemkch.data.SettingsData()) + MobileMkchTheme(darkTheme = settings.theme == "dark" || settings.theme == "oled", oled = settings.theme == "oled") { + Surface(color = MaterialTheme.colorScheme.background) { + AppRoot() + } + } + } + } +} + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/data/ApiClient.kt b/app/src/main/java/com/mkfunproj/mobilemkch/data/ApiClient.kt new file mode 100644 index 0000000..fc62c00 --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/data/ApiClient.kt @@ -0,0 +1,199 @@ +package com.mkfunproj.mobilemkch.data + +import android.content.Context +import kotlinx.serialization.json.Json +import kotlinx.serialization.encodeToString +import okhttp3.Interceptor +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.MultipartBody +import okhttp3.OkHttpClient +import okhttp3.Request +import okhttp3.RequestBody +import okhttp3.RequestBody.Companion.asRequestBody +import okhttp3.RequestBody.Companion.toRequestBody +import okhttp3.logging.HttpLoggingInterceptor +import retrofit2.Retrofit +import retrofit2.converter.scalars.ScalarsConverterFactory +import java.io.File +import java.util.concurrent.TimeUnit + +class ApiClient(context: Context) { + private val baseUrl = "https://mkch.pooziqo.xyz" + private val apiUrl = "$baseUrl/api/" + private val userAgent = "MobileMkch/1.0-android-alpha" + + private val json = Json { ignoreUnknownKeys = true } + private val prefs = context.getSharedPreferences("api_prefs", Context.MODE_PRIVATE) + + private val userAgentInterceptor = Interceptor { chain -> + val request = chain.request().newBuilder() + .header("Accept", "application/json") + .header("Accept-Language", java.util.Locale.getDefault().toLanguageTag()) + .header("User-Agent", userAgent) + .build() + chain.proceed(request) + } + + private val httpClient: OkHttpClient = OkHttpClient.Builder() + .addInterceptor(userAgentInterceptor) + .addInterceptor(HttpLoggingInterceptor().apply { level = HttpLoggingInterceptor.Level.BASIC }) + .cookieJar(PersistentCookieJar(context)) + .connectTimeout(20, TimeUnit.SECONDS) + .readTimeout(40, TimeUnit.SECONDS) + .build() + + private val retrofit: Retrofit = Retrofit.Builder() + .baseUrl(apiUrl) + .addConverterFactory(ScalarsConverterFactory.create()) + .client(httpClient) + .build() + + private fun parseBoards(body: String): List = json.decodeFromString(body) + private fun parseThreads(body: String): List = json.decodeFromString(body) + private fun parseThreadDetail(body: String): ThreadDetail = json.decodeFromString(body) + private fun parseComments(body: String): List = json.decodeFromString(body) + + private fun get(url: String): String { + val req = Request.Builder().url(url).get().build() + httpClient.newCall(req).execute().use { resp -> + if (!resp.isSuccessful) throw RuntimeException("HTTP ${'$'}{resp.code}") + return resp.body?.string() ?: throw RuntimeException("empty body") + } + } + + fun getBoards(): List = parseBoards(get("${apiUrl}boards/")) + + fun getThreads(boardCode: String): List = parseThreads(get("${apiUrl}board/$boardCode")) + + fun getThreadDetail(boardCode: String, threadId: Int): ThreadDetail = + parseThreadDetail(get("${apiUrl}board/$boardCode/thread/$threadId")) + + fun getComments(boardCode: String, threadId: Int): List = + parseComments(get("${apiUrl}board/$boardCode/thread/$threadId/comments")) + + fun getFullThread(boardCode: String, threadId: Int): Pair> { + val detail = getThreadDetail(boardCode, threadId) + val comments = getComments(boardCode, threadId) + return detail to comments + } + + fun authenticate(authKey: String) { + if (authKey.isEmpty()) return + val url = "$baseUrl/key/auth/" + val formHtml = get(url) + val csrf = extractCsrf(formHtml) + val body = "csrfmiddlewaretoken=${'$'}csrf&key=${'$'}authKey" + .toRequestBody("application/x-www-form-urlencoded".toMediaType()) + val req = Request.Builder().url(url) + .post(body) + .header("Referer", url) + .build() + httpClient.newCall(req).execute().use { resp -> + if (!(resp.code == 200 || resp.code == 302)) throw RuntimeException("auth failed ${'$'}{resp.code}") + } + } + + fun loginWithPasscode(passcode: String) { + if (passcode.isEmpty()) return + val url = "$baseUrl/passcode/enter/" + val formHtml = get(url) + val csrf = extractCsrf(formHtml) + val body = "csrfmiddlewaretoken=${'$'}csrf&passcode=${'$'}passcode" + .toRequestBody("application/x-www-form-urlencoded".toMediaType()) + val req = Request.Builder().url(url) + .post(body) + .header("Referer", url) + .build() + httpClient.newCall(req).execute().use { resp -> + if (!(resp.code == 200 || resp.code == 302)) throw RuntimeException("passcode failed ${'$'}{resp.code}") + } + } + + fun createThread(boardCode: String, title: String, text: String, files: List = emptyList(), passcode: String = "", authKey: String = "") { + if (authKey.isNotEmpty()) authenticate(authKey) + if (passcode.isNotEmpty()) loginWithPasscode(passcode) + val formUrl = "$baseUrl/boards/board/$boardCode/new" + val csrf = fetchCsrf(formUrl) + val req = if (files.isEmpty()) { + val body = "csrfmiddlewaretoken=$csrf&title=$title&text=$text" + .toRequestBody("application/x-www-form-urlencoded".toMediaType()) + Request.Builder().url(formUrl).post(body) + } else { + val builder = MultipartBody.Builder().setType(MultipartBody.FORM) + .addFormDataPart("csrfmiddlewaretoken", csrf) + .addFormDataPart("title", title) + .addFormDataPart("text", text) + files.forEachIndexed { idx, file -> + val rb: RequestBody = file.asRequestBody("image/jpeg".toMediaType()) + builder.addFormDataPart("files", "photo_${idx + 1}.jpg", rb) + } + Request.Builder().url(formUrl).post(builder.build()) + } + .header("Referer", formUrl) + .build() + httpClient.newCall(req).execute().use { resp -> + if (!(resp.code == 200 || resp.code == 302)) throw RuntimeException("createThread failed ${resp.code}") + } + } + + fun addComment(boardCode: String, threadId: Int, text: String, files: List = emptyList(), passcode: String = "", authKey: String = "") { + if (authKey.isNotEmpty()) authenticate(authKey) + if (passcode.isNotEmpty()) loginWithPasscode(passcode) + val formUrl = "$baseUrl/boards/board/$boardCode/thread/$threadId/comment" + val csrf = fetchCsrf(formUrl) + val req = if (files.isEmpty()) { + val body = "csrfmiddlewaretoken=$csrf&text=$text" + .toRequestBody("application/x-www-form-urlencoded".toMediaType()) + Request.Builder().url(formUrl).post(body) + } else { + val builder = MultipartBody.Builder().setType(MultipartBody.FORM) + .addFormDataPart("csrfmiddlewaretoken", csrf) + .addFormDataPart("text", text) + files.forEachIndexed { idx, file -> + val rb: RequestBody = file.asRequestBody("image/jpeg".toMediaType()) + builder.addFormDataPart("files", "photo_${idx + 1}.jpg", rb) + } + Request.Builder().url(formUrl).post(builder.build()) + } + .header("Referer", formUrl) + .build() + httpClient.newCall(req).execute().use { resp -> + if (!(resp.code == 200 || resp.code == 302)) throw RuntimeException("addComment failed ${resp.code}") + } + } + + private fun fetchCsrf(url: String): String { + val req = Request.Builder().url(url).get().build() + httpClient.newCall(req).execute().use { resp -> + if (!resp.isSuccessful) throw RuntimeException("HTTP ${resp.code}") + val html = resp.body?.string().orEmpty() + val regex = Regex("name=['\"]csrfmiddlewaretoken['\"]\\s+value=['\"]([^'\"]+)['\"]") + val match = regex.find(html) ?: throw RuntimeException("csrf not found") + return match.groupValues[1] + } + } + + fun checkNewThreads(boardCode: String): List { + val current = getThreads(boardCode) + val key = "savedThreads_${'$'}boardCode" + val savedRaw = prefs.getString(key, null) + return if (savedRaw != null) { + val saved = runCatching { json.decodeFromString>(savedRaw) }.getOrElse { emptyList() } + val savedIds = saved.map { it.id }.toSet() + val newOnes = current.filter { it.id !in savedIds } + prefs.edit().putString(key, json.encodeToString(current)).apply() + newOnes + } else { + prefs.edit().putString(key, json.encodeToString(current)).apply() + emptyList() + } + } + + private fun extractCsrf(html: String): String { + val regex = Regex("name=['\"]csrfmiddlewaretoken['\"]\\s+value=['\"]([^'\"]+)['\"]") + val match = regex.find(html) ?: throw RuntimeException("csrf not found") + return match.groupValues[1] + } +} + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/data/Cache.kt b/app/src/main/java/com/mkfunproj/mobilemkch/data/Cache.kt new file mode 100644 index 0000000..7119a4a --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/data/Cache.kt @@ -0,0 +1,52 @@ +package com.mkfunproj.mobilemkch.data + +import android.content.Context +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import kotlinx.serialization.encodeToString +import kotlinx.serialization.json.Json +import java.io.File + +class Cache(private val context: Context) { + private val json = Json + private val dir: File by lazy { File(context.cacheDir, "mkch_cache").apply { mkdirs() } } + + suspend fun set(key: String, value: T, encoder: (T) -> String, ttlSeconds: Long) = withContext(Dispatchers.IO) { + val file = File(dir, safeName(key)) + val wrapper = CacheWrapper(System.currentTimeMillis(), ttlSeconds, encoder(value)) + file.writeText(json.encodeToString(wrapper)) + } + + suspend fun get(key: String, decoder: (String) -> T): T? = withContext(Dispatchers.IO) { + val file = File(dir, safeName(key)) + if (!file.exists()) return@withContext null + val wrapper = runCatching { json.decodeFromString(CacheWrapper.serializer(), file.readText()) }.getOrNull() + ?: return@withContext null + val ageSec = (System.currentTimeMillis() - wrapper.timestampMs) / 1000 + if (ageSec > wrapper.ttlSeconds) return@withContext null + return@withContext decoder(wrapper.payload) + } + + suspend fun getStale(key: String, decoder: (String) -> T): T? = withContext(Dispatchers.IO) { + val file = File(dir, safeName(key)) + if (!file.exists()) return@withContext null + val wrapper = runCatching { json.decodeFromString(CacheWrapper.serializer(), file.readText()) }.getOrNull() + ?: return@withContext null + return@withContext decoder(wrapper.payload) + } + + suspend fun delete(key: String) = withContext(Dispatchers.IO) { + File(dir, safeName(key)).delete() + } + + private fun safeName(key: String) = key.hashCode().toString(16) + ".json" +} + +@kotlinx.serialization.Serializable +private data class CacheWrapper( + val timestampMs: Long, + val ttlSeconds: Long, + val payload: String +) + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/data/Cookies.kt b/app/src/main/java/com/mkfunproj/mobilemkch/data/Cookies.kt new file mode 100644 index 0000000..bbeeef7 --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/data/Cookies.kt @@ -0,0 +1,27 @@ +package com.mkfunproj.mobilemkch.data + +import android.content.Context +import okhttp3.Cookie +import okhttp3.CookieJar +import okhttp3.HttpUrl + +class PersistentCookieJar(context: Context) : CookieJar { + private val prefs = context.getSharedPreferences("cookies", Context.MODE_PRIVATE) + + override fun saveFromResponse(url: HttpUrl, cookies: List) { + val key = url.host + val existing = loadForRequest(url).toMutableList() + existing.removeAll { e -> cookies.any { it.name == e.name } } + existing.addAll(cookies) + val serialized = existing.joinToString(";") { it.toString() } + prefs.edit().putString(key, serialized).apply() + } + + override fun loadForRequest(url: HttpUrl): List { + val key = url.host + val stored = prefs.getString(key, null) ?: return emptyList() + return stored.split(";").mapNotNull { Cookie.parse(url, it) } + } +} + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/data/FavoritesStore.kt b/app/src/main/java/com/mkfunproj/mobilemkch/data/FavoritesStore.kt new file mode 100644 index 0000000..1cd4358 --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/data/FavoritesStore.kt @@ -0,0 +1,43 @@ +package com.mkfunproj.mobilemkch.data + +import android.content.Context +import androidx.datastore.preferences.core.Preferences +import androidx.datastore.preferences.core.edit +import androidx.datastore.preferences.core.stringPreferencesKey +import androidx.datastore.preferences.preferencesDataStore +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map +import kotlinx.serialization.encodeToString +import kotlinx.serialization.json.Json + +private val Context.favDataStore by preferencesDataStore(name = "favorites") + +class FavoritesStore(private val context: Context) { + private object Keys { val list = stringPreferencesKey("list") } + + val flow: Flow> = context.favDataStore.data.map { prefs -> + val raw = prefs[Keys.list] ?: "[]" + runCatching { Json.decodeFromString>(raw) }.getOrElse { emptyList() } + } + + suspend fun add(item: FavoriteThread) { + context.favDataStore.edit { prefs -> + val current = prefs[Keys.list]?.let { runCatching { Json.decodeFromString>(it) }.getOrNull() } ?: emptyList() + if (current.any { it.id == item.id && it.board == item.board }) return@edit + val next = current + item + prefs[Keys.list] = Json.encodeToString(next) + } + } + + suspend fun remove(threadId: Int, board: String) { + context.favDataStore.edit { prefs -> + val current = prefs[Keys.list]?.let { runCatching { Json.decodeFromString>(it) }.getOrNull() } ?: emptyList() + val next = current.filterNot { it.id == threadId && it.board == board } + prefs[Keys.list] = Json.encodeToString(next) + } + } + + suspend fun clear() { context.favDataStore.edit { it.remove(Keys.list) } } +} + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/data/Models.kt b/app/src/main/java/com/mkfunproj/mobilemkch/data/Models.kt new file mode 100644 index 0000000..5a751a2 --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/data/Models.kt @@ -0,0 +1,50 @@ +package com.mkfunproj.mobilemkch.data + +import kotlinx.serialization.Serializable + +@Serializable +data class Board( + val code: String, + val description: String +) + +@Serializable +data class ThreadItem( + val id: Int, + val title: String, + val text: String, + val creation: String, + val board: String, + val rating: Int? = null, + val pinned: Boolean? = null, + val files: List = emptyList() +) + +@Serializable +data class ThreadDetail( + val id: Int, + val creation: String, + val title: String, + val text: String, + val board: String, + val files: List = emptyList() +) + +@Serializable +data class Comment( + val id: Int, + val text: String, + val creation: String, + val files: List = emptyList() +) + +@Serializable +data class FavoriteThread( + val id: Int, + val title: String, + val board: String, + val boardDescription: String, + val addedDate: Long +) + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/data/NetworkMonitor.kt b/app/src/main/java/com/mkfunproj/mobilemkch/data/NetworkMonitor.kt new file mode 100644 index 0000000..2cc227d --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/data/NetworkMonitor.kt @@ -0,0 +1,29 @@ +package com.mkfunproj.mobilemkch.data + +import android.content.Context +import android.net.ConnectivityManager +import android.net.Network +import android.net.NetworkCapabilities +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow + +class NetworkMonitor(context: Context) { + private val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager + private val _connected = MutableStateFlow(isCurrentlyConnected()) + val isConnected: StateFlow = _connected + + init { + cm.registerDefaultNetworkCallback(object : ConnectivityManager.NetworkCallback() { + override fun onAvailable(network: Network) { _connected.value = true } + override fun onLost(network: Network) { _connected.value = isCurrentlyConnected() } + }) + } + + private fun isCurrentlyConnected(): Boolean { + val n = cm.activeNetwork ?: return false + val caps = cm.getNetworkCapabilities(n) ?: return false + return caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) + } +} + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/data/Repository.kt b/app/src/main/java/com/mkfunproj/mobilemkch/data/Repository.kt new file mode 100644 index 0000000..5a688c9 --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/data/Repository.kt @@ -0,0 +1,61 @@ +package com.mkfunproj.mobilemkch.data + +import android.content.Context +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import kotlinx.serialization.encodeToString +import kotlinx.serialization.json.Json + +class Repository(context: Context) { + private val api = ApiClient(context) + private val cache = Cache(context) + private val json = Json + + suspend fun getBoards(offline: Boolean): List = withContext(Dispatchers.IO) { + if (offline) { + cache.getStale("boards") { json.decodeFromString(it) } ?: emptyList() + } else { + val cached = cache.get("boards") { json.decodeFromString>(it) } + if (cached != null) return@withContext cached + val boards = api.getBoards() + cache.set("boards", boards, { json.encodeToString(it) }, ttlSeconds = 600) + boards + } + } + + suspend fun getThreads(board: String, offline: Boolean): List = withContext(Dispatchers.IO) { + if (offline) { + cache.getStale("threads_$board") { json.decodeFromString(it) } ?: emptyList() + } else { + val cached = cache.get("threads_$board") { json.decodeFromString>(it) } + if (cached != null) return@withContext cached + val list = api.getThreads(board) + cache.set("threads_$board", list, { json.encodeToString(it) }, ttlSeconds = 300) + list + } + } + + suspend fun getThread(board: String, id: Int, offline: Boolean): ThreadDetail? = withContext(Dispatchers.IO) { + if (offline) { + cache.getStale("thread_$id") { json.decodeFromString(it) } + } else { + cache.get("thread_$id") { json.decodeFromString(it) } ?: api.getThreadDetail(board, id).also { + cache.set("thread_$id", it, { json.encodeToString(it) }, ttlSeconds = 180) + } + } + } + + suspend fun getComments(board: String, id: Int, offline: Boolean): List = withContext(Dispatchers.IO) { + if (offline) { + cache.getStale("comments_$id") { json.decodeFromString(it) } ?: emptyList() + } else { + val cached = cache.get("comments_$id") { json.decodeFromString>(it) } + if (cached != null) return@withContext cached + val list = api.getComments(board, id) + cache.set("comments_$id", list, { json.encodeToString(it) }, ttlSeconds = 180) + list + } + } +} + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/data/SettingsStore.kt b/app/src/main/java/com/mkfunproj/mobilemkch/data/SettingsStore.kt new file mode 100644 index 0000000..c8f1b88 --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/data/SettingsStore.kt @@ -0,0 +1,87 @@ +package com.mkfunproj.mobilemkch.data + +import android.content.Context +import androidx.datastore.preferences.core.Preferences +import androidx.datastore.preferences.core.edit +import androidx.datastore.preferences.core.booleanPreferencesKey +import androidx.datastore.preferences.core.intPreferencesKey +import androidx.datastore.preferences.core.stringPreferencesKey +import androidx.datastore.preferences.preferencesDataStore +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map + +private val Context.dataStore by preferencesDataStore(name = "settings") + +data class SettingsData( + val theme: String = "dark", + val lastBoard: String = "", + val autoRefresh: Boolean = true, + val showFiles: Boolean = true, + val compactMode: Boolean = false, + val pageSize: Int = 10, + val enablePagination: Boolean = false, + val enableUnstableFeatures: Boolean = false, + val passcode: String = "", + val key: String = "", + val notificationsEnabled: Boolean = false, + val notificationInterval: Int = 900, + val offlineMode: Boolean = false +) + +class SettingsStore(private val context: Context) { + private object Keys { + val theme = stringPreferencesKey("theme") + val lastBoard = stringPreferencesKey("lastBoard") + val autoRefresh = booleanPreferencesKey("autoRefresh") + val showFiles = booleanPreferencesKey("showFiles") + val compactMode = booleanPreferencesKey("compactMode") + val pageSize = intPreferencesKey("pageSize") + val enablePagination = booleanPreferencesKey("enablePagination") + val enableUnstable = booleanPreferencesKey("enableUnstableFeatures") + val passcode = stringPreferencesKey("passcode") + val key = stringPreferencesKey("key") + val notificationsEnabled = booleanPreferencesKey("notificationsEnabled") + val notificationInterval = intPreferencesKey("notificationInterval") + val offlineMode = booleanPreferencesKey("offlineMode") + } + + val data: Flow = context.dataStore.data.map { p -> p.toSettings() } + + suspend fun update(transform: (SettingsData) -> SettingsData) { + context.dataStore.edit { prefs -> + val current = prefs.toSettings() + val next = transform(current) + prefs[Keys.theme] = next.theme + prefs[Keys.lastBoard] = next.lastBoard + prefs[Keys.autoRefresh] = next.autoRefresh + prefs[Keys.showFiles] = next.showFiles + prefs[Keys.compactMode] = next.compactMode + prefs[Keys.pageSize] = next.pageSize + prefs[Keys.enablePagination] = next.enablePagination + prefs[Keys.enableUnstable] = next.enableUnstableFeatures + prefs[Keys.passcode] = next.passcode + prefs[Keys.key] = next.key + prefs[Keys.notificationsEnabled] = next.notificationsEnabled + prefs[Keys.notificationInterval] = next.notificationInterval + prefs[Keys.offlineMode] = next.offlineMode + } + } + + private fun Preferences.toSettings(): SettingsData = SettingsData( + theme = this[Keys.theme] ?: "dark", + lastBoard = this[Keys.lastBoard] ?: "", + autoRefresh = this[Keys.autoRefresh] ?: true, + showFiles = this[Keys.showFiles] ?: true, + compactMode = this[Keys.compactMode] ?: false, + pageSize = this[Keys.pageSize] ?: 10, + enablePagination = this[Keys.enablePagination] ?: false, + enableUnstableFeatures = this[Keys.enableUnstable] ?: false, + passcode = this[Keys.passcode] ?: "", + key = this[Keys.key] ?: "", + notificationsEnabled = this[Keys.notificationsEnabled] ?: false, + notificationInterval = this[Keys.notificationInterval] ?: 300, + offlineMode = this[Keys.offlineMode] ?: false + ) +} + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/data/SubscriptionsStore.kt b/app/src/main/java/com/mkfunproj/mobilemkch/data/SubscriptionsStore.kt new file mode 100644 index 0000000..d6f13aa --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/data/SubscriptionsStore.kt @@ -0,0 +1,44 @@ +package com.mkfunproj.mobilemkch.data + +import android.content.Context +import androidx.datastore.preferences.core.edit +import androidx.datastore.preferences.core.stringPreferencesKey +import androidx.datastore.preferences.preferencesDataStore +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.map +import kotlinx.serialization.encodeToString +import kotlinx.serialization.json.Json + +private val Context.subsDataStore by preferencesDataStore(name = "subscriptions") + +class SubscriptionsStore(private val context: Context) { + private object Keys { val boards = stringPreferencesKey("boards") } + + val flow: Flow> = context.subsDataStore.data.map { prefs -> + val raw = prefs[Keys.boards] ?: "[]" + runCatching { Json.decodeFromString>(raw).toSet() }.getOrElse { emptySet() } + } + + suspend fun add(board: String) { + context.subsDataStore.edit { prefs -> + val current = prefs[Keys.boards]?.let { runCatching { Json.decodeFromString>(it) }.getOrNull() }?.toMutableSet() ?: mutableSetOf() + current.add(board) + prefs[Keys.boards] = Json.encodeToString(current.toList()) + } + } + + suspend fun remove(board: String) { + context.subsDataStore.edit { prefs -> + val current = prefs[Keys.boards]?.let { runCatching { Json.decodeFromString>(it) }.getOrNull() }?.toMutableSet() ?: mutableSetOf() + current.remove(board) + prefs[Keys.boards] = Json.encodeToString(current.toList()) + } + } + + suspend fun clear() { context.subsDataStore.edit { it.remove(Keys.boards) } } + + suspend fun getNow(): Set = flow.first() +} + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/ui/AppRoot.kt b/app/src/main/java/com/mkfunproj/mobilemkch/ui/AppRoot.kt new file mode 100644 index 0000000..5288526 --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/ui/AppRoot.kt @@ -0,0 +1,118 @@ +package com.mkfunproj.mobilemkch.ui + +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Scaffold +import androidx.compose.material3.NavigationBar +import androidx.compose.material3.NavigationBarItem +import androidx.compose.material3.Icon +import androidx.compose.material3.Text +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Favorite +import androidx.compose.material.icons.filled.List +import androidx.compose.material.icons.filled.Settings +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.currentBackStackEntryAsState +import androidx.navigation.compose.rememberNavController +import com.mkfunproj.mobilemkch.ui.screens.BoardsScreen +import com.mkfunproj.mobilemkch.ui.screens.ThreadDetailScreen +import com.mkfunproj.mobilemkch.ui.screens.FavoritesScreen +import com.mkfunproj.mobilemkch.ui.screens.SettingsScreen +import com.mkfunproj.mobilemkch.ui.screens.ThreadsScreen +import com.mkfunproj.mobilemkch.ui.screens.AddCommentScreen +import com.mkfunproj.mobilemkch.ui.screens.CreateThreadScreen + +@Composable +fun AppRoot() { + val navController = rememberNavController() + val navBackStackEntry by navController.currentBackStackEntryAsState() + val currentRoute = navBackStackEntry?.destination?.route ?: "boards" + Scaffold( + bottomBar = { + NavigationBar { + NavigationBarItem( + selected = currentRoute.startsWith("favorites"), + onClick = { + navController.navigate("favorites") { + popUpTo(navController.graph.startDestinationId) { saveState = true } + launchSingleTop = true + restoreState = true + } + }, + icon = { Icon(Icons.Default.Favorite, contentDescription = null) }, + label = { Text("Избранное") } + ) + NavigationBarItem( + selected = currentRoute.startsWith("boards"), + onClick = { + navController.navigate("boards") { + popUpTo(navController.graph.startDestinationId) { saveState = true } + launchSingleTop = true + restoreState = true + } + }, + icon = { Icon(Icons.Default.List, contentDescription = null) }, + label = { Text("Доски") } + ) + NavigationBarItem( + selected = currentRoute.startsWith("settings"), + onClick = { + navController.navigate("settings") { + popUpTo(navController.graph.startDestinationId) { saveState = true } + launchSingleTop = true + restoreState = true + } + }, + icon = { Icon(Icons.Default.Settings, contentDescription = null) }, + label = { Text("Настройки") } + ) + } + } + ) { padding -> + NavHost( + navController = navController, + startDestination = "boards", + modifier = Modifier.fillMaxSize().padding(padding) + ) { + composable("boards") { + BoardsScreen( + onOpenThreads = { boardCode, boardDesc -> + navController.navigate("threads/$boardCode/$boardDesc") + } + ) + } + composable("favorites") { FavoritesScreen(onOpen = { board, id -> navController.navigate("thread/$board/$id") }) } + composable("settings") { SettingsScreen() } + composable("threads/{board}/{desc}") { backStack -> + val board = backStack.arguments?.getString("board").orEmpty() + val desc = backStack.arguments?.getString("desc").orEmpty() + ThreadsScreen( + boardCode = board, + boardDescription = desc, + onOpenThread = { threadId -> navController.navigate("thread/$board/$threadId") }, + onCreateThread = { navController.navigate("threads/$board/new") } + ) + } + composable("thread/{board}/{id}") { backStack -> + val board = backStack.arguments?.getString("board").orEmpty() + val id = backStack.arguments?.getString("id")?.toIntOrNull() ?: 0 + ThreadDetailScreen(boardCode = board, threadId = id, onAddComment = { navController.navigate("thread/$board/$id/comment") }) + } + composable("thread/{board}/{id}/comment") { backStack -> + val board = backStack.arguments?.getString("board").orEmpty() + val id = backStack.arguments?.getString("id")?.toIntOrNull() ?: 0 + AddCommentScreen(boardCode = board, threadId = id) + } + composable("threads/{board}/new") { backStack -> + val board = backStack.arguments?.getString("board").orEmpty() + CreateThreadScreen(boardCode = board) + } + } + } +} + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/AddCommentScreen.kt b/app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/AddCommentScreen.kt new file mode 100644 index 0000000..d2dfe6e --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/AddCommentScreen.kt @@ -0,0 +1,97 @@ +package com.mkfunproj.mobilemkch.ui.screens + +import android.app.Application +import android.content.ContentResolver +import android.content.Context +import android.net.Uri +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyRow +import androidx.compose.foundation.lazy.items +import androidx.compose.material3.Button +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.viewModelScope +import androidx.lifecycle.viewmodel.compose.viewModel +import coil.compose.AsyncImage +import com.mkfunproj.mobilemkch.data.ApiClient +import com.mkfunproj.mobilemkch.data.SettingsStore +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import java.io.File +import java.io.FileOutputStream +import com.mkfunproj.mobilemkch.util.ImageUtil +import java.io.InputStream + +class AddCommentVm(app: Application) : AndroidViewModel(app) { + private val api = ApiClient(app) + var isLoading by mutableStateOf(false) + var error by mutableStateOf(null) + fun send(context: Context, board: String, id: Int, text: String, uris: List, onDone: () -> Unit) { + isLoading = true + error = null + viewModelScope.launch { + val settings = SettingsStore(getApplication()).data.first() + val files = withContext(Dispatchers.IO) { uris.mapNotNull { uri -> ImageUtil.downscaleJpeg(context, uri) } } + runCatching { api.addComment(board, id, text, files, passcode = settings.passcode, authKey = settings.key) } + .onSuccess { onDone() } + .onFailure { error = it.message } + isLoading = false + withContext(Dispatchers.IO) { files.forEach { it.delete() } } + } + } + private fun copyUriToTemp(context: Context, uri: Uri): File? = ImageUtil.downscaleJpeg(context, uri) +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun AddCommentScreen(boardCode: String, threadId: Int, vm: AddCommentVm = viewModel()) { + val context = androidx.compose.ui.platform.LocalContext.current + var text by remember { mutableStateOf("") } + var picked by remember { mutableStateOf>(emptyList()) } + val launcher = rememberLauncherForActivityResult(ActivityResultContracts.GetMultipleContents()) { result -> + picked = result.take(4) + } + Scaffold(topBar = { TopAppBar(title = { Text("#$threadId Коммент") }) }) { padding -> + Column(Modifier.fillMaxSize().padding(padding).padding(16.dp)) { + OutlinedTextField(value = text, onValueChange = { text = it }, label = { Text("Текст") }, modifier = Modifier.fillMaxSize().weight(1f)) + Spacer(Modifier.height(8.dp)) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Button(onClick = { launcher.launch("image/*") }) { Text("Фото") } + } + if (picked.isNotEmpty()) { + LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(top = 8.dp)) { + items(picked) { uri -> + AsyncImage(model = uri, contentDescription = null, modifier = Modifier.size(64.dp)) + } + } + } + if (vm.error != null) Text(vm.error ?: "") + Button(onClick = { vm.send(context, boardCode, threadId, text, picked) {} }, enabled = text.isNotEmpty() && !vm.isLoading, modifier = Modifier.padding(top = 8.dp)) { Text(if (vm.isLoading) "Отправка..." else "Добавить") } + } + } +} + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/BoardsScreen.kt b/app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/BoardsScreen.kt new file mode 100644 index 0000000..6a23223 --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/BoardsScreen.kt @@ -0,0 +1,116 @@ +package com.mkfunproj.mobilemkch.ui.screens + +import android.app.Application +import androidx.compose.foundation.clickable +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.SnackbarHost +import androidx.compose.material3.SnackbarHostState +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TextButton +import androidx.compose.material3.Scaffold +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.viewmodel.compose.viewModel +import com.mkfunproj.mobilemkch.data.Board +import com.mkfunproj.mobilemkch.data.Repository +import com.mkfunproj.mobilemkch.data.SettingsStore +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.launch +import kotlinx.coroutines.delay + +class BoardsVm(app: Application) : AndroidViewModel(app) { + private val repo = Repository(app) + private val settings = SettingsStore(app) + var isLoading by mutableStateOf(false) + var error by mutableStateOf(null) + var boards by mutableStateOf>(emptyList()) + var offline by mutableStateOf(false) + + init { + viewModelScope.launch { settings.data.collect { offline = it.offlineMode } } + } + + suspend fun load() { + isLoading = true + error = null + runCatching { repo.getBoards(offline) } + .onSuccess { boards = it } + .onFailure { error = it.message } + isLoading = false + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun BoardsScreen( + onOpenThreads: (boardCode: String, boardDesc: String) -> Unit, + vm: BoardsVm = viewModel() +) { + val snackbar = remember { SnackbarHostState() } + val scope = androidx.compose.runtime.rememberCoroutineScope() + LaunchedEffect(Unit) { vm.load() } + Scaffold(topBar = { + TopAppBar(title = { Text("Доски mkch") }, actions = { + TextButton(onClick = { scope.launch { vm.load() } }) { Text("Обновить") } + }) + }, snackbarHost = { SnackbarHost(snackbar) }) { padding -> + Column(Modifier.fillMaxSize().padding(padding)) { + if (vm.offline) { + Text("Оффлайн режим. Показаны сохранённые данные", color = MaterialTheme.colorScheme.secondary, modifier = Modifier.padding(12.dp)) + } + when { + vm.isLoading -> CircularProgressIndicator(Modifier.padding(16.dp)) + vm.error != null -> Column(Modifier.padding(16.dp)) { + Text(vm.error ?: "", color = MaterialTheme.colorScheme.error) + TextButton(onClick = { scope.launch { vm.load() } }) { Text("Повторить") } + } + else -> BoardsList(PaddingValues(12.dp), vm.boards) { onOpenThreads(it.code, it.description) } + } + } + } +} + +@Composable +private fun BoardsList(padding: PaddingValues, itemsList: List, onClick: (Board) -> Unit) { + LazyColumn( + contentPadding = padding, + verticalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.fillMaxSize().padding(12.dp) + ) { + items(itemsList) { board -> + val desc = if (board.description.isEmpty()) "Без описания" else board.description + Card(colors = CardDefaults.cardColors(), modifier = Modifier.fillMaxWidth().clickable { onClick(board) }) { + Column(Modifier.padding(12.dp)) { + Text(text = "/${board.code}/", style = MaterialTheme.typography.titleMedium, color = MaterialTheme.colorScheme.primary) + Spacer(Modifier.height(2.dp)) + Text(text = desc, style = MaterialTheme.typography.bodyMedium, maxLines = 2) + } + } + } + } +} + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/CreateThreadScreen.kt b/app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/CreateThreadScreen.kt new file mode 100644 index 0000000..6ba51e8 --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/CreateThreadScreen.kt @@ -0,0 +1,102 @@ +package com.mkfunproj.mobilemkch.ui.screens + +import android.app.Application +import android.content.Context +import android.net.Uri +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyRow +import androidx.compose.foundation.lazy.items +import androidx.compose.material3.Button +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.viewModelScope +import androidx.lifecycle.viewmodel.compose.viewModel +import coil.compose.AsyncImage +import com.mkfunproj.mobilemkch.data.ApiClient +import com.mkfunproj.mobilemkch.data.SettingsStore +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import java.io.File +import java.io.FileOutputStream +import com.mkfunproj.mobilemkch.util.ImageUtil + +class CreateThreadVm(app: Application) : AndroidViewModel(app) { + private val api = ApiClient(app) + var isLoading by mutableStateOf(false) + var error by mutableStateOf(null) + fun create(context: Context, board: String, title: String, text: String, uris: List, onDone: () -> Unit) { + isLoading = true + error = null + viewModelScope.launch { + val settings = SettingsStore(getApplication()).data.first() + val files = withContext(Dispatchers.IO) { uris.mapNotNull { uri -> ImageUtil.downscaleJpeg(context, uri) } } + runCatching { api.createThread(board, title, text, files, passcode = settings.passcode, authKey = settings.key) } + .onSuccess { onDone() } + .onFailure { error = it.message } + isLoading = false + withContext(Dispatchers.IO) { files.forEach { it.delete() } } + } + } + private fun copyUriToTemp(context: Context, uri: Uri): File? = ImageUtil.downscaleJpeg(context, uri) +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun CreateThreadScreen(boardCode: String, vm: CreateThreadVm = viewModel()) { + val context = androidx.compose.ui.platform.LocalContext.current + var title by remember { mutableStateOf("") } + var text by remember { mutableStateOf("") } + var picked by remember { mutableStateOf>(emptyList()) } + val launcher = rememberLauncherForActivityResult(ActivityResultContracts.GetMultipleContents()) { result -> + picked = result.take(4) + } + Scaffold(topBar = { TopAppBar(title = { Text("/$boardCode/ Новый тред") }) }) { padding -> + Column(Modifier.fillMaxSize().padding(padding).padding(16.dp)) { + OutlinedTextField(value = title, onValueChange = { title = it }, label = { Text("Заголовок") }, modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp)) + OutlinedTextField( + value = text, + onValueChange = { text = it }, + label = { Text("Текст") }, + modifier = Modifier.fillMaxWidth().weight(1f), + minLines = 6, + maxLines = 12 + ) + Spacer(Modifier.height(8.dp)) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Button(onClick = { launcher.launch("image/*") }) { Text("Фото") } + } + if (picked.isNotEmpty()) { + LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(top = 8.dp)) { + items(picked) { uri -> AsyncImage(model = uri, contentDescription = null, modifier = Modifier.size(64.dp)) } + } + } + if (vm.error != null) Text(vm.error ?: "") + Button(onClick = { vm.create(context, boardCode, title, text, picked) {} }, enabled = title.isNotEmpty() && text.isNotEmpty() && !vm.isLoading, modifier = Modifier.padding(top = 8.dp)) { Text(if (vm.isLoading) "Отправка..." else "Создать") } + } + } +} + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/FavoritesScreen.kt b/app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/FavoritesScreen.kt new file mode 100644 index 0000000..0bdca72 --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/FavoritesScreen.kt @@ -0,0 +1,67 @@ +package com.mkfunproj.mobilemkch.ui.screens + +import android.app.Application +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.viewmodel.compose.viewModel +import com.mkfunproj.mobilemkch.data.FavoriteThread +import com.mkfunproj.mobilemkch.data.FavoritesStore + +class FavoritesVm(app: Application) : AndroidViewModel(app) { + private val store = FavoritesStore(app) + var items by mutableStateOf>(emptyList()) + suspend fun observe() { store.flow.collect { items = it } } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun FavoritesScreen(vm: FavoritesVm = viewModel(), onOpen: (board: String, id: Int) -> Unit = { _, _ -> }) { + LaunchedEffect(Unit) { vm.observe() } + Scaffold(topBar = { TopAppBar(title = { Text("Избранное") }) }) { padding -> + LazyColumn( + contentPadding = padding, + verticalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.fillMaxSize().padding(12.dp) + ) { + if (vm.items.isEmpty()) { + item { Text("Пока пусто") } + } else { + items(vm.items) { fav -> + Card(colors = CardDefaults.cardColors()) { + Column(Modifier.padding(12.dp).clickable { onOpen(fav.board, fav.id) }) { + Text(fav.title, style = androidx.compose.material3.MaterialTheme.typography.titleMedium, maxLines = 2) + Row { + Text("/${fav.board}/", color = androidx.compose.material3.MaterialTheme.colorScheme.primary) + Spacer(Modifier.weight(1f)) + Text(java.text.SimpleDateFormat("yyyy-MM-dd").format(java.util.Date(fav.addedDate))) + } + } + } + } + } + } + } +} + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/SettingsScreen.kt b/app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/SettingsScreen.kt new file mode 100644 index 0000000..524dc8a --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/SettingsScreen.kt @@ -0,0 +1,149 @@ +package com.mkfunproj.mobilemkch.ui.screens + +import android.app.Application +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Checkbox +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material3.Button +import androidx.compose.runtime.LaunchedEffect +import androidx.lifecycle.viewModelScope +import com.mkfunproj.mobilemkch.data.Board +import com.mkfunproj.mobilemkch.data.Repository +import com.mkfunproj.mobilemkch.data.SubscriptionsStore +import kotlinx.coroutines.launch +import com.mkfunproj.mobilemkch.util.NotificationHelper +import androidx.work.ExistingWorkPolicy +import androidx.work.OneTimeWorkRequestBuilder +import androidx.work.WorkManager +import com.mkfunproj.mobilemkch.workers.ThreadsCheckWorker +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.viewmodel.compose.viewModel +import com.mkfunproj.mobilemkch.data.SettingsData +import com.mkfunproj.mobilemkch.data.SettingsStore +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.launch + +class SettingsVm(app: Application) : AndroidViewModel(app) { + private val store = SettingsStore(app) + private val subs = SubscriptionsStore(app) + private val repo = Repository(app) + val flow = store.data + val subsFlow = subs.flow + var boards by mutableStateOf>(emptyList()) + fun update(transform: (SettingsData) -> SettingsData) { + viewModelScope.launch { store.update(transform) } + } + fun toggleSub(board: String, enabled: Boolean) { viewModelScope.launch { if (enabled) subs.add(board) else subs.remove(board) } } + fun loadBoards() { viewModelScope.launch { boards = runCatching { repo.getBoards(offline = false) }.getOrElse { emptyList() } } } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun SettingsScreen(vm: SettingsVm = viewModel()) { + val settings by vm.flow.collectAsState(initial = SettingsData()) + val subs by vm.subsFlow.collectAsState(initial = emptySet()) + LaunchedEffect(Unit) { vm.loadBoards() } + Scaffold(topBar = { TopAppBar(title = { Text("Настройки") }) }) { padding -> + Column(Modifier.fillMaxSize().padding(padding).padding(16.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) { + Row(Modifier.fillMaxWidth()) { + Text("Показывать файлы", modifier = Modifier.weight(1f)) + Checkbox(checked = settings.showFiles, onCheckedChange = { vm.update { it.copy(showFiles = it.showFiles.not()) } }) + } + Row(Modifier.fillMaxWidth()) { + Text("Компактный режим", modifier = Modifier.weight(1f)) + Checkbox(checked = settings.compactMode, onCheckedChange = { vm.update { it.copy(compactMode = it.compactMode.not()) } }) + } + Row(Modifier.fillMaxWidth()) { + Text("Разстраничивание", modifier = Modifier.weight(1f)) + Checkbox(checked = settings.enablePagination, onCheckedChange = { vm.update { it.copy(enablePagination = it.enablePagination.not()) } }) + } + Row(Modifier.fillMaxWidth()) { + Text("Тема", modifier = Modifier.weight(1f)) + val themeLabel = if(settings.theme=="oled") "OLED" else "Тёмная" + Button(onClick = { + val next = if(settings.theme=="oled") "dark" else "oled" + vm.update { it.copy(theme = next) } + }) { Text(themeLabel) } + } + OutlinedTextField( + value = settings.passcode, + onValueChange = { v -> vm.update { it.copy(passcode = v) } }, + label = { Text("Passcode для постинга") }, + modifier = Modifier.fillMaxWidth() + ) + OutlinedTextField( + value = settings.key, + onValueChange = { v -> vm.update { it.copy(key = v) } }, + label = { Text("Ключ аутентификации") }, + modifier = Modifier.fillMaxWidth() + ) + Row(Modifier.fillMaxWidth()) { + Text("Уведомления (beta)", modifier = Modifier.weight(1f)) + Checkbox(checked = settings.notificationsEnabled, onCheckedChange = { vm.update { it.copy(notificationsEnabled = it.notificationsEnabled.not()) } }) + } + if (settings.notificationsEnabled) { + Text("Подписки на доски") + if (vm.boards.isEmpty()) { + Text("Загрузка...") + } else { + LazyColumn(verticalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.weight(1f)) { + items(vm.boards) { b -> + Row(Modifier.fillMaxWidth()) { + Text("/${'$'}{b.code}/ ${'$'}{b.description}", modifier = Modifier.weight(1f)) + val on = subs.contains(b.code) + Checkbox(checked = on, onCheckedChange = { vm.toggleSub(b.code, !on) }) + } + } + } + } + val ctx = androidx.compose.ui.platform.LocalContext.current + Row(Modifier.fillMaxWidth()) { + Button(onClick = { NotificationHelper.notifyTest(ctx) }) { Text("Тест-уведомление") } + Spacer(Modifier.weight(1f)) + Button(onClick = { + val req = OneTimeWorkRequestBuilder().build() + WorkManager.getInstance(ctx).enqueueUniqueWork("mkch_threads_check_now", ExistingWorkPolicy.REPLACE, req) + }) { Text("Проверить сейчас") } + } + Row(Modifier.fillMaxWidth()) { + Text("Интервал проверки", modifier = Modifier.weight(1f)) + val options = listOf(300 to "5 мин", 900 to "15 мин", 1800 to "30 мин", 3600 to "1 час") + androidx.compose.material3.TextButton(onClick = { + val idx = options.indexOfFirst { it.first == settings.notificationInterval }.let { if (it == -1) 1 else it } + val next = options[(idx + 1) % options.size].first + vm.update { it.copy(notificationInterval = next) } + val req = OneTimeWorkRequestBuilder().build() + WorkManager.getInstance(ctx).enqueueUniqueWork("mkch_threads_check_now", ExistingWorkPolicy.REPLACE, req) + }) { Text(options.find { it.first == settings.notificationInterval }?.second ?: "15 мин") } + } + } + Row(Modifier.fillMaxWidth()) { + Text("Принудительно оффлайн", modifier = Modifier.weight(1f)) + Checkbox(checked = settings.offlineMode, onCheckedChange = { vm.update { it.copy(offlineMode = it.offlineMode.not()) } }) + } + Spacer(Modifier.weight(1f)) + } + } +} + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/ThreadDetailScreen.kt b/app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/ThreadDetailScreen.kt new file mode 100644 index 0000000..d3b1930 --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/ThreadDetailScreen.kt @@ -0,0 +1,130 @@ +package com.mkfunproj.mobilemkch.ui.screens + +import android.app.Application +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.FloatingActionButton +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material3.Text +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.viewmodel.compose.viewModel +import com.mkfunproj.mobilemkch.data.Comment +import com.mkfunproj.mobilemkch.data.Repository +import com.mkfunproj.mobilemkch.data.ThreadDetail +import coil.compose.AsyncImage +import com.mkfunproj.mobilemkch.data.SettingsStore +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.launch + +class ThreadDetailVm(app: Application) : AndroidViewModel(app) { + private val repo = Repository(app) + private val settings = SettingsStore(app) + var isLoading by mutableStateOf(false) + var error by mutableStateOf(null) + var detail by mutableStateOf(null) + var comments by mutableStateOf>(emptyList()) + var offline by mutableStateOf(false) + + init { viewModelScope.launch { settings.data.collect { offline = it.offlineMode } } } + + suspend fun load(board: String, id: Int) { + isLoading = true + error = null + runCatching { + val d = repo.getThread(board, id, offline) + val c = repo.getComments(board, id, offline) + d to c + }.onSuccess { (d, c) -> + detail = d + comments = c + }.onFailure { error = it.message } + isLoading = false + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun ThreadDetailScreen( + boardCode: String, + threadId: Int, + vm: ThreadDetailVm = viewModel(), + onAddComment: () -> Unit = {} +) { + val scope = androidx.compose.runtime.rememberCoroutineScope() + LaunchedEffect(threadId) { vm.load(boardCode, threadId) } + Scaffold( + topBar = { TopAppBar(title = { Text("#$threadId") }, actions = { androidx.compose.material3.TextButton(onClick = { scope.launch { vm.load(boardCode, threadId) } }) { Text("Обновить") } }) }, + floatingActionButton = { FloatingActionButton(onClick = onAddComment) { Icon(Icons.Default.Add, contentDescription = "Add") } } + ) { padding -> + when { + vm.isLoading -> CircularProgressIndicator(Modifier.padding(16.dp)) + vm.error != null -> Text(vm.error ?: "", color = MaterialTheme.colorScheme.error, modifier = Modifier.padding(16.dp)) + else -> Content(padding, vm.detail, vm.comments) + } + } +} + +@Composable +private fun Content(padding: PaddingValues, detail: ThreadDetail?, comments: List) { + LazyColumn( + contentPadding = PaddingValues( + top = padding.calculateTopPadding(), + bottom = padding.calculateBottomPadding(), + start = 12.dp, + end = 12.dp + ), + verticalArrangement = Arrangement.spacedBy(12.dp), + modifier = Modifier.fillMaxSize() + ) { + if (detail != null) { + item { + Card(colors = CardDefaults.cardColors()) { + androidx.compose.foundation.layout.Column(Modifier.padding(12.dp)) { + Text(detail.title, style = MaterialTheme.typography.titleLarge) + Text("/${detail.board}/", style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.primary) + if (detail.files.isNotEmpty()) { detail.files.forEach { f -> AsyncImage(model = "https://mkch.pooziqo.xyz$f", contentDescription = null) } } + if (detail.text.isNotEmpty()) Text(detail.text, style = MaterialTheme.typography.bodyMedium) + } + } + } + item { androidx.compose.material3.Divider() } + item { Text("Комментарии (${comments.size})", style = MaterialTheme.typography.titleMedium) } + } + items(comments) { c -> + Card(colors = CardDefaults.cardColors()) { + androidx.compose.foundation.layout.Column(Modifier.padding(12.dp)) { + androidx.compose.foundation.layout.Row { + Text("ID: ${c.id}", style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.secondary) + androidx.compose.foundation.layout.Spacer(Modifier.weight(1f)) + Text(c.creation.take(10), style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.secondary) + } + if (c.files.isNotEmpty()) { c.files.forEach { f -> AsyncImage(model = "https://mkch.pooziqo.xyz$f", contentDescription = null) } } + if (c.text.isNotEmpty()) Text(c.text.replace("#", ">>"), style = MaterialTheme.typography.bodyMedium) + } + } + } + } +} + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/ThreadsScreen.kt b/app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/ThreadsScreen.kt new file mode 100644 index 0000000..7958172 --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/ui/screens/ThreadsScreen.kt @@ -0,0 +1,199 @@ +package com.mkfunproj.mobilemkch.ui.screens + +import android.app.Application +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.Divider +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Favorite +import androidx.compose.material.icons.outlined.FavoriteBorder +import androidx.compose.material3.Icon +import androidx.compose.material.icons.filled.Star +import androidx.compose.material.icons.filled.PushPin +import androidx.compose.material.icons.filled.AttachFile +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.viewmodel.compose.viewModel +import com.mkfunproj.mobilemkch.data.Repository +import coil.compose.AsyncImage +import com.mkfunproj.mobilemkch.data.SettingsStore +import com.mkfunproj.mobilemkch.data.FavoriteThread +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.launch +import com.mkfunproj.mobilemkch.data.ThreadItem + +class ThreadsVm(app: Application) : AndroidViewModel(app) { + private val repo = Repository(app) + private val settings = SettingsStore(app) + private val favStore = com.mkfunproj.mobilemkch.data.FavoritesStore(app) + var isLoading by mutableStateOf(false) + var error by mutableStateOf(null) + var items by mutableStateOf>(emptyList()) + var offline by mutableStateOf(false) + var enablePagination by mutableStateOf(false) + var pageSize by mutableStateOf(10) + var compactMode by mutableStateOf(false) + var showFiles by mutableStateOf(true) + var favorites by mutableStateOf>(emptyList()) + + init { + viewModelScope.launch { settings.data.collect { + offline = it.offlineMode + enablePagination = it.enablePagination + pageSize = it.pageSize + compactMode = it.compactMode + showFiles = it.showFiles + } } + viewModelScope.launch { favStore.flow.collect { favorites = it } } + } + + fun isFavorite(board: String, id: Int): Boolean = favorites.any { it.board == board && it.id == id } + fun addFavorite(id: Int, title: String, board: String, boardDesc: String) { + val fav = FavoriteThread(id = id, title = title, board = board, boardDescription = boardDesc, addedDate = System.currentTimeMillis()) + viewModelScope.launch { favStore.add(fav) } + } + fun removeFavorite(id: Int, board: String) { viewModelScope.launch { favStore.remove(id, board) } } + + suspend fun load(board: String) { + isLoading = true + error = null + runCatching { repo.getThreads(board, offline) } + .onSuccess { items = it } + .onFailure { error = it.message } + isLoading = false + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun ThreadsScreen( + boardCode: String, + boardDescription: String, + onOpenThread: (threadId: Int) -> Unit, + onCreateThread: (boardCode: String) -> Unit = {}, + vm: ThreadsVm = viewModel() +) { + LaunchedEffect(boardCode) { vm.load(boardCode) } + var currentPage by androidx.compose.runtime.remember { mutableStateOf(0) } + val scope = androidx.compose.runtime.rememberCoroutineScope() + Scaffold(topBar = { TopAppBar(title = { Text("/$boardCode/ — $boardDescription") }, actions = { + androidx.compose.material3.TextButton(onClick = { scope.launch { vm.load(boardCode) } }) { Text("Обновить") } + androidx.compose.material3.TextButton(onClick = { onCreateThread(boardCode) }) { Text("Создать") } + }) }) { padding -> + when { + vm.isLoading -> CircularProgressIndicator(Modifier.padding(16.dp)) + vm.error != null -> Text(vm.error ?: "", color = MaterialTheme.colorScheme.error, modifier = Modifier.padding(16.dp)) + else -> { + val list = if (vm.enablePagination) { + val totalPages = (vm.items.size + vm.pageSize - 1) / vm.pageSize + val page = currentPage.coerceIn(0, (totalPages - 1).coerceAtLeast(0)) + val start = page * vm.pageSize + val end = kotlin.math.min(start + vm.pageSize, vm.items.size) + vm.items.subList(start, end) + } else vm.items + ThreadList(padding, vm, boardCode, boardDescription, onOpenThread, list) + if (vm.enablePagination) { + val totalPages = (vm.items.size + vm.pageSize - 1) / vm.pageSize + if (totalPages > 1) { + androidx.compose.foundation.layout.Row(Modifier.fillMaxWidth().padding(12.dp)) { + androidx.compose.material3.TextButton(onClick = { if (currentPage > 0) currentPage -= 1 }, enabled = currentPage > 0) { Text("<-") } + androidx.compose.foundation.layout.Spacer(Modifier.weight(1f)) + Text("Страница ${currentPage + 1} из $totalPages") + androidx.compose.foundation.layout.Spacer(Modifier.weight(1f)) + androidx.compose.material3.TextButton(onClick = { if (currentPage < totalPages - 1) currentPage += 1 }, enabled = currentPage < totalPages - 1) { Text("->") } + } + } + } + } + } + } +} + +@Composable +private fun ThreadList(padding: PaddingValues, vm: ThreadsVm, boardCode: String, boardDescription: String, onOpen: (Int) -> Unit, itemsList: List) { + LazyColumn( + contentPadding = padding, + verticalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.fillMaxSize().padding(12.dp) + ) { + if (vm.offline) { + item { Text("Оффлайн режим. Показаны сохранённые данные", color = MaterialTheme.colorScheme.secondary) } + } + items(itemsList) { t -> + if (vm.compactMode) { + Row(Modifier.fillMaxWidth().clickable { onOpen(t.id) }) { + Text("#${t.id}", style = MaterialTheme.typography.labelSmall) + Spacer(Modifier.width(8.dp)) + Text(t.title, style = MaterialTheme.typography.bodyMedium, modifier = Modifier.weight(1f), maxLines = 1) + val fav = vm.isFavorite(boardCode, t.id) + Icon( + imageVector = if (fav) Icons.Filled.Favorite else Icons.Outlined.FavoriteBorder, + contentDescription = null, + tint = if (fav) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.onBackground, + modifier = Modifier.clickable { if (fav) vm.removeFavorite(t.id, boardCode) else vm.addFavorite(t.id, t.title, boardCode, boardDescription) } + ) + } + Row { + Text(t.creation, style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.secondary) + Spacer(Modifier.width(8.dp)) + if ((t.rating ?: 0) > 0) { + Icon(Icons.Filled.Star, contentDescription = null, tint = MaterialTheme.colorScheme.primary) + Text(" ${(t.rating ?: 0)}", style = MaterialTheme.typography.labelSmall) + Spacer(Modifier.width(8.dp)) + } + if (t.pinned == true) { + Icon(Icons.Filled.PushPin, contentDescription = null, tint = MaterialTheme.colorScheme.tertiary) + Spacer(Modifier.width(8.dp)) + } + if (vm.showFiles && t.files.isNotEmpty()) { + Icon(Icons.Filled.AttachFile, contentDescription = null, tint = MaterialTheme.colorScheme.primary) + Text(" ${t.files.size}", style = MaterialTheme.typography.labelSmall) + } + } + } else { + Row(Modifier.fillMaxWidth().clickable { onOpen(t.id) }) { + Text("#${t.id}: ${t.title}", style = MaterialTheme.typography.titleMedium, modifier = Modifier.weight(1f), maxLines = 2) + val fav = vm.isFavorite(boardCode, t.id) + Icon( + imageVector = if (fav) Icons.Filled.Favorite else Icons.Outlined.FavoriteBorder, + contentDescription = null, + tint = if (fav) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.onBackground, + modifier = Modifier.clickable { if (fav) vm.removeFavorite(t.id, boardCode) else vm.addFavorite(t.id, t.title, boardCode, boardDescription) } + ) + if (t.pinned == true) { Spacer(Modifier.width(8.dp)); Icon(Icons.Filled.PushPin, contentDescription = null, tint = MaterialTheme.colorScheme.tertiary) } + } + Row { + if ((t.rating ?: 0) > 0) { Icon(Icons.Filled.Star, contentDescription = null, tint = MaterialTheme.colorScheme.primary); Spacer(Modifier.width(4.dp)); Text("${t.rating ?: 0}", style = MaterialTheme.typography.labelSmall); Spacer(Modifier.width(12.dp)) } + if (vm.showFiles && t.files.isNotEmpty()) { Icon(Icons.Filled.AttachFile, contentDescription = null, tint = MaterialTheme.colorScheme.primary); Spacer(Modifier.width(4.dp)); Text("${t.files.size}", style = MaterialTheme.typography.labelSmall) } + } + if (t.text.isNotEmpty()) Text(t.text, style = MaterialTheme.typography.bodyMedium, maxLines = 3) + if (vm.showFiles && t.files.isNotEmpty()) { Spacer(Modifier.height(4.dp)); t.files.forEach { f -> AsyncImage(model = "https://mkch.pooziqo.xyz$f", contentDescription = null) } } + } + Divider(Modifier.padding(top = 8.dp)) + } + } +} + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/ui/theme/Shape.kt b/app/src/main/java/com/mkfunproj/mobilemkch/ui/theme/Shape.kt new file mode 100644 index 0000000..e984968 --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/ui/theme/Shape.kt @@ -0,0 +1,7 @@ +package com.mkfunproj.mobilemkch.ui.theme + +import androidx.compose.material3.Shapes + +val Shapes = Shapes() + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/ui/theme/Theme.kt b/app/src/main/java/com/mkfunproj/mobilemkch/ui/theme/Theme.kt new file mode 100644 index 0000000..12072d8 --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/ui/theme/Theme.kt @@ -0,0 +1,31 @@ +package com.mkfunproj.mobilemkch.ui.theme + +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color + +private val DarkColors = darkColorScheme() +private val OledColors = darkColorScheme( + background = Color.Black, + surface = Color.Black +) + +@Composable +fun MobileMkchTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + oled: Boolean = false, + content: @Composable () -> Unit +) { + val colors = if (oled) OledColors else DarkColors + MaterialTheme( + colorScheme = colors, + typography = Typography, + shapes = Shapes, + content = content + ) +} + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/ui/theme/Type.kt b/app/src/main/java/com/mkfunproj/mobilemkch/ui/theme/Type.kt new file mode 100644 index 0000000..b1b7315 --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/ui/theme/Type.kt @@ -0,0 +1,5 @@ +package com.mkfunproj.mobilemkch.ui.theme + +import androidx.compose.material3.Typography + +val Typography = Typography() diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/util/ImageUtil.kt b/app/src/main/java/com/mkfunproj/mobilemkch/util/ImageUtil.kt new file mode 100644 index 0000000..89472d2 --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/util/ImageUtil.kt @@ -0,0 +1,39 @@ +package com.mkfunproj.mobilemkch.util + +import android.content.Context +import android.graphics.Bitmap +import android.graphics.ImageDecoder +import android.net.Uri +import android.os.Build +import android.provider.MediaStore +import java.io.File +import java.io.FileOutputStream + +object ImageUtil { + fun downscaleJpeg(context: Context, uri: Uri, maxDim: Int = 1600, quality: Int = 85): File? { + return runCatching { + val source = if (Build.VERSION.SDK_INT >= 28) { + ImageDecoder.createSource(context.contentResolver, uri) + } else null + val bmp: Bitmap = if (source != null) ImageDecoder.decodeBitmap(source) else MediaStore.Images.Media.getBitmap(context.contentResolver, uri) + val ratio = bmp.width.toFloat() / bmp.height + val (w, h) = if (bmp.width >= bmp.height) { + val w = maxDim + val h = (w / ratio).toInt() + w to h + } else { + val h = maxDim + val w = (h * ratio).toInt() + w to h + } + val scaled = Bitmap.createScaledBitmap(bmp, w, h, true) + val out = File(context.cacheDir, "scaled_${System.currentTimeMillis()}.jpg") + FileOutputStream(out).use { fos -> + scaled.compress(Bitmap.CompressFormat.JPEG, quality, fos) + } + out + }.getOrNull() + } +} + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/util/NotificationHelper.kt b/app/src/main/java/com/mkfunproj/mobilemkch/util/NotificationHelper.kt new file mode 100644 index 0000000..8860397 --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/util/NotificationHelper.kt @@ -0,0 +1,45 @@ +package com.mkfunproj.mobilemkch.util + +import android.app.NotificationChannel +import android.app.NotificationManager +import android.content.Context +import android.os.Build +import androidx.core.app.NotificationCompat +import com.mkfunproj.mobilemkch.R + +object NotificationHelper { + private const val CHANNEL_ID = "mkch_threads" + + private fun ensureChannel(nm: NotificationManager) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + val ch = NotificationChannel(CHANNEL_ID, "Новые треды", NotificationManager.IMPORTANCE_DEFAULT) + nm.createNotificationChannel(ch) + } + } + + fun notifyThread(context: Context, board: String, threadId: Int, title: String) { + val nm = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager + ensureChannel(nm) + val notif = NotificationCompat.Builder(context, CHANNEL_ID) + .setSmallIcon(R.drawable.ic_notification) + .setContentTitle("Новый тред /" + board + "/") + .setContentText(title) + .setAutoCancel(true) + .build() + nm.notify((board.hashCode() xor threadId), notif) + } + + fun notifyTest(context: Context) { + val nm = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager + ensureChannel(nm) + val notif = NotificationCompat.Builder(context, CHANNEL_ID) + .setSmallIcon(R.drawable.ic_notification) + .setContentTitle("Тестовое уведомление") + .setContentText("Новый тред: Тестовый тред в /test/") + .setAutoCancel(true) + .build() + nm.notify(0x777777, notif) + } +} + + diff --git a/app/src/main/java/com/mkfunproj/mobilemkch/workers/ThreadsCheckWorker.kt b/app/src/main/java/com/mkfunproj/mobilemkch/workers/ThreadsCheckWorker.kt new file mode 100644 index 0000000..81841b0 --- /dev/null +++ b/app/src/main/java/com/mkfunproj/mobilemkch/workers/ThreadsCheckWorker.kt @@ -0,0 +1,32 @@ +package com.mkfunproj.mobilemkch.workers + +import android.content.Context +import androidx.work.CoroutineWorker +import androidx.work.WorkerParameters +import com.mkfunproj.mobilemkch.data.ApiClient +import com.mkfunproj.mobilemkch.data.SettingsStore +import com.mkfunproj.mobilemkch.data.SubscriptionsStore +import com.mkfunproj.mobilemkch.util.NotificationHelper +import kotlinx.coroutines.flow.first + +class ThreadsCheckWorker(appContext: Context, workerParams: WorkerParameters) : CoroutineWorker(appContext, workerParams) { + override suspend fun doWork(): Result { + val settings = SettingsStore(applicationContext).data.first() + if (!settings.notificationsEnabled) return Result.success() + val subs = SubscriptionsStore(applicationContext).flow.first() + if (subs.isEmpty()) return Result.success() + val api = ApiClient(applicationContext) + var notified = 0 + subs.forEach { board -> + runCatching { api.checkNewThreads(board) }.onSuccess { list -> + list.forEach { t -> + NotificationHelper.notifyThread(applicationContext, board, t.id, t.title) + notified += 1 + } + } + } + return Result.success() + } +} + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml new file mode 100644 index 0000000..dca65f6 --- /dev/null +++ b/app/src/main/res/drawable/ic_notification.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..e8e18e4 --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,4 @@ + + +