diff --git a/.gitignore b/.gitignore index aa724b7..6e22c65 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ /.idea/workspace.xml /.idea/navEditor.xml /.idea/assetWizardSettings.xml +.idea/* .DS_Store /build /captures 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..6e01653 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,62 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.compose) +} + +android { + namespace = "org.octopus.randomfacts" + compileSdk = 35 + + defaultConfig { + applicationId = "org.octopus.randomfacts" + minSdk = 24 + 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_11 + targetCompatibility = JavaVersion.VERSION_11 + } + kotlinOptions { + jvmTarget = "11" + } + buildFeatures { + compose = true + } +} + +dependencies { + + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.activity.compose) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.ui) + implementation(libs.androidx.ui.graphics) + implementation(libs.androidx.ui.tooling.preview) + implementation(libs.androidx.material3) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.ui.test.junit4) + debugImplementation(libs.androidx.ui.tooling) + debugImplementation(libs.androidx.ui.test.manifest) + + implementation(libs.androidx.datastore.preferences) + implementation(libs.google.play.billing.ktx) +} \ 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/org/octopus/randomfacts/ExampleInstrumentedTest.kt b/app/src/androidTest/java/org/octopus/randomfacts/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..e30921b --- /dev/null +++ b/app/src/androidTest/java/org/octopus/randomfacts/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package org.octopus.randomfacts + +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("org.octopus.randomfact", 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..d691628 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/org/octopus/randomfacts/MainActivity.kt b/app/src/main/java/org/octopus/randomfacts/MainActivity.kt new file mode 100644 index 0000000..1462e43 --- /dev/null +++ b/app/src/main/java/org/octopus/randomfacts/MainActivity.kt @@ -0,0 +1,249 @@ +package org.octopus.randomfacts + +import android.content.Context +import android.os.Bundle +import android.widget.Toast +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.runtime.snapshotFlow +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.LocalClipboard +import androidx.compose.ui.platform.LocalClipboardManager +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.android.billingclient.api.AcknowledgePurchaseParams +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import org.octopus.randomfacts.core.shared.Const +import org.octopus.randomfacts.core.shared.HttpClient +import org.octopus.randomfacts.core.shared.PreferenceDataStore +import org.octopus.randomfacts.ui.theme.greenColor +import org.octopus.randomfacts.ui.theme.myFontFamily +import org.octopus.randomfacts.ui.theme.orangeColor +import org.octopus.randomfacts.core.billing.OctopusBillingClient +import org.octopus.randomfacts.core.billing.PurchaseState + +// --------------------------- Main Activity --------------------------- +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + RandomFactsScreen(this) + } + } +} + + +// --------------------------- Composable Screen --------------------------- +@Composable +fun RandomFactsScreen(activity: ComponentActivity) { + val clipboardManager = LocalClipboard.current + var coins by remember { mutableIntStateOf(0) } + val scope = rememberCoroutineScope() + var response by remember { mutableStateOf(Const.DEFAULT_FACT_PLACEHOLDER) } + var unlocked by remember { mutableStateOf(false) } + var isInitialized by remember { mutableStateOf(false) } + + val billingClient = OctopusBillingClient(activity) { + if (it == PurchaseState.OK) { + unlocked = true + } + } + billingClient.init(onlyCheck = true) + + LaunchedEffect(Unit) { + response = PreferenceDataStore.loadFact(activity) + val savedCoins = PreferenceDataStore.loadCoins(activity) + val lastUpdate = PreferenceDataStore.loadTimestamp(activity) + val hoursPassed = ((System.currentTimeMillis() - lastUpdate) / Const.COIN_INCREMENT_INTERVAL).toInt() + coins = (savedCoins + hoursPassed).coerceAtMost(Const.MAX_COINS) + PreferenceDataStore.saveCoins(activity, coins) + isInitialized = true + } + + LaunchedEffect(isInitialized) { + if (!isInitialized) return@LaunchedEffect + + snapshotFlow { coins } + .collect { currentCoins -> + if (currentCoins < Const.MAX_COINS) { + val lastUpdate = PreferenceDataStore.loadTimestamp(activity) + val elapsed = System.currentTimeMillis() - lastUpdate + delay(Const.COIN_INCREMENT_INTERVAL - elapsed) + while (true) { + val actualCoins = PreferenceDataStore.loadCoins(activity) + if (actualCoins >= Const.MAX_COINS) break + + val lastUpdate = PreferenceDataStore.loadTimestamp(activity) + val elapsed = System.currentTimeMillis() - lastUpdate + + if (elapsed >= Const.COIN_INCREMENT_INTERVAL) { + PreferenceDataStore.saveCoins(activity, actualCoins + 1) + PreferenceDataStore.saveTimestamp(activity, System.currentTimeMillis()) + coins = actualCoins + 1 + } else { + delay(Const.COIN_INCREMENT_INTERVAL - elapsed) + } + } + } + } + } + + + + LaunchedEffect(response) { + PreferenceDataStore.saveFact(activity, response) + } + + Box(modifier = Modifier.fillMaxSize()) { + Image( + painter = painterResource(id = R.drawable.bg), + contentDescription = null, + modifier = Modifier.fillMaxSize(), + contentScale = ContentScale.Crop + ) + + Text( + text = "RANDOM FACT", + fontFamily = myFontFamily, + fontWeight = FontWeight.Bold, + fontSize = 28.sp, + color = Color.Black, + modifier = Modifier + .align(Alignment.TopCenter) + .padding(top = 72.dp) + ) + + + Column( + modifier = Modifier.align(Alignment.Center), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Box(modifier = Modifier.padding(16.dp)) { + Text( + text = response, + fontFamily = myFontFamily, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + color = Color.Black, + textAlign = TextAlign.Center, + modifier = Modifier + .background( + color = Color.White.copy(alpha = 0.85f), + shape = RoundedCornerShape(16.dp) + ) + .border(1.dp, Color.Gray, RoundedCornerShape(16.dp)) + .padding(16.dp) + .clickable(true) { + clipboardManager.nativeClipboard.setText(AnnotatedString(response)) + } + ) + } + } + + // Get fact button + Button( + modifier = Modifier + .align(Alignment.BottomCenter) + .padding(8.dp, 206.dp), + onClick = { + scope.launch(Dispatchers.IO) { + if (unlocked) { + HttpClient.fetchFact { response = it } + } else { + var savedCoins = PreferenceDataStore.loadCoins(activity) + if (savedCoins > 0) { + savedCoins-- + PreferenceDataStore.saveCoins(activity, savedCoins) + coins = savedCoins + HttpClient.fetchFact { + response = it + } + } else { + scope.launch(Dispatchers.Main) { + Toast.makeText(activity, "No more coins", Toast.LENGTH_SHORT).show() + } + } + } + } + }, + colors = ButtonDefaults.buttonColors( + containerColor = orangeColor, + contentColor = Color.White + ) + ) { + val factText = buildString { + append("Get fact") + if (!unlocked && coins > 0) { + append(" ($coins coin") + if (coins > 1) append("s") + append(")") + } + } + Text( + fontFamily = myFontFamily, + fontWeight = FontWeight.Bold, + text = factText + + ) + } + + if (!unlocked) { + Column( + modifier = Modifier + .align(Alignment.BottomCenter) + .padding(16.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text( + color = Color.White, + text = Const.BOTTOM_TOOLTIP + ) + + Button( + modifier = Modifier.padding(16.dp), + onClick = { billingClient.init() }, + colors = ButtonDefaults.buttonColors( + containerColor = greenColor, + contentColor = Color.White + ) + ) { + Text( + fontFamily = myFontFamily, + fontWeight = FontWeight.Bold, + text = "Get unlimited coins" + ) + } + } + } + + } +} diff --git a/app/src/main/java/org/octopus/randomfacts/core/billing/OctopusBillingClient.kt b/app/src/main/java/org/octopus/randomfacts/core/billing/OctopusBillingClient.kt new file mode 100644 index 0000000..6241028 --- /dev/null +++ b/app/src/main/java/org/octopus/randomfacts/core/billing/OctopusBillingClient.kt @@ -0,0 +1,97 @@ +package org.octopus.randomfacts.core.billing + +import android.app.Activity +import com.android.billingclient.api.BillingClient +import com.android.billingclient.api.BillingClient.BillingResponseCode +import com.android.billingclient.api.BillingClientStateListener +import com.android.billingclient.api.BillingFlowParams +import com.android.billingclient.api.BillingResult +import com.android.billingclient.api.PendingPurchasesParams +import com.android.billingclient.api.PurchasesUpdatedListener +import com.android.billingclient.api.QueryProductDetailsParams +import org.octopus.randomfacts.core.shared.Const + +class OctopusBillingClient(val activity: Activity, val logic: (PurchaseState) -> Unit) { + private val queryProductDetailsParams = + QueryProductDetailsParams.newBuilder() + .setProductList( + listOf( + QueryProductDetailsParams.Product.newBuilder() + .setProductId(Const.UNLIMITED_COIN_PRODUCT_ID) + .setProductType(BillingClient.ProductType.INAPP) + .build())) + .build() + + private val purchasesUpdatedListener = + PurchasesUpdatedListener { billingResult, purchases -> + if (billingResult.responseCode == BillingResponseCode.OK && purchases != null) { + for (purchase in purchases) { + if (purchase.products.any { it == Const.UNLIMITED_COIN_PRODUCT_ID }) { + logic.invoke(PurchaseState.OK) + } + } + } else if (billingResult.responseCode == BillingResponseCode.USER_CANCELED) { + logic.invoke(PurchaseState.CANCELLED) + } else { + logic.invoke(PurchaseState.KO) + } + + } + + private var billingClient = BillingClient.newBuilder(activity) + .setListener(purchasesUpdatedListener) + .enablePendingPurchases(PendingPurchasesParams.newBuilder() + .enablePrepaidPlans() + .enableOneTimeProducts() + .build()) + .enableAutoServiceReconnection() + .build() + + fun init(onlyCheck: Boolean = false) { + billingClient.startConnection(object : BillingClientStateListener { + override fun onBillingSetupFinished(billingResult: BillingResult) { + if (billingResult.responseCode == BillingResponseCode.OK) { + billingClient.queryProductDetailsAsync(queryProductDetailsParams) { + billingResult, + queryProductDetailsResult -> + if (billingResult.responseCode == BillingResponseCode.ITEM_ALREADY_OWNED) { + logic.invoke(PurchaseState.OK) + } else if (!onlyCheck && billingResult.responseCode == BillingResponseCode.OK) { + for ( productDetails in queryProductDetailsResult.productDetailsList) { + val productDetailsParamsList = listOf( + BillingFlowParams.ProductDetailsParams.newBuilder() + .setProductDetails(productDetails) + .setOfferToken(productDetails.oneTimePurchaseOfferDetailsList!![0].offerToken!!) + .build() + ) + + val billingFlowParams = BillingFlowParams.newBuilder() + .setProductDetailsParamsList(productDetailsParamsList) + .build() + + val billingResult = billingClient.launchBillingFlow(activity, billingFlowParams) + when (billingResult.responseCode) { + BillingResponseCode.OK -> logic.invoke(PurchaseState.OK) + BillingResponseCode.USER_CANCELED -> logic.invoke(PurchaseState.CANCELLED) + else -> logic.invoke(PurchaseState.KO) + } + } + + for ( unfetchedProduct in queryProductDetailsResult.unfetchedProductList) { + // Handle any unfetched products as appropriate. + } + } + } + } + } + override fun onBillingServiceDisconnected() { + // Try to restart the connection on the next request to + // Google Play by calling the startConnection() method. + } + }) + + + + } + +} \ No newline at end of file diff --git a/app/src/main/java/org/octopus/randomfacts/core/billing/PurchaseState.kt b/app/src/main/java/org/octopus/randomfacts/core/billing/PurchaseState.kt new file mode 100644 index 0000000..c7e9f49 --- /dev/null +++ b/app/src/main/java/org/octopus/randomfacts/core/billing/PurchaseState.kt @@ -0,0 +1,7 @@ +package org.octopus.randomfacts.core.billing + +enum class PurchaseState { + OK, + CANCELLED, + KO +} \ No newline at end of file diff --git a/app/src/main/java/org/octopus/randomfacts/core/shared/Const.kt b/app/src/main/java/org/octopus/randomfacts/core/shared/Const.kt new file mode 100644 index 0000000..bf2b18a --- /dev/null +++ b/app/src/main/java/org/octopus/randomfacts/core/shared/Const.kt @@ -0,0 +1,16 @@ +package org.octopus.randomfacts.core.shared + +object Const { + const val MAX_COINS = 5 + const val DEFAULT_FACT_PLACEHOLDER = "Press the button to generate a random fact" + const val BOTTOM_TOOLTIP = "You get 1 coin each hour, max $MAX_COINS" + + const val COIN_INCREMENT_INTERVAL = 3600_000L +// const val COIN_INCREMENT_INTERVAL = 10_000L + + const val HTTP_ERROR_MSG = "There was an error generating a random fact" + const val HTTP_URL_ENDPOINT = "https://uselessfacts.jsph.pl/api/v2/facts/random" + + + const val UNLIMITED_COIN_PRODUCT_ID = "product_id_example" +} \ No newline at end of file diff --git a/app/src/main/java/org/octopus/randomfacts/core/shared/HttpClient.kt b/app/src/main/java/org/octopus/randomfacts/core/shared/HttpClient.kt new file mode 100644 index 0000000..776e766 --- /dev/null +++ b/app/src/main/java/org/octopus/randomfacts/core/shared/HttpClient.kt @@ -0,0 +1,28 @@ +package org.octopus.randomfacts.core.shared + +import android.util.Log +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import org.json.JSONObject +import java.net.HttpURLConnection +import java.net.URL + +object HttpClient { + suspend fun fetchFact(onResult: (String) -> Unit) { + withContext(Dispatchers.IO) { + try { + val url = URL(Const.HTTP_URL_ENDPOINT) + val connection = url.openConnection() as HttpURLConnection + connection.requestMethod = "GET" + connection.connect() + val result = connection.inputStream.bufferedReader().use { it.readText() } + connection.disconnect() + val json = JSONObject(result) + onResult(json.getString("text")) + } catch (e: Exception) { + Log.e("Octopus RandomFacts HTTPCallError", e.message ?: "") + onResult(Const.HTTP_ERROR_MSG) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/org/octopus/randomfacts/core/shared/PreferenceDataStore.kt b/app/src/main/java/org/octopus/randomfacts/core/shared/PreferenceDataStore.kt new file mode 100644 index 0000000..9a3c1b9 --- /dev/null +++ b/app/src/main/java/org/octopus/randomfacts/core/shared/PreferenceDataStore.kt @@ -0,0 +1,67 @@ +package org.octopus.randomfacts.core.shared + +import android.content.Context +import androidx.datastore.preferences.core.booleanPreferencesKey +import androidx.datastore.preferences.core.edit +import androidx.datastore.preferences.core.intPreferencesKey +import androidx.datastore.preferences.core.longPreferencesKey +import androidx.datastore.preferences.core.stringPreferencesKey +import androidx.datastore.preferences.preferencesDataStore +import kotlinx.coroutines.flow.first + +object PreferenceDataStore { + + val Context.dataStore by preferencesDataStore(name = "coins_prefs") + val COINS_KEY = intPreferencesKey("coins") + val LAST_UPDATE_KEY = longPreferencesKey("last_update") + val LAST_FACT_KEY = stringPreferencesKey("last_fact") + val UNLOCK_PAYWALL_KEY = booleanPreferencesKey("unlocked") + + suspend fun saveCoins(context: Context, coins: Int) { + context.dataStore.edit { prefs -> + prefs[COINS_KEY] = coins + } + } + + suspend fun loadCoins(context: Context): Int { + val prefs = context.dataStore.data.first() + val coins = prefs[COINS_KEY] ?: Const.MAX_COINS + return coins + } + + suspend fun saveTimestamp(context: Context, timestamp: Long) { + context.dataStore.edit { prefs -> + prefs[LAST_UPDATE_KEY] = timestamp + } + } + + suspend fun loadTimestamp(context: Context): Long { + val prefs = context.dataStore.data.first() + return prefs[LAST_UPDATE_KEY] ?: System.currentTimeMillis() + } + + + + suspend fun saveFact(context: Context, fact: String) { + context.dataStore.edit { prefs -> + prefs[LAST_FACT_KEY] = fact + } + } + + suspend fun loadFact(context: Context): String { + val prefs = context.dataStore.data.first() + return prefs[LAST_FACT_KEY] ?: Const.DEFAULT_FACT_PLACEHOLDER + } + + suspend fun saveUnlocked(context: Context, unlocked: Boolean) { + context.dataStore.edit { prefs -> + prefs[UNLOCK_PAYWALL_KEY] = unlocked + } + } + + suspend fun loadUnlocked(context: Context): Boolean { + return context.dataStore.data.first()[UNLOCK_PAYWALL_KEY] == true + } + + +} \ No newline at end of file diff --git a/app/src/main/java/org/octopus/randomfacts/ui/theme/Color.kt b/app/src/main/java/org/octopus/randomfacts/ui/theme/Color.kt new file mode 100644 index 0000000..e17f175 --- /dev/null +++ b/app/src/main/java/org/octopus/randomfacts/ui/theme/Color.kt @@ -0,0 +1,18 @@ +package org.octopus.randomfacts.ui.theme + +import androidx.compose.ui.graphics.Color + +//val Purple80 = Color(0xFFD0BCFF) +val Purple80 = Color(0xFF323232) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +//val Purple40 = Color(0xFF6650a4) +val Purple40 = Color(0xFF323232) +//val PurpleGrey40 = Color(0xFF625b71) +val PurpleGrey40 = Color(0xFF323232) +//val Pink40 = Color(0xFF7D5260) +val Pink40 = Color(0xFF323232) + +val orangeColor = Color(0xFFF57C00) +val greenColor = Color(0xFF00AA00) \ No newline at end of file diff --git a/app/src/main/java/org/octopus/randomfacts/ui/theme/Font.kt b/app/src/main/java/org/octopus/randomfacts/ui/theme/Font.kt new file mode 100644 index 0000000..d64d3d1 --- /dev/null +++ b/app/src/main/java/org/octopus/randomfacts/ui/theme/Font.kt @@ -0,0 +1,11 @@ +package org.octopus.randomfacts.ui.theme + +import androidx.compose.ui.text.font.Font +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import org.octopus.randomfacts.R + +val myFontFamily = FontFamily( + Font(R.font.ubuntu_regular, FontWeight.Normal), + Font(R.font.ubuntu_bold, FontWeight.Bold) +) \ No newline at end of file diff --git a/app/src/main/java/org/octopus/randomfacts/ui/theme/Theme.kt b/app/src/main/java/org/octopus/randomfacts/ui/theme/Theme.kt new file mode 100644 index 0000000..1ab030e --- /dev/null +++ b/app/src/main/java/org/octopus/randomfacts/ui/theme/Theme.kt @@ -0,0 +1,58 @@ +package org.octopus.randomfacts.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40 + + /* Other default colors to override + background = Color(0xFFFFFBFE), + surface = Color(0xFFFFFBFE), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onBackground = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F), + */ +) + +@Composable +fun RandomFactsTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/java/org/octopus/randomfacts/ui/theme/Type.kt b/app/src/main/java/org/octopus/randomfacts/ui/theme/Type.kt new file mode 100644 index 0000000..89d3f82 --- /dev/null +++ b/app/src/main/java/org/octopus/randomfacts/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package org.octopus.randomfacts.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file diff --git a/app/src/main/res/drawable/bg.png b/app/src/main/res/drawable/bg.png new file mode 100644 index 0000000..d928801 Binary files /dev/null and b/app/src/main/res/drawable/bg.png differ 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/font/ubuntu_bold.ttf b/app/src/main/res/font/ubuntu_bold.ttf new file mode 100644 index 0000000..c2293d5 Binary files /dev/null and b/app/src/main/res/font/ubuntu_bold.ttf differ diff --git a/app/src/main/res/font/ubuntu_regular.ttf b/app/src/main/res/font/ubuntu_regular.ttf new file mode 100644 index 0000000..f98a2da Binary files /dev/null and b/app/src/main/res/font/ubuntu_regular.ttf differ diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/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 0000000..c209e78 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ 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 0000000..b2dfe3d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ 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 0000000..4f0f1d6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ 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 0000000..948a307 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ 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 0000000..1b9a695 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..cfdd38e --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Random Facts + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..ddf797c --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +