diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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 + + http://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. diff --git a/README.md b/README.md index 149ce5d..26b8ebb 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ The library provides a set of classes and methods for creating and managing filt ``` ``` ### layout.xml - + + +## License +``` +Copyright 2021 SmartSense Solutions +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 + http://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. +``` diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b1b84ed..63e6e9f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -4,17 +4,16 @@ plugins { } android { - namespace = "com.ss.smartfilter" + namespace = "com.ss.smartfilterdemo" compileSdk = 34 defaultConfig { - applicationId = "com.ss.smartfilter" + applicationId = "com.ss.smartfilterdemo" minSdk = 24 targetSdk = 34 versionCode = 1 versionName = "1.0" - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { useSupportLibrary = true } @@ -51,7 +50,7 @@ android { } dependencies { - implementation(project(":ss-smart-filter")) + implementation(project(":smartFilter")) implementation (libs.androidx.appcompat) implementation (libs.material) implementation(libs.androidx.core.ktx) @@ -64,12 +63,7 @@ dependencies { implementation(libs.androidx.material3) implementation(libs.androidx.navigation.runtime.ktx) implementation(libs.androidx.navigation.compose) - 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) + } \ No newline at end of file diff --git a/app/src/androidTest/java/com/ss/smartfilter/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/ss/smartfilter/ExampleInstrumentedTest.kt deleted file mode 100644 index b81e95b..0000000 --- a/app/src/androidTest/java/com/ss/smartfilter/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.ss.smartfilter - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.ss.smartfilter", appContext.packageName) - } -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ec89657..3e003d5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,7 +13,7 @@ android:theme="@style/Theme.SmartFilter" tools:targetApi="31"> diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..7ec542e Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/com/ss/smartfilter/Utils.kt b/app/src/main/java/com/ss/smartfilter/Utils.kt deleted file mode 100644 index 4c0c69f..0000000 --- a/app/src/main/java/com/ss/smartfilter/Utils.kt +++ /dev/null @@ -1,243 +0,0 @@ -package com.ss.smartfilter - -import android.view.ViewGroup -import com.ss.smartfilter.data.mAmenties -import com.ss.smartfilter.data.mBusOperatorType -import com.ss.smartfilter.data.mBusType -import com.ss.smartfilter.data.mData -import com.ss.smartfilter.data.mDeal -import com.ss.smartfilter.data.mOperatorType -import com.ss.smartfilter.data.mSeatType -import com.ss.smartfilter.data.mTime -import com.ss.smartfilterlib.R -import com.ss.smartfilterlib.data.Data -import com.ss.smartfilterlib.data.MultiSelectionParams -import com.ss.smartfilterlib.data.SingleSelectionParams -import com.ss.smartfilterlib.utils.MultiChipType -import com.ss.smartfilterlib.utils.Orientation -import com.ss.smartfilterlib.utils.Params -import com.ss.smartfilterlib.utils.SingleChipType - - -/** - * created by Mala Ruparel ON 23/04/24 - */ -fun addRadioGroupSingleLineVertical(rootView: ViewGroup,onItemSelected: (Data) -> Unit) = Params.SingleSelection( - SingleSelectionParams( - rootView = rootView, - chipType = SingleChipType.NONE, - orientation = Orientation.VERTICAL, - mData = mData(), - onItemSelected = onItemSelected, - bgSelector = R.drawable.rb_selector, - textSelector = R.color.text_selector - ) - ) - -fun addRadioGroupSingleLineHorizontal(rootView: ViewGroup,onItemSelected: (Data) -> Unit) = Params.SingleSelection( - SingleSelectionParams( - rootView = rootView, - chipType = SingleChipType.NONE, - orientation = Orientation.HORIZONTAL, - mData = mData(), - onItemSelected = onItemSelected, - bgSelector = R.drawable.rb_selector, - textSelector = R.color.text_selector - ) - ) - -fun addRadioButtonMultiRow(rootView: ViewGroup, onItemSelected: (Data) -> Unit) = Params.SingleSelection( - SingleSelectionParams( - rootView = rootView, - chipType = SingleChipType.NONE, - orientation = Orientation.VERTICAL, - mData = mData(), - onItemSelected = onItemSelected, - bgSelector = R.drawable.multiline_bg_selector, - textSelector = R.color.multiline_text_selector - ) - ) - - -fun addRadioGroupRowItemHorizontal(rootView: ViewGroup,onItemSelected: (Data) -> Unit) = Params.SingleSelection( - SingleSelectionParams( - rootView = rootView, - chipType = SingleChipType.NONE, - orientation = Orientation.HORIZONTAL, - mData = mData(), - onItemSelected = onItemSelected, - bgSelector = R.drawable.row_item_selector, - textSelector = R.color.text_selector - - ) -) -fun addRadioGroupRowItemVertical(rootView: ViewGroup,onItemSelected: (Data) -> Unit) = Params.SingleSelection( - SingleSelectionParams( - rootView = rootView, - chipType = SingleChipType.NONE, - orientation = Orientation.VERTICAL, - mData = mData(), - onItemSelected = onItemSelected, - bgSelector = R.drawable.row_item_selector, - textSelector = R.color.text_selector - - ) -) - -fun addSingleSelectionChipGroupVertical(rootView: ViewGroup, onItemSelected: (Data) -> Unit) = Params.SingleSelection( - SingleSelectionParams( - rootView = rootView, - chipType = SingleChipType.ACTION_CHIP, - orientation = Orientation.VERTICAL, - mData = mData(), - onItemSelected = onItemSelected, - bgSelector = R.color.chip_bg_selector, - textSelector = R.color.chip_text_selector - ) - ) -fun addSingleSelectionChipGroupHorizontal(rootView: ViewGroup, onItemSelected: (Data) -> Unit) = Params.SingleSelection( - SingleSelectionParams( - rootView = rootView, - chipType = SingleChipType.ENTRY_CHIP, - orientation = Orientation.HORIZONTAL, - mData = mData(), - onItemSelected = onItemSelected, - bgSelector = R.color.chip_bg_selector, - textSelector = R.color.chip_text_selector - ) - ) -fun addMultiSelectionChipGroupVertical(rootView: ViewGroup, onItemsSelected: (List) -> Unit) = Params.MultiSelection( - MultiSelectionParams( - rootView = rootView, - chipType = MultiChipType.ACTION_CHIP, - orientation = Orientation.VERTICAL, - mData = mData(), - onItemsSelected = onItemsSelected, - bgSelector = R.color.chip_bg_selector, - textSelector = R.color.chip_text_selector - ) - ) - - -fun addMultiSelectionChipGroupHorizontal(rootView: ViewGroup, onItemsSelected: (List) -> Unit) =Params.MultiSelection( - MultiSelectionParams( - rootView = rootView, - chipType = MultiChipType.FILTER_CHIP, - orientation = Orientation.HORIZONTAL, - mData = mData(), - onItemsSelected = onItemsSelected, - bgSelector = R.color.chip_bg_selector, - textSelector = R.color.chip_text_selector - ) - ) -fun addSingleSelectionListHorizontal(rootView: ViewGroup, onItemselected: (Data) -> Unit) = Params.SingleSelection( - SingleSelectionParams( - rootView = rootView, - chipType = SingleChipType.NONE, - orientation = Orientation.HORIZONTAL, - mData = mData(), - onItemSelected = onItemselected, - bgSelector = R.drawable.multiline_bg_selector, - textSelector = R.color.chip_text_selector - ) - ) -fun addSingleSelectionListVertical(rootView: ViewGroup, onItemselected: (Data) -> Unit) = Params.SingleSelection( - SingleSelectionParams( - rootView = rootView, - chipType = SingleChipType.NONE, - orientation = Orientation.VERTICAL, - mData = mData(), - onItemSelected = onItemselected, - bgSelector = R.drawable.multiline_bg_selector, - textSelector = R.color.chip_text_selector - ) -) -fun addMultiSelectionListVertical(rootView: ViewGroup, onItemsSelected: (List) -> Unit) = Params.MultiSelection( - MultiSelectionParams( - rootView = rootView, - chipType = MultiChipType.NONE, - orientation = Orientation.VERTICAL, - mData = mData(), - onItemsSelected = onItemsSelected, - bgSelector = R.drawable.multiline_bg_selector, - textSelector = R.color.chip_text_selector - ) - ) -fun addMultiSelectionListBus(rootView: ViewGroup, onItemsSelected: (List) -> Unit) = Params.MultiSelection( - MultiSelectionParams( - rootView = rootView, - chipType = MultiChipType.NONE, - orientation = Orientation.HORIZONTAL, - mData = mBusType(), - onItemsSelected = onItemsSelected, - bgSelector = R.drawable.multiline_bg_selector, - textSelector = R.color.chip_text_selector - ) -) -fun addSingleSelectionListSeat(rootView: ViewGroup, onItemsSelected: (Data) -> Unit) = Params.SingleSelection( - SingleSelectionParams( - rootView = rootView, - chipType = SingleChipType.NONE, - orientation = Orientation.HORIZONTAL, - mData = mSeatType(), - onItemSelected = onItemsSelected, - bgSelector = R.drawable.multiline_bg_selector, - textSelector = R.color.chip_text_selector - ) -) -fun addRadioGroupSingleOperator(rootView: ViewGroup,onItemSelected: (Data) -> Unit) = Params.SingleSelection( - SingleSelectionParams( - rootView = rootView, - chipType = SingleChipType.NONE, - orientation = Orientation.VERTICAL, - mData = mOperatorType(), - onItemSelected = onItemSelected, - bgSelector = R.drawable.star_selector, - textSelector = R.color.text_selector - ) -) - fun addRadioGroupSingleBusOperator(rootView: ViewGroup,onItemSelected: (Data) -> Unit) = Params.SingleSelection( - SingleSelectionParams( - rootView = rootView, - chipType = SingleChipType.NONE, - orientation = Orientation.VERTICAL, - mData = mBusOperatorType(), - onItemSelected = onItemSelected, - bgSelector = R.drawable.check_selector, - textSelector = R.color.text_selector - ) -) -fun addMultiSelectionChipGroupAmenties(rootView: ViewGroup, onItemsSelected: (List) -> Unit) = Params.MultiSelection( - MultiSelectionParams( - rootView = rootView, - chipType = MultiChipType.ENTRY_CHIP, - orientation = Orientation.VERTICAL, - mData = mAmenties(), - onItemsSelected = onItemsSelected, - bgSelector = R.color.chip_bg_selector, - textSelector = R.color.chip_text_selector - ) -) - -fun addRadioGroupSingleLineHorizontalDeal(rootView: ViewGroup,onItemSelected: (Data) -> Unit) = Params.SingleSelection( - SingleSelectionParams( - rootView = rootView, - chipType = SingleChipType.NONE, - orientation = Orientation.VERTICAL, - mData = mDeal(), - onItemSelected = onItemSelected, - bgSelector = R.drawable.rb_selector, - textSelector = R.color.text_selector - ) -) -fun addRadioMultiRowDeparture(rootView: ViewGroup, onItemSelected: (Data) -> Unit) = Params.SingleSelection( - SingleSelectionParams( - rootView = rootView, - chipType = SingleChipType.NONE, - orientation = Orientation.VERTICAL, - mData = mTime(), - onItemSelected = onItemSelected, - bgSelector = R.drawable.multiline_bg_selector, - textSelector = R.color.multiline_text_selector - ) -) diff --git a/app/src/main/java/com/ss/smartfilter/MainActivity.kt b/app/src/main/java/com/ss/smartfilterdemo/MainActivity.kt similarity index 77% rename from app/src/main/java/com/ss/smartfilter/MainActivity.kt rename to app/src/main/java/com/ss/smartfilterdemo/MainActivity.kt index b83072a..c0733c3 100644 --- a/app/src/main/java/com/ss/smartfilter/MainActivity.kt +++ b/app/src/main/java/com/ss/smartfilterdemo/MainActivity.kt @@ -1,11 +1,11 @@ -package com.ss.smartfilter +package com.ss.smartfilterdemo import android.os.Bundle import androidx.activity.compose.setContent import androidx.appcompat.app.AppCompatActivity import androidx.compose.material3.Surface -import com.ss.smartfilter.screens.FilterScreen -import com.ss.smartfilter.theme.smartFilterTheme +import com.ss.smartfilterdemo.screens.FilterScreen +import com.ss.smartfilterdemo.theme.smartFilterTheme class MainActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/ss/smartfilterdemo/Utils.kt b/app/src/main/java/com/ss/smartfilterdemo/Utils.kt new file mode 100644 index 0000000..4184fa6 --- /dev/null +++ b/app/src/main/java/com/ss/smartfilterdemo/Utils.kt @@ -0,0 +1,276 @@ +package com.ss.smartfilterdemo + +import android.view.ViewGroup +import com.ss.smartfilterdemo.data.mAmenties +import com.ss.smartfilterdemo.data.mBusOperatorType +import com.ss.smartfilterdemo.data.mBusType +import com.ss.smartfilterdemo.data.mData +import com.ss.smartfilterdemo.data.mDeal +import com.ss.smartfilterdemo.data.mOperatorType +import com.ss.smartfilterdemo.data.mSeatType +import com.ss.smartfilterdemo.data.mTime +import com.ss.smartfilter.data.Data +import com.ss.smartfilter.data.MultiSelectionParams +import com.ss.smartfilter.data.SingleSelectionParams +import com.ss.smartfilter.utils.MultiChipType +import com.ss.smartfilter.utils.Orientation +import com.ss.smartfilter.utils.Params +import com.ss.smartfilter.utils.SingleChipType +import com.ss.smartfilter.R + + +/** + * created by Mala Ruparel ON 23/04/24 + */ +fun addRadioGroupSingleLineVertical(rootView: ViewGroup, onItemSelected: (Data) -> Unit) = + Params.SingleSelection( + SingleSelectionParams( + rootView = rootView, + chipType = SingleChipType.NONE, + orientation = Orientation.VERTICAL, + mData = mData(), + onItemSelected = onItemSelected, + bgSelector = R.drawable.rb_selector, + textSelector = R.color.text_selector + ) + ) + +fun addRadioGroupSingleLineHorizontal(rootView: ViewGroup, onItemSelected: (Data) -> Unit) = + Params.SingleSelection( + SingleSelectionParams( + rootView = rootView, + chipType = SingleChipType.NONE, + orientation = Orientation.HORIZONTAL, + mData = mData(), + onItemSelected = onItemSelected, + bgSelector = R.drawable.rb_selector, + textSelector = R.color.text_selector + ) + ) + +fun addRadioButtonMultiRow(rootView: ViewGroup, onItemSelected: (Data) -> Unit) = + Params.SingleSelection( + SingleSelectionParams( + rootView = rootView, + chipType = SingleChipType.NONE, + orientation = Orientation.VERTICAL, + mData = mData(), + onItemSelected = onItemSelected, + bgSelector = R.drawable.multiline_bg_selector, + textSelector = R.color.multiline_text_selector + ) + ) + + +fun addRadioGroupRowItemHorizontal(rootView: ViewGroup, onItemSelected: (Data) -> Unit) = + Params.SingleSelection( + SingleSelectionParams( + rootView = rootView, + chipType = SingleChipType.NONE, + orientation = Orientation.HORIZONTAL, + mData = mData(), + onItemSelected = onItemSelected, + bgSelector = R.drawable.row_item_selector, + textSelector = R.color.text_selector + + ) + ) + +fun addRadioGroupRowItemVertical(rootView: ViewGroup, onItemSelected: (Data) -> Unit) = + Params.SingleSelection( + SingleSelectionParams( + rootView = rootView, + chipType = SingleChipType.NONE, + orientation = Orientation.VERTICAL, + mData = mData(), + onItemSelected = onItemSelected, + bgSelector = R.drawable.row_item_selector, + textSelector = R.color.text_selector + + ) + ) + +fun addSingleSelectionChipGroupVertical(rootView: ViewGroup, onItemSelected: (Data) -> Unit) = + Params.SingleSelection( + SingleSelectionParams( + rootView = rootView, + chipType = SingleChipType.ACTION_CHIP, + orientation = Orientation.VERTICAL, + mData = mData(), + onItemSelected = onItemSelected, + bgSelector = R.color.chip_bg_selector, + textSelector = R.color.chip_text_selector + ) + ) + +fun addSingleSelectionChipGroupHorizontal(rootView: ViewGroup, onItemSelected: (Data) -> Unit) = + Params.SingleSelection( + SingleSelectionParams( + rootView = rootView, + chipType = SingleChipType.ENTRY_CHIP, + orientation = Orientation.HORIZONTAL, + mData = mData(), + onItemSelected = onItemSelected, + bgSelector = R.color.chip_bg_selector, + textSelector = R.color.chip_text_selector + ) + ) + +fun addMultiSelectionChipGroupVertical(rootView: ViewGroup, onItemsSelected: (List) -> Unit) = + Params.MultiSelection( + MultiSelectionParams( + rootView = rootView, + chipType = MultiChipType.ACTION_CHIP, + orientation = Orientation.VERTICAL, + mData = mData(), + onItemsSelected = onItemsSelected, + bgSelector = R.color.chip_bg_selector, + textSelector = R.color.chip_text_selector + ) + ) + + +fun addMultiSelectionChipGroupHorizontal( + rootView: ViewGroup, + onItemsSelected: (List) -> Unit +) = Params.MultiSelection( + MultiSelectionParams( + rootView = rootView, + chipType = MultiChipType.FILTER_CHIP, + orientation = Orientation.HORIZONTAL, + mData = mData(), + onItemsSelected = onItemsSelected, + bgSelector = R.color.chip_bg_selector, + textSelector = R.color.chip_text_selector + ) +) + +fun addSingleSelectionListHorizontal(rootView: ViewGroup, onItemselected: (Data) -> Unit) = + Params.SingleSelection( + SingleSelectionParams( + rootView = rootView, + chipType = SingleChipType.NONE, + orientation = Orientation.HORIZONTAL, + mData = mData(), + onItemSelected = onItemselected, + bgSelector = R.drawable.multiline_bg_selector, + textSelector = R.color.chip_text_selector + ) + ) + +fun addSingleSelectionListVertical(rootView: ViewGroup, onItemselected: (Data) -> Unit) = + Params.SingleSelection( + SingleSelectionParams( + rootView = rootView, + chipType = SingleChipType.NONE, + orientation = Orientation.VERTICAL, + mData = mData(), + onItemSelected = onItemselected, + bgSelector = R.drawable.multiline_bg_selector, + textSelector = R.color.chip_text_selector + ) + ) + +fun addMultiSelectionListVertical(rootView: ViewGroup, onItemsSelected: (List) -> Unit) = + Params.MultiSelection( + MultiSelectionParams( + rootView = rootView, + chipType = MultiChipType.NONE, + orientation = Orientation.VERTICAL, + mData = mData(), + onItemsSelected = onItemsSelected, + bgSelector = R.drawable.multiline_bg_selector, + textSelector = R.color.chip_text_selector + ) + ) + +fun addMultiSelectionListBus(rootView: ViewGroup, onItemsSelected: (List) -> Unit) = + Params.MultiSelection( + MultiSelectionParams( + rootView = rootView, + chipType = MultiChipType.NONE, + orientation = Orientation.HORIZONTAL, + mData = mBusType(), + onItemsSelected = onItemsSelected, + bgSelector = R.drawable.multiline_bg_selector, + textSelector = R.color.chip_text_selector + ) + ) + +fun addSingleSelectionListSeat(rootView: ViewGroup, onItemsSelected: (Data) -> Unit) = + Params.SingleSelection( + SingleSelectionParams( + rootView = rootView, + chipType = SingleChipType.NONE, + orientation = Orientation.HORIZONTAL, + mData = mSeatType(), + onItemSelected = onItemsSelected, + bgSelector = R.drawable.multiline_bg_selector, + textSelector = R.color.chip_text_selector + ) + ) + +fun addRadioGroupSingleOperator(rootView: ViewGroup, onItemSelected: (Data) -> Unit) = + Params.SingleSelection( + SingleSelectionParams( + rootView = rootView, + chipType = SingleChipType.NONE, + orientation = Orientation.VERTICAL, + mData = mOperatorType(), + onItemSelected = onItemSelected, + bgSelector = R.drawable.star_selector, + textSelector = R.color.text_selector + ) + ) + +fun addRadioGroupSingleBusOperator(rootView: ViewGroup, onItemSelected: (Data) -> Unit) = + Params.SingleSelection( + SingleSelectionParams( + rootView = rootView, + chipType = SingleChipType.NONE, + orientation = Orientation.VERTICAL, + mData = mBusOperatorType(), + onItemSelected = onItemSelected, + bgSelector = R.drawable.check_selector, + textSelector = R.color.text_selector + ) + ) + +fun addMultiSelectionChipGroupAmenties(rootView: ViewGroup, onItemsSelected: (List) -> Unit) = + Params.MultiSelection( + MultiSelectionParams( + rootView = rootView, + chipType = MultiChipType.ENTRY_CHIP, + orientation = Orientation.VERTICAL, + mData = mAmenties(), + onItemsSelected = onItemsSelected, + bgSelector = R.color.chip_bg_selector, + textSelector = R.color.chip_text_selector + ) + ) + +fun addRadioGroupSingleLineHorizontalDeal(rootView: ViewGroup, onItemSelected: (Data) -> Unit) = + Params.SingleSelection( + SingleSelectionParams( + rootView = rootView, + chipType = SingleChipType.NONE, + orientation = Orientation.VERTICAL, + mData = mDeal(), + onItemSelected = onItemSelected, + bgSelector = R.drawable.rb_selector, + textSelector = R.color.text_selector + ) + ) + +fun addRadioMultiRowDeparture(rootView: ViewGroup, onItemSelected: (Data) -> Unit) = + Params.SingleSelection( + SingleSelectionParams( + rootView = rootView, + chipType = SingleChipType.NONE, + orientation = Orientation.VERTICAL, + mData = mTime(), + onItemSelected = onItemSelected, + bgSelector = R.drawable.multiline_bg_selector, + textSelector = R.color.multiline_text_selector + ) + ) diff --git a/app/src/main/java/com/ss/smartfilter/data/data.kt b/app/src/main/java/com/ss/smartfilterdemo/data/data.kt similarity index 93% rename from app/src/main/java/com/ss/smartfilter/data/data.kt rename to app/src/main/java/com/ss/smartfilterdemo/data/data.kt index 55fa521..7549c80 100644 --- a/app/src/main/java/com/ss/smartfilter/data/data.kt +++ b/app/src/main/java/com/ss/smartfilterdemo/data/data.kt @@ -1,12 +1,7 @@ -package com.ss.smartfilter.data +package com.ss.smartfilterdemo.data -import com.ss.smartfilter.R -import com.ss.smartfilterlib.data.Data - - -fun getNamesFromDataList(): ArrayList { - return mData().map { it.name } as ArrayList -} +import com.ss.smartfilterdemo.R +import com.ss.smartfilter.data.Data fun mData(): ArrayList { @@ -113,14 +108,16 @@ fun mTime(): ArrayList { Data(id = 4, name = "Evening", image = R.drawable.ic_cyclone) ) } + fun mAmenties(): ArrayList { return arrayListOf( Data(id = 1, name = "Live Tracking"), Data(id = 2, name = "Wifi"), Data(id = 3, name = "Water Bottle"), - Data(id = 4, name = "Blanket",) + Data(id = 4, name = "Blanket") ) } + fun mDeal(): ArrayList { return arrayListOf( Data(id = 1, name = "Extra 10% Discount"), diff --git a/app/src/main/java/com/ss/smartfilter/screens/ExpandableAmentiesType.kt b/app/src/main/java/com/ss/smartfilterdemo/screens/ExpandableAmentiesType.kt similarity index 95% rename from app/src/main/java/com/ss/smartfilter/screens/ExpandableAmentiesType.kt rename to app/src/main/java/com/ss/smartfilterdemo/screens/ExpandableAmentiesType.kt index 8f40939..c5f3756 100644 --- a/app/src/main/java/com/ss/smartfilter/screens/ExpandableAmentiesType.kt +++ b/app/src/main/java/com/ss/smartfilterdemo/screens/ExpandableAmentiesType.kt @@ -1,4 +1,4 @@ -package com.ss.smartfilter.screens +package com.ss.smartfilterdemo.screens import android.widget.LinearLayout import androidx.compose.foundation.layout.Column @@ -25,8 +25,8 @@ import androidx.compose.ui.tooling.data.UiToolingDataApi import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.viewinterop.AndroidView -import com.ss.smartfilter.addMultiSelectionChipGroupAmenties -import com.ss.smartfilterlib.SmartFilter +import com.ss.smartfilterdemo.addMultiSelectionChipGroupAmenties +import com.ss.smartfilter.SmartFilter /** * created by Mala Ruparel ON 16/05/24 diff --git a/app/src/main/java/com/ss/smartfilter/screens/ExpandableBusOperatorType.kt b/app/src/main/java/com/ss/smartfilterdemo/screens/ExpandableBusOperatorType.kt similarity index 92% rename from app/src/main/java/com/ss/smartfilter/screens/ExpandableBusOperatorType.kt rename to app/src/main/java/com/ss/smartfilterdemo/screens/ExpandableBusOperatorType.kt index 695ced9..c0a2f7f 100644 --- a/app/src/main/java/com/ss/smartfilter/screens/ExpandableBusOperatorType.kt +++ b/app/src/main/java/com/ss/smartfilterdemo/screens/ExpandableBusOperatorType.kt @@ -1,4 +1,4 @@ -package com.ss.smartfilter.screens +package com.ss.smartfilterdemo.screens import android.widget.LinearLayout import androidx.compose.foundation.layout.Column @@ -24,8 +24,8 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.viewinterop.AndroidView -import com.ss.smartfilter.addRadioGroupSingleBusOperator -import com.ss.smartfilterlib.SmartFilter +import com.ss.smartfilterdemo.addRadioGroupSingleBusOperator +import com.ss.smartfilter.SmartFilter /** * created by Mala Ruparel ON 16/05/24 @@ -47,7 +47,8 @@ fun ExpandableBusOperatorType(title: String) { Text( modifier = Modifier - .weight(1f).padding(16.dp), + .weight(1f) + .padding(16.dp), text = title, fontSize = 18.sp, style = TextStyle(fontWeight = FontWeight.Bold) @@ -78,7 +79,6 @@ fun ExpandableBusOperatorType(title: String) { } } - } } } \ No newline at end of file diff --git a/app/src/main/java/com/ss/smartfilter/screens/ExpandableBusType.kt b/app/src/main/java/com/ss/smartfilterdemo/screens/ExpandableBusType.kt similarity index 95% rename from app/src/main/java/com/ss/smartfilter/screens/ExpandableBusType.kt rename to app/src/main/java/com/ss/smartfilterdemo/screens/ExpandableBusType.kt index 7fa9cac..cc7fdde 100644 --- a/app/src/main/java/com/ss/smartfilter/screens/ExpandableBusType.kt +++ b/app/src/main/java/com/ss/smartfilterdemo/screens/ExpandableBusType.kt @@ -1,4 +1,4 @@ -package com.ss.smartfilter.screens +package com.ss.smartfilterdemo.screens import android.widget.LinearLayout import androidx.compose.foundation.layout.Column @@ -25,8 +25,8 @@ import androidx.compose.ui.tooling.data.UiToolingDataApi import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.viewinterop.AndroidView -import com.ss.smartfilter.addMultiSelectionListBus -import com.ss.smartfilterlib.SmartFilter +import com.ss.smartfilterdemo.addMultiSelectionListBus +import com.ss.smartfilter.SmartFilter /** * created by Mala Ruparel ON 16/05/24 @@ -82,6 +82,5 @@ fun ExpandableBusType(title: String) { } } - } } \ No newline at end of file diff --git a/app/src/main/java/com/ss/smartfilter/screens/ExpandableDealType.kt b/app/src/main/java/com/ss/smartfilterdemo/screens/ExpandableDealType.kt similarity index 95% rename from app/src/main/java/com/ss/smartfilter/screens/ExpandableDealType.kt rename to app/src/main/java/com/ss/smartfilterdemo/screens/ExpandableDealType.kt index 99b79f6..97c5c59 100644 --- a/app/src/main/java/com/ss/smartfilter/screens/ExpandableDealType.kt +++ b/app/src/main/java/com/ss/smartfilterdemo/screens/ExpandableDealType.kt @@ -1,4 +1,4 @@ -package com.ss.smartfilter.screens +package com.ss.smartfilterdemo.screens import android.widget.LinearLayout import androidx.compose.foundation.layout.Column @@ -25,8 +25,8 @@ import androidx.compose.ui.tooling.data.UiToolingDataApi import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.viewinterop.AndroidView -import com.ss.smartfilter.addRadioGroupSingleLineHorizontalDeal -import com.ss.smartfilterlib.SmartFilter +import com.ss.smartfilterdemo.addRadioGroupSingleLineHorizontalDeal +import com.ss.smartfilter.SmartFilter /** * created by Mala Ruparel ON 16/05/24 diff --git a/app/src/main/java/com/ss/smartfilter/screens/ExpandableDepartureType.kt b/app/src/main/java/com/ss/smartfilterdemo/screens/ExpandableDepartureType.kt similarity index 87% rename from app/src/main/java/com/ss/smartfilter/screens/ExpandableDepartureType.kt rename to app/src/main/java/com/ss/smartfilterdemo/screens/ExpandableDepartureType.kt index d61fc2d..5d6be1c 100644 --- a/app/src/main/java/com/ss/smartfilter/screens/ExpandableDepartureType.kt +++ b/app/src/main/java/com/ss/smartfilterdemo/screens/ExpandableDepartureType.kt @@ -1,7 +1,6 @@ -package com.ss.smartfilter.screens +package com.ss.smartfilterdemo.screens import android.widget.LinearLayout -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth @@ -20,18 +19,14 @@ 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.BlendMode.Companion.Color import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.data.UiToolingDataApi import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.viewinterop.AndroidView -import com.ss.smartfilter.addMultiSelectionListVertical -import com.ss.smartfilter.addRadioButtonMultiRow -import com.ss.smartfilter.addRadioMultiRowDeparture -import com.ss.smartfilterlib.SmartFilter -import com.ss.smartfilterlib.utils.toast +import com.ss.smartfilterdemo.addRadioMultiRowDeparture +import com.ss.smartfilter.SmartFilter /** * created by Mala Ruparel ON 16/05/24 diff --git a/app/src/main/java/com/ss/smartfilter/screens/ExpandableOperatorType.kt b/app/src/main/java/com/ss/smartfilterdemo/screens/ExpandableOperatorType.kt similarity index 95% rename from app/src/main/java/com/ss/smartfilter/screens/ExpandableOperatorType.kt rename to app/src/main/java/com/ss/smartfilterdemo/screens/ExpandableOperatorType.kt index 553ad96..e2620ac 100644 --- a/app/src/main/java/com/ss/smartfilter/screens/ExpandableOperatorType.kt +++ b/app/src/main/java/com/ss/smartfilterdemo/screens/ExpandableOperatorType.kt @@ -1,4 +1,4 @@ -package com.ss.smartfilter.screens +package com.ss.smartfilterdemo.screens import android.widget.LinearLayout import androidx.compose.foundation.layout.Column @@ -24,8 +24,8 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.viewinterop.AndroidView -import com.ss.smartfilter.addRadioGroupSingleOperator -import com.ss.smartfilterlib.SmartFilter +import com.ss.smartfilterdemo.addRadioGroupSingleOperator +import com.ss.smartfilter.SmartFilter /** * created by Mala Ruparel ON 16/05/24 diff --git a/app/src/main/java/com/ss/smartfilter/screens/ExpandableSeatType.kt b/app/src/main/java/com/ss/smartfilterdemo/screens/ExpandableSeatType.kt similarity index 95% rename from app/src/main/java/com/ss/smartfilter/screens/ExpandableSeatType.kt rename to app/src/main/java/com/ss/smartfilterdemo/screens/ExpandableSeatType.kt index 4c74c4e..9fc3a21 100644 --- a/app/src/main/java/com/ss/smartfilter/screens/ExpandableSeatType.kt +++ b/app/src/main/java/com/ss/smartfilterdemo/screens/ExpandableSeatType.kt @@ -1,4 +1,4 @@ -package com.ss.smartfilter.screens +package com.ss.smartfilterdemo.screens import android.widget.LinearLayout import androidx.compose.foundation.layout.Column @@ -25,8 +25,8 @@ import androidx.compose.ui.tooling.data.UiToolingDataApi import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.viewinterop.AndroidView -import com.ss.smartfilter.addSingleSelectionListSeat -import com.ss.smartfilterlib.SmartFilter +import com.ss.smartfilterdemo.addSingleSelectionListSeat +import com.ss.smartfilter.SmartFilter /** * created by Mala Ruparel ON 16/05/24 @@ -81,6 +81,5 @@ fun ExpandableSeatType(title: String) { } } - } } \ No newline at end of file diff --git a/app/src/main/java/com/ss/smartfilter/screens/FilterScreen.kt b/app/src/main/java/com/ss/smartfilterdemo/screens/FilterScreen.kt similarity index 95% rename from app/src/main/java/com/ss/smartfilter/screens/FilterScreen.kt rename to app/src/main/java/com/ss/smartfilterdemo/screens/FilterScreen.kt index a81f3d5..46651a4 100644 --- a/app/src/main/java/com/ss/smartfilter/screens/FilterScreen.kt +++ b/app/src/main/java/com/ss/smartfilterdemo/screens/FilterScreen.kt @@ -1,4 +1,4 @@ -package com.ss.smartfilter.screens +package com.ss.smartfilterdemo.screens import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize @@ -8,7 +8,7 @@ import androidx.compose.material3.HorizontalDivider import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext -import com.ss.smartfilter.R +import com.ss.smartfilterdemo.R /** * created by Mala Ruparel ON 16/05/24 diff --git a/app/src/main/java/com/ss/smartfilter/screens/TipBox.kt b/app/src/main/java/com/ss/smartfilterdemo/screens/TipBox.kt similarity index 98% rename from app/src/main/java/com/ss/smartfilter/screens/TipBox.kt rename to app/src/main/java/com/ss/smartfilterdemo/screens/TipBox.kt index af962d4..3b3b8ca 100644 --- a/app/src/main/java/com/ss/smartfilter/screens/TipBox.kt +++ b/app/src/main/java/com/ss/smartfilterdemo/screens/TipBox.kt @@ -1,4 +1,4 @@ -package com.ss.smartfilter.screens +package com.ss.smartfilterdemo.screens import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/com/ss/smartfilter/screens/TopAppBar.kt b/app/src/main/java/com/ss/smartfilterdemo/screens/TopAppBar.kt similarity index 96% rename from app/src/main/java/com/ss/smartfilter/screens/TopAppBar.kt rename to app/src/main/java/com/ss/smartfilterdemo/screens/TopAppBar.kt index 13d7cf1..fcb6554 100644 --- a/app/src/main/java/com/ss/smartfilter/screens/TopAppBar.kt +++ b/app/src/main/java/com/ss/smartfilterdemo/screens/TopAppBar.kt @@ -1,4 +1,4 @@ -package com.ss.smartfilter.screens +package com.ss.smartfilterdemo.screens import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack diff --git a/app/src/main/java/com/ss/smartfilter/theme/Color.kt b/app/src/main/java/com/ss/smartfilterdemo/theme/Color.kt similarity index 82% rename from app/src/main/java/com/ss/smartfilter/theme/Color.kt rename to app/src/main/java/com/ss/smartfilterdemo/theme/Color.kt index 3561c50..39a147c 100644 --- a/app/src/main/java/com/ss/smartfilter/theme/Color.kt +++ b/app/src/main/java/com/ss/smartfilterdemo/theme/Color.kt @@ -1,4 +1,4 @@ -package com.ss.smartfilter.theme +package com.ss.smartfilterdemo.theme import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/com/ss/smartfilter/theme/Theme.kt b/app/src/main/java/com/ss/smartfilterdemo/theme/Theme.kt similarity index 97% rename from app/src/main/java/com/ss/smartfilter/theme/Theme.kt rename to app/src/main/java/com/ss/smartfilterdemo/theme/Theme.kt index 95d68b8..5eeaddf 100644 --- a/app/src/main/java/com/ss/smartfilter/theme/Theme.kt +++ b/app/src/main/java/com/ss/smartfilterdemo/theme/Theme.kt @@ -1,4 +1,4 @@ -package com.ss.smartfilter.theme +package com.ss.smartfilterdemo.theme import android.os.Build import androidx.compose.material3.MaterialTheme diff --git a/app/src/main/java/com/ss/smartfilter/theme/Type.kt b/app/src/main/java/com/ss/smartfilterdemo/theme/Type.kt similarity index 84% rename from app/src/main/java/com/ss/smartfilter/theme/Type.kt rename to app/src/main/java/com/ss/smartfilterdemo/theme/Type.kt index bd4dd98..71559b5 100644 --- a/app/src/main/java/com/ss/smartfilter/theme/Type.kt +++ b/app/src/main/java/com/ss/smartfilterdemo/theme/Type.kt @@ -1,4 +1,4 @@ -package com.ss.smartfilter.theme +package com.ss.smartfilterdemo.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle @@ -6,7 +6,7 @@ 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, diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml index a1fcc04..931d280 100644 --- a/app/src/main/res/drawable/ic_back.xml +++ b/app/src/main/res/drawable/ic_back.xml @@ -1,5 +1,13 @@ - - - - + + + + diff --git a/app/src/main/res/drawable/ic_filter.xml b/app/src/main/res/drawable/ic_filter.xml index 3073da5..54bbccf 100644 --- a/app/src/main/res/drawable/ic_filter.xml +++ b/app/src/main/res/drawable/ic_filter.xml @@ -1,5 +1,12 @@ - - - - + + + + diff --git a/app/src/main/res/drawable/ic_hive.xml b/app/src/main/res/drawable/ic_hive.xml index da65171..660c52c 100644 --- a/app/src/main/res/drawable/ic_hive.xml +++ b/app/src/main/res/drawable/ic_hive.xml @@ -1,17 +1,36 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 07d5da9..48b195e 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,170 +1,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns:android="http://schemas.android.com/apk/res/android"> + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 90c886e..d61ed1b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -8,6 +8,5 @@ android:padding="16dp"> - diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..c4a603d 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ 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 index 6f3b755..c4a603d 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ 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 index c209e78..9070e8b 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..450551d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.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 index b2dfe3d..88acc2b 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp 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 index 4f0f1d6..fdb6fa3 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..329ae69 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.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 index 62b611d..5d0780b 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp 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 index 948a307..53c627f 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..a573ee6 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.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 index 1b9a695..589bb2e 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp 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 index 28d4b77..2d38c99 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..66b70be Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.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 index 9287f50..660e19f 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp 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 index aa7d642..6e8438b 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..924d3bb Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.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 index 9126ae3..9d27523 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index a61821b..15b2d4e 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -22,6 +22,7 @@ 8dp 8dp +