From 861671a6c0ba8ee729f119b293fc3e38432c4edc Mon Sep 17 00:00:00 2001 From: Kavimal Wijewardana Date: Fri, 9 May 2025 12:27:16 -0400 Subject: [PATCH 1/7] Move the application configuration to gradle.properties file --- .gitignore | 1 + gradle.properties | 7 ++++++- ui-app/build.gradle.kts | 13 +++++++++---- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 050d011..bdd7259 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ .externalNativeBuild .cxx local.properties +*/release diff --git a/gradle.properties b/gradle.properties index 20e2a01..657eb95 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,4 +20,9 @@ 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 +android.nonTransitiveRClass=true + +# App Properties +appVersionCode = 20250502 +appVersionName = 2025.1.0 +kvColorPaletteApplicationId = com.kavi.droid.color.palette.app \ No newline at end of file diff --git a/ui-app/build.gradle.kts b/ui-app/build.gradle.kts index 4953bf3..6d5cf36 100644 --- a/ui-app/build.gradle.kts +++ b/ui-app/build.gradle.kts @@ -5,16 +5,21 @@ plugins { alias(libs.plugins.kotlin.serialization) } +// App Properties +val appVersionCode: String by project +val appVersionName: String by project +val kvColorPaletteApplicationId: String by project + android { - namespace = "com.kavi.droid.color.palette.app" + namespace = kvColorPaletteApplicationId compileSdk = libs.versions.compilerSdkVersion.get().toInt() defaultConfig { - applicationId = "com.kavi.droid.color.palette.app" + applicationId = kvColorPaletteApplicationId minSdk = libs.versions.minSdkVersion.get().toInt() targetSdk = libs.versions.targetSdkVersion.get().toInt() - versionCode = 1 - versionName = "1.0" + versionCode = appVersionCode.toInt() + versionName = appVersionName testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } From bca3fcb7378018d374bdeaa0f98c1d3635c7ec7b Mon Sep 17 00:00:00 2001 From: Kavimal Wijewardana Date: Fri, 9 May 2025 12:33:21 -0400 Subject: [PATCH 2/7] Create basic html for documentation --- docs/index.html | 20 +++++ docs/static/css/styles.css | 161 +++++++++++++++++++++++++++++++++++++ docs/static/favicon.ico | Bin 0 -> 4279 bytes 3 files changed, 181 insertions(+) create mode 100644 docs/index.html create mode 100644 docs/static/css/styles.css create mode 100644 docs/static/favicon.ico diff --git a/docs/index.html b/docs/index.html new file mode 100644 index 0000000..b3f1bb4 --- /dev/null +++ b/docs/index.html @@ -0,0 +1,20 @@ + + + + + + + Home + + +
+

KvColorPalette-Android Mobile

+
+

App Version: 2025.1.0

+
+
+
+

Copyright © 2025 Kavimal Wijewardana.

+
+ + \ No newline at end of file diff --git a/docs/static/css/styles.css b/docs/static/css/styles.css new file mode 100644 index 0000000..b41e020 --- /dev/null +++ b/docs/static/css/styles.css @@ -0,0 +1,161 @@ +body { + font-family: 'Verdana', sans-serif; + margin: 0; + padding: 1em; +} + +h1 { + text-align: center; + color: #2196F3; + margin: 0px 0px 30px 0px; +} + +h2 { + text-align: start; + color: #2196F3; + margin: 10px 30px; +} + +p { + margin: 20px 30px; + text-align: justify; + text-justify: distribute-all-lines; +} + +ul { + margin: 20px 30px 20px 20px; +} + +.container { + display: grid; + grid-template-columns: 2fr 1fr; +} + +.content { + grid-column: 1 / 2; + padding: 40px 20px 40px 20px; + border-width: 1px; /* width of the border */ + border-style: solid; /* style of the border */ + border-color: #2196F3; + border-radius: 10px; /* round the border with 10px radius */ +} + +.content-center { + display: flex; + align-items: center; /* Vertically center the content */ + justify-content: center; /* Horizontally center the content (optional) */ +} + +.content-end { + grid-column: 2 / 3; + padding: 0px 0px 0px 20px; +} + +.menu { + grid-column: 2 / 3; +} + +.grid-container { + display: grid; + margin: 20px 30px; + grid-template-columns: repeat(3, 1fr); + grid-auto-rows: minmax(100px, auto); + justify-content: space-evenly; + justify-items: center; + align-content: space-evenly; + align-items: center; +} + +.img-background { + padding: 20px; + background-color: #2196F3; + border-radius: 20px; +} + +.caption-text { + color: #2196F3; + text-align: justify; + text-justify: distribute-all-lines; +} + +nav { + background-color: #f5f5f5; /* background color of the nav container */ + padding: 15px; /* padding around the container */ + margin: 0px 20px; +} + +nav ul { + list-style: none; /* remove bullet points from list items */ + margin: 0; /* remove margins from the list */ + padding: 0; /* remove padding from the list */ + text-align: start; /* center the list items */ +} + +nav a { + color: #333; /* text color of the links */ + text-decoration: none; /* remove underline from the links */ + font-size: 18px; /* font size of the links */ +} + +nav a:hover { + color: #0099cc; /* change the text color on hover */ +} + +.footer-content { + padding: 10px 0px 10px 0px; +} + +.footer-para { + text-align: center; +} + +/* Style inputs with type="text", select elements and textareas */ +input[type=text], select, textarea { + width: 100%; /* Full width */ + padding: 12px; /* Some padding */ + border: 1px solid #ccc; /* Gray border */ + border-radius: 4px; /* Rounded borders */ + box-sizing: border-box; /* Make sure that padding and width stays in place */ + margin-top: 6px; /* Add a top margin */ + margin-bottom: 16px; /* Bottom margin */ + resize: vertical /* Allow the user to vertically resize the textarea (not horizontally) */ +} + +/* Style the submit button with a specific background color etc */ +input[type=submit] { + background-color: #2196F3; + color: white; + padding: 12px 20px; + border: none; + border-radius: 4px; + cursor: pointer; +} + +/* When moving the mouse over the submit button, add a darker green color */ +input[type=submit]:hover { + background-color: #45a049; +} + +.contact-info { + display: flex; + flex-direction: column; + gap: 20px; +} + +.info-item { + display: flex; + align-items: center; +} + +.icon { + font-size: 32px; + margin-right: 20px; +} + +.info-item span { + font-size: 24px; +} + +.info-item strong { + font-weight: bold; +} diff --git a/docs/static/favicon.ico b/docs/static/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c1b9298aa77e150df8ffe6ab22b283144d4128b1 GIT binary patch literal 4279 zcmeHLob)jtrsac^Uba*8W0oV*hYhtgo~}~ z`i|AvUxKr*_}rI8!C6AUTE_12ET&Ipd~CC=MYwDbq9$X>38-;uS5nc?0u)cGNy%`V zd&AyfIjVvq0Hnhjz@!ZnfJWI6Kv9eK5;^cV>lcJb?&XQSG$@P2zz+u$P@|%ezzELa zCVzAxf1e1)r1KjD&XT-%lnLlSie%&fgYXaSbby20e_nBkB2YNh-s- z$MLYd>g|71Tof+-nH}nb(zMduFqsXlah%QYfP)TKA%KNUvHbjBN{j6`mg9rQG5`3w zvqu6MX4mY;Th%k7RkFP?PY+6KsO-jSa?qO0OrvEvjj+AtNe$EsaSFo4E+W%{K~c!z ztY7;Sg#aXOFFsjYUTEwS7;&G{Y4QGSdThCMtn4<$!G86#RPMDtIqs$8=b`sI4HKb$ zlJ%BXtQM#J-A0xZ1nc6-UTrx-Et%ZPSywj$6+x8Xi6>=cmJm7c)5fwjRaJkCny#0e zdj~A*{879pHT(TUCid@K(2s1Pozu<_3S+D7IkdRxH^KY#&ZK*;Vq(fw9zUFgA?Zgd zgMm-os7=zDW90#NPU?=#?2c4wjm@oQd&WRwf2;W)_f=>YoYviLApr@Jrj1k4p2o4r z)oOL*(Nd-$E$DST+~HeKAV*!Fc!W$FR~A8?TrLJQP!YrWkkn@|_i1+1%5Ut9l&q(t zLq{-XCaz87;fu~G+2ScW;X`EpMKuwkLw-6x6hc?JmlY$WJ9GVup}EXQmQor?Lnq+H z{JF{Y*Sb;w-wc!J|Al8gYUTJOO0^C534-!({nDvIMclUtEjzV5TJ3v2?`MRB?fl+W zlOzk6r$en`nU#~dsWo=io?uHQfOY{Y%N?-{isvw%F264r1u1i;d8MT^ROF@(BJ39Q z!emQy?@uy)7e9-js>1Rncf&9Qnu^jLP8O;n9OpM2`mRB6s!nh zrQyEj*?UPYv6g>0*yT-5Xsb%>I+%kS3Sh^!$yQt2RCl8+*l<0osv^@Fbd>KNyk02% z9PIt-xe&wC5wjKn9s2@Qg9Ll;7FQp^Ns7KLde;^iyLv<|AU)lSN62>V`P-NP&i^jE<9e4edP_gA4O{@n%s1%MOO?G{pg30144Z8!8`C4pZ4O`!8 z(47`9g}2?wl-`*65mad8m)Ka9@DgLrzO7W7w|Wr9=tBLhhm;5haK)Q^e@ZPqHx4z* z$YaAWHZfm!Z8zzz9_G_~4?G~pUAa;=*fKtg-8~T;m?QNbD8+xv*yyiO5h@x;R_mAR zeY_3Ehy8Qls%$pjs`=fO>GVWJL0I8rxI)O$ePQDj!5+NirT#LNpGGlC8f7R}=<06@~O&sSYcUm*Y-tr~1 z!Z%%<_^*w&n6tejHSVupHvB@AZjlUEcx-DcnABDbJNFy-=4KrjV5JLRN+OQJHtzq9 zSD%4nKS}^xoSsd^);1{{J(4|(^_5VYa)sVmtqN2=gLmu;2f=f{jn`c#&#v;8b9T!y z82Ipgx9&fR-vukt#Fdei6?s-;G{`Mquxo`h4Sb3{ALcz+>9aT$c$rD&j9C|}v+nwZ z{bb71D}8lLnhk%HKVhu#?7=<&5`U|KC`& ze^PtBJoDdI4zWyNcXHhZ3~RH z-ReEWp4@Fo{W3~U0gh7wY`#j>H9!N`GsUqRG!Wv-SnI>)5t4!pjbI9(;> zNpgu9yL*5MksPng&mZI8+^~T@ArT3)ycF9qu=*(LI@>g-{C8MlQ*vM&v>2MWA&etj zx;SsO=FH5vc4%JybSNeBSh^a?H&wa-2c>cYQO5HvN%Y@EYa+I`CIa~7_2VVsd2uqN)Dvc7ka1V3jYtO_3#P394S%=Wu}j z3~>&gm>`zaf~2MqCs>;<33_m%(5(GBMB>)g^QKoppG4#Mic;-~5QC;H5F1xY1hF&n z$Sp@(JyGp(jsxBJZ2+wE(M)8Yczv=bsOwTj8UNPoUvN_?1$LrUfVKmeghL1tt&t^~ zJq)GYTs-wexKLStN9$((#QsF+u`P^80h2Y`%bM~}9AU`xc~J7?U6Z1O1U`{a-Z`2F zeUyn#!-G)lL|JU`d%f{>INQ5#Q>qF+OxtO^GYLu}sW$?-PWWP;eiq$8|NY*dxU{Q>H($DaGhkQifc zQ!YeK2&{^SO56|o(h4DJ;sA2H4~LWMg|{!3$sM2(@?Wo)Mvl(&IQl$+IQ!8xBjV^l zM*k2!pPr2GVSq7_+!V>Z$5%f;h?vNpiCtX#&lxiIHReKa(*0W&;d>)%pw734P8VR7 zVL3yR=7XbTwcZLP-3arx+L!e?aFOv}br%~f@m&4YHjZ!_|JyjqH*qUFpSo*nDKy zd)M84B#)w@=o6*E^(bRd+E0TgNf!}cGdPBSgVD(t+@%y_t1ErSNO`$b^GK)818 zbLTRNEhd+t;d`GsIPMg7hNbTRgtRBm8@Lc5G=bb-Ez1FHo`r}t3(*gM(tIA}AVsKM zmRdv1H=-fDw`(*KuL973mUhAjZHp7@o!E=k)%)r8A~&Rk#8s z$-swa_8z(h$Vf3QCp+aP7i&*ad|OhbR65U5rf5ZZDSK<^*-w+>h)YrTb&a21Y^n++ zRf`2)VVoD8(sC)Kf&<{BP5fzxR>Z^KHO-+0+Rn~%Kty9eNB4D%6?Pb Tf`jMg69J%=v=mF^Enoi+0!YPT literal 0 HcmV?d00001 From 5431fbd83238e5dfa4b2d2f5d6802d7a2301c4f7 Mon Sep 17 00:00:00 2001 From: Kavimal Wijewardana Date: Fri, 9 May 2025 21:50:02 -0400 Subject: [PATCH 3/7] Create privacy-policy.html page --- docs/index.html | 10 +++ docs/privacy-policy.html | 148 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+) create mode 100644 docs/privacy-policy.html diff --git a/docs/index.html b/docs/index.html index b3f1bb4..607c7b0 100644 --- a/docs/index.html +++ b/docs/index.html @@ -6,12 +6,22 @@ Home +

KvColorPalette-Android Mobile

App Version: 2025.1.0

+
+ +

Copyright © 2025 Kavimal Wijewardana.

diff --git a/docs/privacy-policy.html b/docs/privacy-policy.html new file mode 100644 index 0000000..3f6ae3b --- /dev/null +++ b/docs/privacy-policy.html @@ -0,0 +1,148 @@ + + + + + + Privacy Policy + + + + +
+
+

Privacy Policy

+

+ KvApps built the KvColorPalette-Android library and app as a Free app. This service is + provided by KvApps at no cost and is intended for use as is. This is publishing as Open source project. +

+

+ This page is used to inform visitors regarding my policies with the collection, use, and disclosure of + Personal Information if anyone decided to use my Service. +

+

+ If you choose to use my Service, then you agree to the collection and use of information in relation to this + policy. + The Personal Information that I collect is used for providing and improving the Service. I will not use or + share + your information with anyone except as described in this Privacy Policy. +

+

+ The terms used in this Privacy Policy have the same meanings as in our Terms and Conditions, which are + accessible at + KvColorPalette unless otherwise defined in this Privacy Policy. +

+
+ +

Data/Information Collection and Use

+

+ As a reference application for KvColorPalette-Android library this app is not collecting any kind of data from the user. +

+ +
+ +

Log Data

+

+ I want to inform you that whenever you use my Service, in a case of an error in the app I collect data and + information. This Log Data may include information such as your device Internet Protocol (“IP”) address, + device name, operating system version, the configuration of the app when utilizing my Service, the time and + date of your use of the Service, and other statistics. +

+
+ +

Cookies

+

+ Cookies are files with a small amount of data that are commonly used as anonymous unique identifiers. These + are sent to your browser from the + websites that you visit and are stored on your device's internal memory. +

+

+ This Service does not use these “cookies” explicitly. However, the app may use third-party code and + libraries that use “cookies” to collect + information and improve their services. You have the option to either accept or refuse these cookies and + know when a cookie is being sent to your device. If you + choose to refuse our cookies, you may not be able to use some portions of this Service. +

+
+ +

Service Providers

+

+ I may employ third-party companies and individuals due to the following reasons: +

+
    +
  • To facilitate our Service
    • +
  • To provide the Service on our behalf
    • +
  • To perform Service-related services
    • +
  • To assist us in analyzing how our Service is used.
    • +
+

+ I want to inform users of this Service that these third parties have access to their Personal Information. + The reason is to perform the tasks assigned to them on our behalf. However, they are obligated not to disclose + or use the information for any other purpose. +

+
+ +

Security

+

+ I value your trust in providing us your Personal Information, thus we are striving to use commercially + acceptable means of protecting it. But remember that no method of transmission over the internet, + or method of electronic storage is 100% secure and reliable, and I cannot guarantee its absolute security. +

+
+ +

Links to Other Sites

+

+ This Service may contain links to other sites. If you click on a third-party link, you will be directed to + that site. Note that these external sites are not operated by me. Therefore, I strongly advise you to review + the Privacy Policy of these websites. I have no control over and assume no responsibility for the content, + privacy policies, or practices of any third-party sites or services. +

+
+ +

Children’s Privacy

+
+

+ These Services do not address anyone under the age of 13. I do not knowingly collect personally + identifiable information from children under 13 years of age. In the case + I discover that a child under 13 has provided me with personal information, I immediately delete this + from our servers. If you are a parent or guardian, and you are aware that your child has provided us with + personal information, please contact me so that I will be able to do the necessary actions. +

+
+
+ +

Changes to This Privacy Policy

+

+ I may update our Privacy Policy from time to time. Thus, you are advised to review this page periodically + for any changes. I will notify you of any changes by posting the new Privacy Policy on this page. +

+

This policy is effective as of 2025-05-02

+
+ +

Contact Us

+

+ If you have any questions or suggestions about my Privacy Policy, do not hesitate to contact me at kavimalw@gmail.com. or Contact-US +

+
+
+ + +
+
+
+

Copyright © 2025 Kavimal Wijewardana.

+
+ + \ No newline at end of file From b437fbf936b0154f33a98b7d5b7a86b90a6eb5f5 Mon Sep 17 00:00:00 2001 From: Kavimal Wijewardana Date: Mon, 12 May 2025 23:26:01 -0400 Subject: [PATCH 4/7] Made the changes to see the UI better in tablets --- .../app/ui/common/ThemeCommonComposable.kt | 16 +++++++++------- .../dashboard/palette/pager/AlphaPalettePager.kt | 2 ++ .../palette/pager/LightnessPalettePager.kt | 2 ++ .../ui/dashboard/palette/pager/PalettePager.kt | 2 ++ .../palette/pager/SaturationPalettePager.kt | 2 ++ .../app/ui/dashboard/theme/ThemeColorGenTab.kt | 3 ++- 6 files changed, 19 insertions(+), 8 deletions(-) diff --git a/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/common/ThemeCommonComposable.kt b/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/common/ThemeCommonComposable.kt index 488425e..97cf85c 100644 --- a/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/common/ThemeCommonComposable.kt +++ b/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/common/ThemeCommonComposable.kt @@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.wrapContentWidth import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.selection.SelectionContainer import androidx.compose.material3.MaterialTheme @@ -67,7 +68,8 @@ fun ThemeColorRow(givenColor: Color) { elevation = 10.dp, shape = RoundedCornerShape(8.dp) ) - .background(Color.White), + .background(Color.White) + .wrapContentWidth(), verticalAlignment = Alignment.CenterVertically ) { Box (modifier = Modifier @@ -86,8 +88,8 @@ fun ThemeColorRow(givenColor: Color) { ) } - Column(modifier = Modifier - .fillMaxWidth(), + Column(modifier = Modifier, + //.fillMaxWidth(), verticalArrangement = Arrangement.Center, ) { val appThemeColorSet = KvColorPalette.instance.generateThemeColorSchemePalette( @@ -98,8 +100,8 @@ fun ThemeColorRow(givenColor: Color) { Row( modifier = Modifier - .fillMaxWidth() - .padding(top = 4.dp, start = 8.dp, end = 8.dp, bottom = 4.dp), + //.fillMaxWidth() + .padding(top = 4.dp, start = 8.dp, end = 16.dp, bottom = 4.dp), //horizontalArrangement = Arrangement.Center ) { ColorCircle(appThemeColorSet.lightColorScheme.primary, colorLetter = "P") @@ -113,8 +115,8 @@ fun ThemeColorRow(givenColor: Color) { Row( modifier = Modifier - .fillMaxWidth() - .padding(top = 4.dp, start = 8.dp, end = 8.dp, bottom = 4.dp), + //.fillMaxWidth() + .padding(top = 4.dp, start = 8.dp, end = 16.dp, bottom = 4.dp), //horizontalArrangement = Arrangement.Center ) { ColorCircle(appThemeColorSet.darkColorScheme.primary, colorLetter = "P") diff --git a/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/dashboard/palette/pager/AlphaPalettePager.kt b/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/dashboard/palette/pager/AlphaPalettePager.kt index d419059..a1168ec 100644 --- a/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/dashboard/palette/pager/AlphaPalettePager.kt +++ b/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/dashboard/palette/pager/AlphaPalettePager.kt @@ -14,6 +14,7 @@ import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview @@ -51,6 +52,7 @@ fun AlphaPalettePager() { modifier = Modifier .fillMaxWidth() .padding(top = 8.dp, start = 16.dp, end = 16.dp, bottom = 8.dp), + horizontalAlignment = Alignment.CenterHorizontally ) { AlphaPaletteColorRow(givenColor = MatPackage.MatRed, selectedColor = selectedColor) { color -> selectedColor = color } AlphaPaletteColorRow(givenColor = MatPackage.MatRose, selectedColor = selectedColor) { color -> selectedColor = color } diff --git a/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/dashboard/palette/pager/LightnessPalettePager.kt b/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/dashboard/palette/pager/LightnessPalettePager.kt index 9e8c9c8..be2d491 100644 --- a/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/dashboard/palette/pager/LightnessPalettePager.kt +++ b/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/dashboard/palette/pager/LightnessPalettePager.kt @@ -13,6 +13,7 @@ import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview @@ -50,6 +51,7 @@ fun LightnessPalettePager() { modifier = Modifier .fillMaxWidth() .padding(top = 8.dp, start = 16.dp, end = 16.dp, bottom = 8.dp), + horizontalAlignment = Alignment.CenterHorizontally ) { LightnessPaletteColorRow(givenColor = MatPackage.MatRed, selectedColor = selectedColor) { color -> selectedColor = color } LightnessPaletteColorRow(givenColor = MatPackage.MatRose, selectedColor = selectedColor) { color -> selectedColor = color } diff --git a/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/dashboard/palette/pager/PalettePager.kt b/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/dashboard/palette/pager/PalettePager.kt index 58859df..cc1ec75 100644 --- a/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/dashboard/palette/pager/PalettePager.kt +++ b/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/dashboard/palette/pager/PalettePager.kt @@ -13,6 +13,7 @@ import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp @@ -49,6 +50,7 @@ fun PalettePager() { modifier = Modifier .fillMaxWidth() .padding(top = 8.dp, start = 16.dp, end = 16.dp, bottom = 8.dp), + horizontalAlignment = Alignment.CenterHorizontally ) { PaletteColorRow(givenColor = MatPackage.MatRed, selectedColor = selectedColor) { color -> selectedColor = color } PaletteColorRow(givenColor = MatPackage.MatRose, selectedColor = selectedColor) { color -> selectedColor = color } diff --git a/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/dashboard/palette/pager/SaturationPalettePager.kt b/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/dashboard/palette/pager/SaturationPalettePager.kt index a7a3658..184be86 100644 --- a/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/dashboard/palette/pager/SaturationPalettePager.kt +++ b/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/dashboard/palette/pager/SaturationPalettePager.kt @@ -13,6 +13,7 @@ import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview @@ -50,6 +51,7 @@ fun SaturationPalettePager() { modifier = Modifier .fillMaxWidth() .padding(top = 8.dp, start = 16.dp, end = 16.dp, bottom = 8.dp), + horizontalAlignment = Alignment.CenterHorizontally ) { SaturationPaletteColorRow(givenColor = MatPackage.MatRed, selectedColor = selectedColor) { color -> selectedColor = color } SaturationPaletteColorRow(givenColor = MatPackage.MatRose, selectedColor = selectedColor) { color -> selectedColor = color } diff --git a/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/dashboard/theme/ThemeColorGenTab.kt b/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/dashboard/theme/ThemeColorGenTab.kt index ac3bac1..5c088c2 100644 --- a/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/dashboard/theme/ThemeColorGenTab.kt +++ b/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/dashboard/theme/ThemeColorGenTab.kt @@ -47,7 +47,8 @@ fun ThemeColorGenTab(navController: NavHostController, modifier: Modifier) { modifier = Modifier .fillMaxWidth() .fillMaxHeight() - .verticalScroll(rememberScrollState()) + .verticalScroll(rememberScrollState()), + horizontalAlignment = Alignment.CenterHorizontally ) { ThemeColorRow(MatPackage.MatRed.color) ThemeColorRow(MatPackage.MatOrange.color) From f20a2b9315c7e4267675beda4fd0814990d6c094 Mon Sep 17 00:00:00 2001 From: Kavimal Wijewardana Date: Mon, 12 May 2025 23:57:53 -0400 Subject: [PATCH 5/7] Update the version code for new release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 657eb95..8b2a12e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,6 +23,6 @@ kotlin.code.style=official android.nonTransitiveRClass=true # App Properties -appVersionCode = 20250502 +appVersionCode = 20250504 appVersionName = 2025.1.0 kvColorPaletteApplicationId = com.kavi.droid.color.palette.app \ No newline at end of file From 0e1f8cf18b4f29309ffe78a17a41fd9a34d1cd18 Mon Sep 17 00:00:00 2001 From: Kavimal Wijewardana Date: Wed, 14 May 2025 00:19:44 -0400 Subject: [PATCH 6/7] Add the horizontal scroller to the theme gen UI --- .../palette/app/ui/common/ThemeCommonComposable.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/common/ThemeCommonComposable.kt b/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/common/ThemeCommonComposable.kt index 97cf85c..8127424 100644 --- a/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/common/ThemeCommonComposable.kt +++ b/ui-app/src/main/kotlin/com/kavi/droid/color/palette/app/ui/common/ThemeCommonComposable.kt @@ -3,6 +3,7 @@ package com.kavi.droid.color.palette.app.ui.common import androidx.compose.foundation.Canvas import androidx.compose.foundation.background import androidx.compose.foundation.border +import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -14,6 +15,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.wrapContentWidth +import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.selection.SelectionContainer import androidx.compose.material3.MaterialTheme @@ -100,9 +102,8 @@ fun ThemeColorRow(givenColor: Color) { Row( modifier = Modifier - //.fillMaxWidth() - .padding(top = 4.dp, start = 8.dp, end = 16.dp, bottom = 4.dp), - //horizontalArrangement = Arrangement.Center + .padding(top = 4.dp, start = 8.dp, end = 16.dp, bottom = 4.dp) + .horizontalScroll(rememberScrollState()), ) { ColorCircle(appThemeColorSet.lightColorScheme.primary, colorLetter = "P") ColorCircle(appThemeColorSet.lightColorScheme.secondary, colorLetter = "S") @@ -115,9 +116,8 @@ fun ThemeColorRow(givenColor: Color) { Row( modifier = Modifier - //.fillMaxWidth() - .padding(top = 4.dp, start = 8.dp, end = 16.dp, bottom = 4.dp), - //horizontalArrangement = Arrangement.Center + .padding(top = 4.dp, start = 8.dp, end = 16.dp, bottom = 4.dp) + .horizontalScroll(rememberScrollState()), ) { ColorCircle(appThemeColorSet.darkColorScheme.primary, colorLetter = "P") ColorCircle(appThemeColorSet.darkColorScheme.secondary, colorLetter = "S", letterColor = Color.Black) From f331bed666cfbf419efe560a7ba5890d1d747cc8 Mon Sep 17 00:00:00 2001 From: Kavimal Wijewardana Date: Wed, 14 May 2025 00:28:16 -0400 Subject: [PATCH 7/7] Enable minification for release build --- gradle.properties | 2 +- ui-app/build.gradle.kts | 8 +++----- ui-app/proguard-rules.pro | 18 +++++++++++++++++- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8b2a12e..c36041d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,6 +23,6 @@ kotlin.code.style=official android.nonTransitiveRClass=true # App Properties -appVersionCode = 20250504 +appVersionCode = 20250506 appVersionName = 2025.1.0 kvColorPaletteApplicationId = com.kavi.droid.color.palette.app \ No newline at end of file diff --git a/ui-app/build.gradle.kts b/ui-app/build.gradle.kts index 6d5cf36..6f13078 100644 --- a/ui-app/build.gradle.kts +++ b/ui-app/build.gradle.kts @@ -26,11 +26,9 @@ android { buildTypes { release { - isMinifyEnabled = false - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) + isMinifyEnabled = true + isDebuggable = false + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") } } compileOptions { diff --git a/ui-app/proguard-rules.pro b/ui-app/proguard-rules.pro index 481bb43..86dc136 100644 --- a/ui-app/proguard-rules.pro +++ b/ui-app/proguard-rules.pro @@ -18,4 +18,20 @@ # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +#-renamesourcefileattribute SourceFile + +# Keep `Companion` object fields of serializable classes. +# This avoids serializer lookup through `getDeclaredClasses` as done for named companion objects. +-if @kotlinx.serialization.Serializable class ** +-keepclassmembers class <1> { + static <1>$Companion Companion; +} + +# Keep `serializer()` on companion objects (both default and named) of serializable classes. +-if @kotlinx.serialization.Serializable class ** { + static **$* *; +} +-keepclassmembers class <2>$<3> { + kotlinx.serialization.KSerializer serializer(...); +} +