diff --git a/art-space/.gitignore b/art-space/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/art-space/.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/art-space/.idea/.gitignore b/art-space/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/art-space/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/art-space/.idea/compiler.xml b/art-space/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/art-space/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/art-space/.idea/gradle.xml b/art-space/.idea/gradle.xml new file mode 100644 index 0000000..a2d7c21 --- /dev/null +++ b/art-space/.idea/gradle.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/art-space/.idea/misc.xml b/art-space/.idea/misc.xml new file mode 100644 index 0000000..bdd9278 --- /dev/null +++ b/art-space/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/art-space/.idea/vcs.xml b/art-space/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/art-space/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/art-space/app/.gitignore b/art-space/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/art-space/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/art-space/app/build.gradle b/art-space/app/build.gradle new file mode 100644 index 0000000..69ba912 --- /dev/null +++ b/art-space/app/build.gradle @@ -0,0 +1,63 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} + +android { + namespace 'dev.codeninja.artspace' + compileSdk 33 + + defaultConfig { + applicationId "dev.codeninja.artspace" + minSdk 24 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary true + } + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + buildFeatures { + compose true + } + composeOptions { + kotlinCompilerExtensionVersion '1.2.0' + } + packagingOptions { + resources { + excludes += '/META-INF/{AL2.0,LGPL2.1}' + } + } +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1' + implementation 'androidx.activity:activity-compose:1.3.1' + implementation "androidx.compose.ui:ui:$compose_ui_version" + implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version" + implementation 'androidx.compose.material:material:1.2.0' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_ui_version" + debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version" + debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_version" +} \ No newline at end of file diff --git a/art-space/app/proguard-rules.pro b/art-space/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/art-space/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/art-space/app/release/app-release.apk b/art-space/app/release/app-release.apk new file mode 100644 index 0000000..a8dff7d Binary files /dev/null and b/art-space/app/release/app-release.apk differ diff --git a/art-space/app/release/output-metadata.json b/art-space/app/release/output-metadata.json new file mode 100644 index 0000000..ab92b35 --- /dev/null +++ b/art-space/app/release/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "dev.codeninja.artspace", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "1.0", + "outputFile": "app-release.apk" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/art-space/app/src/androidTest/java/dev/codeninja/artspace/ExampleInstrumentedTest.kt b/art-space/app/src/androidTest/java/dev/codeninja/artspace/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..fc8dcaa --- /dev/null +++ b/art-space/app/src/androidTest/java/dev/codeninja/artspace/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package dev.codeninja.artspace + +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("dev.codeninja.artspace", appContext.packageName) + } +} \ No newline at end of file diff --git a/art-space/app/src/main/AndroidManifest.xml b/art-space/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..ed4a543 --- /dev/null +++ b/art-space/app/src/main/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/art-space/app/src/main/java/dev/codeninja/artspace/MainActivity.kt b/art-space/app/src/main/java/dev/codeninja/artspace/MainActivity.kt new file mode 100644 index 0000000..1656afb --- /dev/null +++ b/art-space/app/src/main/java/dev/codeninja/artspace/MainActivity.kt @@ -0,0 +1,209 @@ +package dev.codeninja.artspace + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.annotation.DrawableRes +import androidx.annotation.StringRes +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.* +import androidx.compose.material.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.res.colorResource +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import dev.codeninja.artspace.ui.theme.ArtSpaceTheme + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + ArtSpaceTheme { + // A surface container using the 'background' color from the theme + Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background) { + ArtSpaceScreen() + } + } + } + } +} + +@Composable +fun ArtSpaceScreen(modifier: Modifier = Modifier) { + val firstArtwork = R.drawable.denji_face + val secondArtwork = R.drawable.zero_two_face + val thirdArtwork = R.drawable.sanji_face + val fourthArtwork = R.drawable.naruto_face + + var title by remember { + mutableStateOf(R.string.denji) + } + + var year by remember { + mutableStateOf(R.string.denji_year) + } + + var currentArtwork by remember { + mutableStateOf(firstArtwork) + } + + var imageResource by remember { + mutableStateOf(currentArtwork) + } + + + Column( + modifier = modifier + .fillMaxWidth(), + horizontalAlignment = Alignment.CenterHorizontally + ) { + ArtworkDisplay(currentArtwork = currentArtwork) + Spacer(modifier = modifier.size(16.dp)) + ArtworkTitle(title = title, year = year) + Spacer(modifier = modifier.size(25.dp)) + Row( + modifier = modifier.padding(horizontal = 8.dp), + horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally) + ) { + // Previous Button + Button( + onClick = { + when (currentArtwork) { + firstArtwork -> { + currentArtwork = fourthArtwork + title = R.string.naruto + year = R.string.naruto_year + } + secondArtwork -> { + currentArtwork = firstArtwork + title = R.string.denji + year = R.string.denji_year + } + thirdArtwork -> { + currentArtwork = secondArtwork + title = R.string.zero_two + year = R.string.zero_two_year + } + else -> { + currentArtwork = thirdArtwork + title = R.string.sanji + year = R.string.sanji_year + } + } + }, + colors = ButtonDefaults.buttonColors( + backgroundColor = colorResource(id = R.color.gray_900) + ), + elevation = ButtonDefaults.elevation( + defaultElevation = 1.dp, + pressedElevation = 0.dp, + focusedElevation = 0.dp + ) + ) { + Text( + text = "Previous", + fontSize = 16.sp, + fontWeight = FontWeight.Medium, + color = colorResource(id = R.color.blue_300) + ) + } + + // Next Button + Button( + onClick = { + when (currentArtwork) { + firstArtwork -> { + currentArtwork = secondArtwork + title = R.string.zero_two + year = R.string.zero_two_year + } + secondArtwork -> { + currentArtwork = thirdArtwork + title = R.string.sanji + year = R.string.sanji_year + } + thirdArtwork -> { + currentArtwork = fourthArtwork + title = R.string.naruto + year = R.string.naruto_year + } + else -> { + currentArtwork = firstArtwork + title = R.string.denji + year = R.string.denji_year + } + } + }, + colors = ButtonDefaults.buttonColors( + backgroundColor = colorResource(id = R.color.blue_300) + ), + elevation = ButtonDefaults.elevation( + defaultElevation = 1.dp, + pressedElevation = 0.dp, + focusedElevation = 0.dp + ) + ) { + Text( + text = "Next", + fontSize = 16.sp, + fontWeight = FontWeight.Medium, + color = colorResource(id = R.color.gray_900) + ) + } + } + } +} + +@Composable +fun ArtworkDisplay( + modifier: Modifier = Modifier, + @DrawableRes currentArtwork: Int +) { + Image( + painter = painterResource(currentArtwork), + contentDescription = stringResource(id = R.string.zero_two), + modifier = modifier.fillMaxWidth(), + contentScale = ContentScale.FillWidth + ) +} + +@Composable +fun ArtworkTitle( + @StringRes title: Int, + @StringRes year: Int +) { + Column ( + horizontalAlignment = Alignment.CenterHorizontally + ) { + // Artwork title + Text( + text = stringResource(id = title), + fontWeight = FontWeight.Bold, + color = colorResource(id = R.color.blue_100), + fontSize = 32.sp + ) + + // Artwork year + Text( + text = "— ${stringResource(id = year)} —", + fontSize = 16.sp, + fontWeight = FontWeight.Medium, + color = colorResource(id = R.color.gray_300) + ) + } +} + +@Preview(showBackground = true) +@Composable +fun DefaultPreview() { + ArtSpaceTheme { + ArtSpaceScreen() + } +} \ No newline at end of file diff --git a/art-space/app/src/main/java/dev/codeninja/artspace/ui/theme/Color.kt b/art-space/app/src/main/java/dev/codeninja/artspace/ui/theme/Color.kt new file mode 100644 index 0000000..42e2d46 --- /dev/null +++ b/art-space/app/src/main/java/dev/codeninja/artspace/ui/theme/Color.kt @@ -0,0 +1,7 @@ +package dev.codeninja.artspace.ui.theme + +import androidx.compose.ui.graphics.Color + +val Teal200 = Color(0xFF03DAC5) +val Blue200 = Color(0xFF3A96DD) +val Blue500 = Color(0xFF247AE4) \ No newline at end of file diff --git a/art-space/app/src/main/java/dev/codeninja/artspace/ui/theme/Shape.kt b/art-space/app/src/main/java/dev/codeninja/artspace/ui/theme/Shape.kt new file mode 100644 index 0000000..4a4889c --- /dev/null +++ b/art-space/app/src/main/java/dev/codeninja/artspace/ui/theme/Shape.kt @@ -0,0 +1,11 @@ +package dev.codeninja.artspace.ui.theme + +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.Shapes +import androidx.compose.ui.unit.dp + +val Shapes = Shapes( + small = RoundedCornerShape(4.dp), + medium = RoundedCornerShape(4.dp), + large = RoundedCornerShape(0.dp) +) \ No newline at end of file diff --git a/art-space/app/src/main/java/dev/codeninja/artspace/ui/theme/Theme.kt b/art-space/app/src/main/java/dev/codeninja/artspace/ui/theme/Theme.kt new file mode 100644 index 0000000..e4d8ce4 --- /dev/null +++ b/art-space/app/src/main/java/dev/codeninja/artspace/ui/theme/Theme.kt @@ -0,0 +1,44 @@ +package dev.codeninja.artspace.ui.theme + +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material.MaterialTheme +import androidx.compose.material.darkColors +import androidx.compose.material.lightColors +import androidx.compose.runtime.Composable + +private val DarkColorPalette = darkColors( + primary = Blue200, + primaryVariant = Blue500, + secondary = Teal200 +) + +private val LightColorPalette = lightColors( + primary = Blue200, + primaryVariant = Blue500, + secondary = Teal200 + + /* Other default colors to override + background = Color.White, + surface = Color.White, + onPrimary = Color.White, + onSecondary = Color.Black, + onBackground = Color.Black, + onSurface = Color.Black, + */ +) + +@Composable +fun ArtSpaceTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) { + val colors = if (darkTheme) { + DarkColorPalette + } else { + LightColorPalette + } + + MaterialTheme( + colors = colors, + typography = Typography, + shapes = Shapes, + content = content + ) +} \ No newline at end of file diff --git a/art-space/app/src/main/java/dev/codeninja/artspace/ui/theme/Type.kt b/art-space/app/src/main/java/dev/codeninja/artspace/ui/theme/Type.kt new file mode 100644 index 0000000..fbf6c4c --- /dev/null +++ b/art-space/app/src/main/java/dev/codeninja/artspace/ui/theme/Type.kt @@ -0,0 +1,28 @@ +package dev.codeninja.artspace.ui.theme + +import androidx.compose.material.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( + body1 = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp + ) + /* Other default text styles to override + button = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.W500, + fontSize = 14.sp + ), + caption = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 12.sp + ) + */ +) \ No newline at end of file diff --git a/art-space/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/art-space/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/art-space/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/art-space/app/src/main/res/drawable/denji_face.jpg b/art-space/app/src/main/res/drawable/denji_face.jpg new file mode 100644 index 0000000..6e18897 Binary files /dev/null and b/art-space/app/src/main/res/drawable/denji_face.jpg differ diff --git a/art-space/app/src/main/res/drawable/ic_launcher_background.xml b/art-space/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..7dcc1e1 --- /dev/null +++ b/art-space/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/art-space/app/src/main/res/drawable/naruto_face.png b/art-space/app/src/main/res/drawable/naruto_face.png new file mode 100644 index 0000000..b5e979e Binary files /dev/null and b/art-space/app/src/main/res/drawable/naruto_face.png differ diff --git a/art-space/app/src/main/res/drawable/sanji_face.png b/art-space/app/src/main/res/drawable/sanji_face.png new file mode 100644 index 0000000..8865358 Binary files /dev/null and b/art-space/app/src/main/res/drawable/sanji_face.png differ diff --git a/art-space/app/src/main/res/drawable/zero_two_face.jpg b/art-space/app/src/main/res/drawable/zero_two_face.jpg new file mode 100644 index 0000000..dc6fe48 Binary files /dev/null and b/art-space/app/src/main/res/drawable/zero_two_face.jpg differ diff --git a/art-space/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/art-space/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/art-space/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/art-space/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/art-space/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/art-space/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/art-space/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml b/art-space/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/art-space/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/art-space/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/art-space/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/art-space/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/art-space/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/art-space/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/art-space/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/art-space/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/art-space/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/art-space/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/art-space/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/art-space/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/art-space/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/art-space/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/art-space/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/art-space/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/art-space/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/art-space/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/art-space/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/art-space/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/art-space/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/art-space/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/art-space/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/art-space/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/art-space/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/art-space/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/art-space/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/art-space/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/art-space/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/art-space/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/art-space/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/art-space/app/src/main/res/values/colors.xml b/art-space/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..e222b0a --- /dev/null +++ b/art-space/app/src/main/res/values/colors.xml @@ -0,0 +1,15 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + #65B4FA + #3A84C6 + #145C9C + #ADADC8 + #16191E + \ No newline at end of file diff --git a/art-space/app/src/main/res/values/strings.xml b/art-space/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..5331e15 --- /dev/null +++ b/art-space/app/src/main/res/values/strings.xml @@ -0,0 +1,11 @@ + + Art Space + Denji + 2023 + Zero Two + 2021 + Sanji + 2022 + Naruto + 2020 + \ No newline at end of file diff --git a/art-space/app/src/main/res/values/themes.xml b/art-space/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..c0f03f6 --- /dev/null +++ b/art-space/app/src/main/res/values/themes.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/art-space/app/src/main/res/xml/backup_rules.xml b/art-space/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..fa0f996 --- /dev/null +++ b/art-space/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/art-space/app/src/main/res/xml/data_extraction_rules.xml b/art-space/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..9ee9997 --- /dev/null +++ b/art-space/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/art-space/app/src/test/java/dev/codeninja/artspace/ExampleUnitTest.kt b/art-space/app/src/test/java/dev/codeninja/artspace/ExampleUnitTest.kt new file mode 100644 index 0000000..fde8f86 --- /dev/null +++ b/art-space/app/src/test/java/dev/codeninja/artspace/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package dev.codeninja.artspace + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/art-space/build.gradle b/art-space/build.gradle new file mode 100644 index 0000000..4daa876 --- /dev/null +++ b/art-space/build.gradle @@ -0,0 +1,10 @@ +buildscript { + ext { + compose_ui_version = '1.2.0' + } +}// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.application' version '7.4.0' apply false + id 'com.android.library' version '7.4.0' apply false + id 'org.jetbrains.kotlin.android' version '1.7.0' apply false +} \ No newline at end of file diff --git a/art-space/gradle.properties b/art-space/gradle.properties new file mode 100644 index 0000000..3c5031e --- /dev/null +++ b/art-space/gradle.properties @@ -0,0 +1,23 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true \ No newline at end of file diff --git a/art-space/gradle/wrapper/gradle-wrapper.jar b/art-space/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/art-space/gradle/wrapper/gradle-wrapper.jar differ diff --git a/art-space/gradle/wrapper/gradle-wrapper.properties b/art-space/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a844acb --- /dev/null +++ b/art-space/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sun Jan 29 20:31:36 WAT 2023 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/art-space/gradlew b/art-space/gradlew new file mode 100644 index 0000000..4f906e0 --- /dev/null +++ b/art-space/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/art-space/gradlew.bat b/art-space/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/art-space/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/art-space/settings.gradle b/art-space/settings.gradle new file mode 100644 index 0000000..8e72fe5 --- /dev/null +++ b/art-space/settings.gradle @@ -0,0 +1,16 @@ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} +rootProject.name = "ArtSpace" +include ':app' diff --git a/calculator/.gitignore b/calculator/.gitignore new file mode 100644 index 0000000..603b140 --- /dev/null +++ b/calculator/.gitignore @@ -0,0 +1,14 @@ +*.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 diff --git a/calculator/.idea/codeStyles/Project.xml b/calculator/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..45b5654 --- /dev/null +++ b/calculator/.idea/codeStyles/Project.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + + + \ No newline at end of file diff --git a/calculator/.idea/codeStyles/codeStyleConfig.xml b/calculator/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/calculator/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/calculator/.idea/gradle.xml b/calculator/.idea/gradle.xml new file mode 100644 index 0000000..169fd0d --- /dev/null +++ b/calculator/.idea/gradle.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/calculator/.idea/misc.xml b/calculator/.idea/misc.xml new file mode 100644 index 0000000..af0bbdd --- /dev/null +++ b/calculator/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/calculator/.idea/runConfigurations.xml b/calculator/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/calculator/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/calculator/app/.gitignore b/calculator/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/calculator/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/calculator/app/build.gradle b/calculator/app/build.gradle new file mode 100644 index 0000000..d26df6f --- /dev/null +++ b/calculator/app/build.gradle @@ -0,0 +1,37 @@ +apply plugin: 'com.android.application' + +apply plugin: 'kotlin-android' + +apply plugin: 'kotlin-android-extensions' + +android { + compileSdkVersion 28 + defaultConfig { + applicationId "cdn.mykotlin" + minSdkVersion 19 + targetSdkVersion 28 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.core:core-ktx:1.1.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + + implementation 'net.objecthunter:exp4j:0.4.8' + + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' +} diff --git a/calculator/app/proguard-rules.pro b/calculator/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/calculator/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 diff --git a/calculator/app/src/androidTest/java/cdn/kotlincalculator/ExampleInstrumentedTest.kt b/calculator/app/src/androidTest/java/cdn/kotlincalculator/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..b431e25 --- /dev/null +++ b/calculator/app/src/androidTest/java/cdn/kotlincalculator/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package cdn.kotlincalculator + +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("cdn.mykotlin", appContext.packageName) + } +} diff --git a/calculator/app/src/main/AndroidManifest.xml b/calculator/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..4fc9429 --- /dev/null +++ b/calculator/app/src/main/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/calculator/app/src/main/java/cdn/kotlincalculator/MainActivity.kt b/calculator/app/src/main/java/cdn/kotlincalculator/MainActivity.kt new file mode 100644 index 0000000..23771f9 --- /dev/null +++ b/calculator/app/src/main/java/cdn/kotlincalculator/MainActivity.kt @@ -0,0 +1,79 @@ +package cdn.kotlincalculator + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import android.util.Log +import android.widget.Toast +import kotlinx.android.synthetic.main.activity_main.* +import net.objecthunter.exp4j.ExpressionBuilder +import java.lang.Exception + +class MainActivity : AppCompatActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + + //Numbers + num0.setOnClickListener { appendVal("0", false) } + num1.setOnClickListener { appendVal("1", false) } + num2.setOnClickListener { appendVal("2", false) } + num3.setOnClickListener { appendVal("3", false) } + num4.setOnClickListener { appendVal("4", false) } + num5.setOnClickListener { appendVal("5", false) } + num6.setOnClickListener { appendVal("6", false) } + num7.setOnClickListener { appendVal("7", false) } + num8.setOnClickListener { appendVal("8", false) } + num9.setOnClickListener { appendVal("9", false) } + numDot.setOnClickListener { appendVal(".", false) } + //Operators + clear.setOnClickListener { appendVal("", true) } + startBracket.setOnClickListener { appendVal(" ( ", false) } + closeBracket.setOnClickListener { appendVal(" ) ", false) } + actionDivide.setOnClickListener { appendVal(" / ", false) } + actionMultiply.setOnClickListener { appendVal(" * ", false) } + actionMinus.setOnClickListener { appendVal(" - ", false) } + actionAdd.setOnClickListener { appendVal(" + ", false) } + + actionBack.setOnClickListener { + val expression = placeholder.text.toString() + if (expression.isNotEmpty()) { + placeholder.text = expression.substring(0, expression.length - 1) + } + + + } + + actionEquals.setOnClickListener { + try { + val expression = ExpressionBuilder(placeholder.text.toString()).build() + val result = expression.evaluate() + val longResult = result.toLong() + if (result == longResult.toDouble()) { + Toast.makeText(this, "Double", Toast.LENGTH_SHORT).show() + answer.text = longResult.toString() + } else + answer.text = result.toString() + + } catch (e: Exception) { + Toast.makeText(this, e.message, Toast.LENGTH_SHORT).show(); + + Log.d("EXCEPTION", "Message: ${e.message}") + } + + } + + + } + + fun appendVal(string: String, isClear: Boolean) { + if (isClear) { + placeholder.text = "" + answer.text = "" +// placeholder.append(string) + } else { + placeholder.append(string) + } + } + +} diff --git a/calculator/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/calculator/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..1f6bb29 --- /dev/null +++ b/calculator/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/calculator/app/src/main/res/drawable/ic_launcher_background.xml b/calculator/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..0d025f9 --- /dev/null +++ b/calculator/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/calculator/app/src/main/res/layout/activity_main.xml b/calculator/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..60912bb --- /dev/null +++ b/calculator/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/calculator/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/calculator/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/calculator/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/calculator/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/calculator/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/calculator/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/calculator/app/src/main/res/mipmap-hdpi/ic_launcher.png b/calculator/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..898f3ed Binary files /dev/null and b/calculator/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/calculator/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/calculator/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..dffca36 Binary files /dev/null and b/calculator/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/calculator/app/src/main/res/mipmap-mdpi/ic_launcher.png b/calculator/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..64ba76f Binary files /dev/null and b/calculator/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/calculator/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/calculator/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..dae5e08 Binary files /dev/null and b/calculator/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/calculator/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/calculator/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..e5ed465 Binary files /dev/null and b/calculator/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/calculator/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/calculator/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..14ed0af Binary files /dev/null and b/calculator/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/calculator/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/calculator/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..b0907ca Binary files /dev/null and b/calculator/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/calculator/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/calculator/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..d8ae031 Binary files /dev/null and b/calculator/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/calculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/calculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..2c18de9 Binary files /dev/null and b/calculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/calculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/calculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..beed3cd Binary files /dev/null and b/calculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/calculator/app/src/main/res/values/colors.xml b/calculator/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..b2a85da --- /dev/null +++ b/calculator/app/src/main/res/values/colors.xml @@ -0,0 +1,11 @@ + + + #8e24aa + #c158dc + #5c007a + #c0ca33 + + #ffffff + #000000 + #616161 + diff --git a/calculator/app/src/main/res/values/strings.xml b/calculator/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..da84630 --- /dev/null +++ b/calculator/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Kotlin Calculator + diff --git a/calculator/app/src/main/res/values/styles.xml b/calculator/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..cf4dd1d --- /dev/null +++ b/calculator/app/src/main/res/values/styles.xml @@ -0,0 +1,33 @@ + + + + + + + + + + diff --git a/calculator/app/src/test/java/cdn/kotlincalculator/ExampleUnitTest.kt b/calculator/app/src/test/java/cdn/kotlincalculator/ExampleUnitTest.kt new file mode 100644 index 0000000..87f6115 --- /dev/null +++ b/calculator/app/src/test/java/cdn/kotlincalculator/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package cdn.kotlincalculator + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} diff --git a/calculator/build.gradle b/calculator/build.gradle new file mode 100644 index 0000000..e3245e7 --- /dev/null +++ b/calculator/build.gradle @@ -0,0 +1,28 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + ext.kotlin_version = '1.3.50' + repositories { + google() + jcenter() + + } + dependencies { + classpath 'com.android.tools.build:gradle:3.5.1' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/calculator/gradle.properties b/calculator/gradle.properties new file mode 100644 index 0000000..23339e0 --- /dev/null +++ b/calculator/gradle.properties @@ -0,0 +1,21 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official diff --git a/calculator/gradle/wrapper/gradle-wrapper.jar b/calculator/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f6b961f Binary files /dev/null and b/calculator/gradle/wrapper/gradle-wrapper.jar differ diff --git a/calculator/gradle/wrapper/gradle-wrapper.properties b/calculator/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..884c4a4 --- /dev/null +++ b/calculator/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sun Oct 20 12:55:06 IST 2019 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/calculator/gradlew b/calculator/gradlew new file mode 100755 index 0000000..cccdd3d --- /dev/null +++ b/calculator/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/calculator/gradlew.bat b/calculator/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/calculator/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/calculator/settings.gradle b/calculator/settings.gradle new file mode 100644 index 0000000..ba588cd --- /dev/null +++ b/calculator/settings.gradle @@ -0,0 +1,2 @@ +include ':app' +rootProject.name='MyKotlin'