Skip to content

Commit 72513eb

Browse files
authored
chore: Move both kSuite modules into a common parent module (#470)
2 parents 612fde6 + e8fe1c9 commit 72513eb

File tree

68 files changed

+219
-129
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+219
-129
lines changed

MyKSuite/build.gradle.kts renamed to kSuite/MykSuite/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ val javaVersion: JavaVersion by rootProject.extra
1414

1515
android {
1616

17-
namespace = "com.infomaniak.core.myksuite"
17+
namespace = "com.infomaniak.core.ksuite.myksuite"
1818
compileSdk = coreCompileSdk
1919

2020
defaultConfig {
File renamed without changes.
File renamed without changes.

MyKSuite/src/main/java/com/infomaniak/core/myksuite/ui/components/MyKSuiteChips.kt renamed to kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/components/MyKSuiteChips.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.infomaniak.core.myksuite.ui.components
18+
package com.infomaniak.core.ksuite.myksuite.ui.components
1919

2020
import android.content.res.Configuration
2121
import androidx.annotation.ColorInt
@@ -36,9 +36,9 @@ import androidx.compose.ui.res.stringResource
3636
import androidx.compose.ui.res.vectorResource
3737
import androidx.compose.ui.tooling.preview.Preview
3838
import com.infomaniak.core.compose.margin.Margin
39-
import com.infomaniak.core.myksuite.R
40-
import com.infomaniak.core.myksuite.ui.theme.LocalMyKSuiteColors
41-
import com.infomaniak.core.myksuite.ui.theme.MyKSuiteTheme
39+
import com.infomaniak.core.ksuite.myksuite.R
40+
import com.infomaniak.core.ksuite.myksuite.ui.theme.LocalMyKSuiteColors
41+
import com.infomaniak.core.ksuite.myksuite.ui.theme.MyKSuiteTheme
4242

4343
@Composable
4444
fun MyKSuiteChip(modifier: Modifier = Modifier, tier: MyKSuiteTier, @ColorInt backgroundColor: Int? = null) {

MyKSuite/src/main/java/com/infomaniak/core/myksuite/ui/components/MyKSuiteGradient.kt renamed to kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/components/MyKSuiteGradient.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.infomaniak.core.myksuite.ui.components
18+
package com.infomaniak.core.ksuite.myksuite.ui.components
1919

2020
import androidx.compose.foundation.BorderStroke
2121
import androidx.compose.ui.geometry.Offset

MyKSuite/src/main/java/com/infomaniak/core/myksuite/ui/components/MyKSuitePrimaryButton.kt renamed to kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/components/MyKSuitePrimaryButton.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.infomaniak.core.myksuite.ui.components
18+
package com.infomaniak.core.ksuite.myksuite.ui.components
1919

2020
import android.content.res.Configuration
2121
import androidx.compose.foundation.layout.Arrangement
@@ -32,9 +32,9 @@ import androidx.compose.ui.graphics.Shape
3232
import androidx.compose.ui.tooling.preview.Preview
3333
import com.infomaniak.core.compose.basics.ButtonType
3434
import com.infomaniak.core.compose.margin.Margin
35-
import com.infomaniak.core.myksuite.ui.theme.Dimens
36-
import com.infomaniak.core.myksuite.ui.theme.MyKSuiteTheme
37-
import com.infomaniak.core.myksuite.ui.theme.Typography
35+
import com.infomaniak.core.ksuite.myksuite.ui.theme.Dimens
36+
import com.infomaniak.core.ksuite.myksuite.ui.theme.MyKSuiteTheme
37+
import com.infomaniak.core.ksuite.myksuite.ui.theme.Typography
3838

3939
@Composable
4040
internal fun MyKSuitePrimaryButton(

MyKSuite/src/main/java/com/infomaniak/core/myksuite/ui/components/TextWithIcon.kt renamed to kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/components/TextWithIcon.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.infomaniak.core.myksuite.ui.components
18+
package com.infomaniak.core.ksuite.myksuite.ui.components
1919

2020
import androidx.compose.foundation.layout.padding
2121
import androidx.compose.material3.Surface
@@ -37,10 +37,10 @@ import androidx.compose.ui.tooling.preview.datasource.LoremIpsum
3737
import androidx.compose.ui.unit.Dp
3838
import androidx.compose.ui.unit.dp
3939
import com.infomaniak.core.compose.margin.Margin
40-
import com.infomaniak.core.myksuite.R
41-
import com.infomaniak.core.myksuite.ui.theme.LocalMyKSuiteColors
42-
import com.infomaniak.core.myksuite.ui.theme.MyKSuiteTheme
43-
import com.infomaniak.core.myksuite.ui.theme.Typography
40+
import com.infomaniak.core.ksuite.myksuite.R
41+
import com.infomaniak.core.ksuite.myksuite.ui.theme.LocalMyKSuiteColors
42+
import com.infomaniak.core.ksuite.myksuite.ui.theme.MyKSuiteTheme
43+
import com.infomaniak.core.ksuite.myksuite.ui.theme.Typography
4444

4545
/** This component allows to put an icon on any line of the text, thanks to the [iconLine] parameter
4646
* This code comes from [here](https://stackoverflow.com/questions/70708056/how-to-centrally-align-icon-to-first-line-of-a-text-component-in-compose/71312465#71312465)

MyKSuite/src/main/java/com/infomaniak/core/myksuite/ui/components/WeightOneSpacer.kt renamed to kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/components/WeightOneSpacer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.infomaniak.core.myksuite.ui.components
18+
package com.infomaniak.core.ksuite.myksuite.ui.components
1919

2020
import androidx.compose.foundation.layout.ColumnScope
2121
import androidx.compose.foundation.layout.RowScope

MyKSuite/src/main/java/com/infomaniak/core/myksuite/ui/data/AvatarData.kt renamed to kSuite/MykSuite/src/main/java/com/infomaniak/core/ksuite/myksuite/ui/data/AvatarData.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.infomaniak.core.myksuite.ui.data
18+
package com.infomaniak.core.ksuite.myksuite.ui.data
1919

2020
import android.os.Parcelable
2121
import androidx.annotation.ColorInt

0 commit comments

Comments
 (0)